Changeset 88671 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Apr 23, 2021 11:09:03 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143985

Message:

FE/Qt: bugref:9930. Some refactoring

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogPage.cpp (modified) (2 diffs)
• UIVMLogPage.h (modified) (3 diffs)
• UIVMLogViewerWidget.cpp (modified) (5 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -32 +32 @@
 
 
-UIVMLogPage::UIVMLogPage(QWidget *pParent /* = 0 */, int tabIndex /*= -1 */)
+UIVMLogPage::UIVMLogPage(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pMainLayout(0)
     , m_pTextEdit(0)
-    , m_tabIndex(tabIndex)
     , m_iSelectedBookmarkIndex(-1)
     , m_bFiltered(false)
@@ -96 +95 @@
         return 0;
     return m_pTextEdit->document();
-}
-
-void UIVMLogPage::setTabIndex(int index)
-{
-    m_tabIndex = index;
-}
-
-int UIVMLogPage::tabIndex()  const
-{
-    return m_tabIndex;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.h

@@ -54 +54 @@
 public:
 
-    UIVMLogPage(QWidget *pParent = 0, int tabIndex = -1);
+    UIVMLogPage(QWidget *pParent = 0);
     ~UIVMLogPage();
 
@@ -62 +62 @@
     QPlainTextEdit *textEdit();
     QTextDocument  *document();
-
-    void setTabIndex(int index);
-    int tabIndex()  const;
 
     /* Only to be called when log file is re-read. */
@@ -137 +134 @@
     /** Stores full path and name of the log file. */
     QString         m_strLogFileName;
-    /** This is the index of the tab containing this widget in UIVMLogViewerWidget. */
-    int             m_tabIndex;
     /** Stores the bookmarks of the logpage. All other bookmark related containers are updated wrt. this one. */
     QVector<LogBookmark> m_bookmarkVector;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -133 +133 @@
     m_pLayout->addWidget(pCheckBox);
 }
-
-
-UIVMLogViewerWidget::Machine::Machine(const QUuid &id, const QString &strName)
-    : m_id(id)
-    , m_strName(strName)
-{
-}
-
-UIVMLogViewerWidget::Machine::Machine()
-{}
 
 UIVMLogViewerWidget::UIVMLogViewerWidget(EmbedTo enmEmbedding,
@@ -213 +203 @@
         if (!item)
             continue;
-        m_machines << Machine(item->id(), item->name());
-    }
-    updateMachineSelectionMenu();
+        //m_machines << Machine(item->id(), item->name());
+    }
+    //updateMachineSelectionMenu();
 }
 
@@ -875 +865 @@
         int tabIndex = m_pTabWidget->insertTab(m_pTabWidget->count(), pLogPage, QFileInfo(strFileName).fileName());
 
-        pLogPage->setTabIndex(tabIndex);
         m_logPageList.resize(m_pTabWidget->count());
         m_logPageList[tabIndex] = pLogPage;
@@ -948 +937 @@
                 if (uOffset >= uAllowedLogSize)
                 {
-                    strText.append("\n=========Log file has been truncate as it is too large.======");
+                    strText.append("\n=========Log file has been truncated as it is too large.======");
                     break;
                 }
@@ -1043 +1032 @@
     m_pMachineSelectionMenu->clear();
 
-    foreach (const Machine &machine, m_machines)
-    {
-
-        m_pMachineSelectionMenu->addListItem(machine.m_strName, machine.m_id);
-    }
+    // foreach (const Machine &machine, m_machines)
+    // {
+
+    //     m_pMachineSelectionMenu->addListItem(machine.m_strName, machine.m_id);
+    // }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -141 +141 @@
     void sltCornerButtonClicked();
 private:
-        struct Machine
-        {
-            Machine(const QUuid &id, const QString &strName);
-            Machine();
-            QUuid   m_id;
-            QString m_strName;
-        };
+
     /** @name Prepare/Cleanup
       * @{ */
@@ -207 +201 @@
     /** Holds the machine instance. */
     CMachine      m_comMachine;
-    QVector<Machine> m_machines;
+    QMap<QUuid, CMachine> m_machines;
 
     /** Holds whether the dialog is polished. */