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

Timestamp:

Mar 20, 2024 9:14:53 AM (13 months ago)

Author:

vboxsync

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

162314

Message:

FE/Qt. bugref:6699. Some refactoring.

Location:

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

Files:

• UIVMLogPage.cpp (modified) (8 diffs)
• UIVMLogPage.h (modified) (3 diffs)

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

@@ -39 +39 @@
 
 /*********************************************************************************************************************************
+*   UIVMLogBookmarkManager definition.                                                                                           *
+*********************************************************************************************************************************/
+
+class UIVMLogBookmarkManager
+{
+public:
+    void addBookmark(const UIVMLogBookmark& newBookmark);
+    void addBookmark(int iCursorPosition, int iLineNumber, QString strBlockText);
+    void deleteBookmark(const UIVMLogBookmark& bookmark);
+    void deleteBookmarkByIndex(int iIndex);
+    void deleteAllBookmarks();
+    int cursorPosition(int bookmarkIndex);
+    QSet<int> lineSet() const;
+    const QVector<UIVMLogBookmark>& bookmarkList() const;
+
+private:
+
+    QVector<UIVMLogBookmark> m_bookmarks;
+};
+
+
+/*********************************************************************************************************************************
+*   UIVMLogBookmarkManager implementation.                                                                                       *
+*********************************************************************************************************************************/
+
+
+void UIVMLogBookmarkManager::addBookmark(const UIVMLogBookmark& newBookmark)
+{
+    foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
+        if (bookmark == newBookmark)
+            return;
+    m_bookmarks << newBookmark;
+}
+
+void UIVMLogBookmarkManager::addBookmark(int iCursorPosition, int iLineNumber, QString strBlockText)
+{
+    foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
+        if (bookmark.m_iLineNumber == iLineNumber)
+            return;
+    m_bookmarks << UIVMLogBookmark(iCursorPosition, iLineNumber, strBlockText);
+}
+
+void UIVMLogBookmarkManager::deleteBookmark(const UIVMLogBookmark& bookmark)
+{
+    int index = -1;
+    for (int i = 0; i < m_bookmarks.size() && index == -1; ++i)
+    {
+        if (bookmark == m_bookmarks[i])
+            index = i;
+    }
+    deleteBookmarkByIndex(index);
+}
+
+void UIVMLogBookmarkManager::deleteBookmarkByIndex(int iIndex)
+{
+    if (iIndex >= m_bookmarks.size() || iIndex < 0)
+        return;
+    m_bookmarks.removeAt(iIndex);
+}
+
+void UIVMLogBookmarkManager::deleteAllBookmarks()
+{
+    m_bookmarks.clear();
+}
+
+int UIVMLogBookmarkManager::cursorPosition(int bookmarkIndex)
+{
+    if (bookmarkIndex >= m_bookmarks.size())
+        return 0;
+    return m_bookmarks[bookmarkIndex].m_iCursorPosition;
+}
+
+QSet<int> UIVMLogBookmarkManager::lineSet() const
+{
+    QSet<int> lines;
+    foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
+        lines << bookmark.m_iLineNumber;
+    return lines;
+}
+
+const QVector<UIVMLogBookmark>& UIVMLogBookmarkManager::bookmarkList() const
+{
+    return m_bookmarks;
+}
+
+
+/*********************************************************************************************************************************
 *   UIVMLogTab implementation.                                                                                                   *
 *********************************************************************************************************************************/
@@ -67 +154 @@
     , m_pMainLayout(0)
     , m_pTextEdit(0)
+    , m_pBookmarkManager(new UIVMLogBookmarkManager)
     , m_iSelectedBookmarkIndex(-1)
     , m_bFiltered(false)
@@ -130 +218 @@
 void UIVMLogPage::cleanup()
 {
+    delete m_pBookmarkManager;
 }
 
@@ -218 +307 @@
 void UIVMLogPage::deleteAllBookmarks()
 {
-    m_bookmarkManager.deleteAllBookmarks();
+    if (m_pBookmarkManager)
+        m_pBookmarkManager->deleteAllBookmarks();
     updateTextEditBookmarkLineSet();
 }
@@ -226 +316 @@
     if (!m_pTextEdit)
         return;
-    m_pTextEdit->setCursorPosition(m_bookmarkManager.cursorPosition(bookmarkIndex));
-}
-
-const QVector<UIVMLogBookmark>& UIVMLogPage::bookmarkList() const
-{
-    return m_bookmarkManager.bookmarkList();
+    if (m_pBookmarkManager)
+        m_pTextEdit->setCursorPosition(m_pBookmarkManager->cursorPosition(bookmarkIndex));
+}
+
+QVector<UIVMLogBookmark> UIVMLogPage::bookmarkList() const
+{
+    if (!m_pBookmarkManager)
+        return QVector<UIVMLogBookmark>();
+    return m_pBookmarkManager->bookmarkList();
 }
 
 void UIVMLogPage::sltAddBookmark(const UIVMLogBookmark& bookmark)
 {
-    m_bookmarkManager.addBookmark(bookmark);
+    if (m_pBookmarkManager)
+        m_pBookmarkManager->addBookmark(bookmark);
     updateTextEditBookmarkLineSet();
     emit sigBookmarksUpdated();
@@ -243 +337 @@
 void UIVMLogPage::sltDeleteBookmark(const UIVMLogBookmark& bookmark)
 {
-    m_bookmarkManager.deleteBookmark(bookmark);
+    if (m_pBookmarkManager)
+        m_pBookmarkManager->deleteBookmark(bookmark);
     updateTextEditBookmarkLineSet();
     emit sigBookmarksUpdated();
@@ -250 +345 @@
 void UIVMLogPage::deleteBookmarkByIndex(int iIndex)
 {
-    m_bookmarkManager.deleteBookmarkByIndex(iIndex);
+    if (m_pBookmarkManager)
+        m_pBookmarkManager->deleteBookmarkByIndex(iIndex);
     updateTextEditBookmarkLineSet();
     emit sigBookmarksUpdated();
@@ -259 +355 @@
     if (!m_pTextEdit)
         return;
-    m_pTextEdit->setBookmarkLineSet(m_bookmarkManager.lineSet());
+    if (m_pBookmarkManager)
+        m_pTextEdit->setBookmarkLineSet(m_pBookmarkManager->lineSet());
 }
 

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

@@ -45 +45 @@
 class QTextDocument;
 class UIVMLogViewerTextEdit;
-
-class UIVMLogBookmarkManager
-{
-public:
-    void addBookmark(const UIVMLogBookmark& newBookmark)
-    {
-        foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
-            if (bookmark == newBookmark)
-                return;
-        m_bookmarks << newBookmark;
-    }
-
-    void addBookmark(int iCursorPosition, int iLineNumber, QString strBlockText)
-    {
-        foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
-            if (bookmark.m_iLineNumber == iLineNumber)
-                return;
-        m_bookmarks << UIVMLogBookmark(iCursorPosition, iLineNumber, strBlockText);
-    }
-
-    void deleteBookmark(const UIVMLogBookmark& bookmark)
-    {
-        int index = -1;
-        for (int i = 0; i < m_bookmarks.size() && index == -1; ++i)
-        {
-            if (bookmark == m_bookmarks[i])
-                index = i;
-        }
-        deleteBookmarkByIndex(index);
-    }
-
-    void deleteBookmarkByIndex(int iIndex)
-    {
-        if (iIndex >= m_bookmarks.size() || iIndex < 0)
-            return;
-        m_bookmarks.removeAt(iIndex);
-    }
-
-    void deleteAllBookmarks()
-    {
-        m_bookmarks.clear();
-    }
-
-    int cursorPosition(int bookmarkIndex)
-    {
-        if (bookmarkIndex >= m_bookmarks.size())
-            return 0;
-        return m_bookmarks[bookmarkIndex].m_iCursorPosition;
-    }
-
-    QSet<int> lineSet() const
-    {
-        QSet<int> lines;
-        foreach (const UIVMLogBookmark& bookmark, m_bookmarks)
-            lines << bookmark.m_iLineNumber;
-        return lines;
-    }
-
-    const QVector<UIVMLogBookmark>& bookmarkList() const
-    {
-        return m_bookmarks;
-    }
-
-private:
-
-    QVector<UIVMLogBookmark> m_bookmarks;
-};
-
+class UIVMLogBookmarkManager;
 
 class UIVMLogTab : public QWidget
@@ -168 +101 @@
     void documentUndo();
 
-    const QVector<UIVMLogBookmark>& bookmarkList() const;
+    QVector<UIVMLogBookmark> bookmarkList() const;
 
     void deleteAllBookmarks();
@@ -218 +151 @@
     QString         m_strLogFileName;
     /** Stores the bookmarks of the logpage. All other bookmark related containers are updated wrt. this one. */
-    UIVMLogBookmarkManager m_bookmarkManager;
+    UIVMLogBookmarkManager *m_pBookmarkManager;
 
     /** Keeps the index of the selected bookmark. Used especially when moving from one tab to another. */