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

Timestamp:

Apr 26, 2021 11:48:18 AM (4 years ago)

Author:

vboxsync

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

144020

Message:

FE/Qt: bugref:9930. Some refactoring on UIVMLogPage's API

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogPage.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (1 diff)

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

@@ -106 +106 @@
 }
 
-void UIVMLogPage::setLogString(const QString &strLog)
-{
-    m_strLog = strLog;
+void UIVMLogPage::setLogContent(const QString &strLogContent, bool fError)
+{
+    if (!fError)
+    {
+        m_strLog = strLogContent;
+        setTextEditText(strLogContent);
+    }
+    else
+    {
+        markForError();
+        setTextEditTextAsHtml(strLogContent);
+    }
 }
 

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

@@ -63 +63 @@
     QTextDocument  *document();
 
+    void setLogContent(const QString &strLogContent, bool fError);
     /* Only to be called when log file is re-read. */
-    void setLogString(const QString &strLog);
+    // void setLogString(const QString &strLog);
     const QString& logString() const;
 
     void setLogFileName(const QString &strFileName);
     const QString& logFileName() const;
-
-    /** Set plaintextEdit's text. Note that the text we
-     *  show currently might be different than
-     *  m_strLog. For example during filtering. */
-    void setTextEditText(const QString &strText);
-    void setTextEditTextAsHtml(const QString &strText);
 
     /** Marks the plain text edit When we dont have a log content. */
@@ -134 +129 @@
     void deleteBookmark(LogBookmark bookmark);
 
+    /** Set plaintextEdit's text. Note that the text we
+     *  show currently might be different than
+     *  m_strLog. For example during filtering. */
+    void setTextEditText(const QString &strText);
+    void setTextEditTextAsHtml(const QString &strText);
+
     QHBoxLayout    *m_pMainLayout;
     UIVMLogViewerTextEdit *m_pTextEdit;

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

@@ -929 +929 @@
         m_pTabWidget->insertTab(m_pTabWidget->count(), pLogPage, strTabTitle);
 
-        /* Set text edit since we want to display this text: */
-        if (!noLogsToShow)
-        {
-            pLogPage->setTextEditText(strLogContent);
-            /* Set the log string of the UIVMLogPage: */
-            pLogPage->setLogString(strLogContent);
-        }
-        /* In case there are some errors append the error text as html: */
-        else
-        {
-            pLogPage->setTextEditTextAsHtml(strLogContent);
-            pLogPage->markForError();
-        }
+        pLogPage->setLogContent(strLogContent, noLogsToShow);
         pLogPage->setScrollBarMarkingsVector(m_pSearchPanel->matchLocationVector());
     }