Changeset 70792 in vbox

Timestamp:

Jan 29, 2018 1:12:06 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt bugref:9072 Some code style changes

Location:

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

Files:

• UIVMLogPage.cpp (modified) (1 diff)
• UIVMLogPage.h (modified) (4 diffs)
• UIVMLogViewerBookmarksPanel.cpp (modified) (2 diffs)
• UIVMLogViewerDialog.h (modified) (1 diff)
• UIVMLogViewerPanel.h (modified) (1 diff)
• UIVMLogViewerSearchPanel.h (modified) (1 diff)
• UIVMLogViewerTextEdit.h (modified) (1 diff)
• UIVMLogViewerWidget.cpp (modified) (2 diffs)

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

@@ -135 +135 @@
 }
 
-void UIVMLogPage::setFileName(const QString &strFileName)
-{
-    m_strFileName = strFileName;
-}
-
-const QString& UIVMLogPage::fileName() const
-{
-    return m_strFileName;
+void UIVMLogPage::setLogFileName(const QString &strLogFileName)
+{
+    m_strLogFileName = strLogFileName;
+}
+
+const QString& UIVMLogPage::logFileName() const
+{
+    return m_strLogFileName;
 }
 

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

@@ -52 +52 @@
 
     UIVMLogPage(QWidget *pParent = 0, int tabIndex = -1);
-    /** Destructs the VM Log-Viewer. */
     ~UIVMLogPage();
+
     /** Returns the width of the current log page. return 0 if there is no current log page: */
     int defaultLogPageWidth() const;
@@ -67 +67 @@
     const QString& logString() const;
 
-    void setFileName(const QString &strFileName);
-    const QString& fileName() const;
+    void setLogFileName(const QString &strFileName);
+    const QString& logFileName() const;
 
-    /** Ses plaintextEdit's text. Note that the text we
+    /** Set plaintextEdit's text. Note that the text we
         show currently might be different than
         m_strLog. For example during filtering. */
@@ -129 +129 @@
     void updateTextEditBookmarkLineSet();
     void deleteBookmark(LogBookmark bookmark);
-    /** When settings for this changed, they are applied immediately
-        only if this is visible, if not they are applied when this becomes
-        visible. */
+    /** When settings for this UILogPage instance changed, they are applied immediately
+        only if this is visible, if not they are applied when this becomes visible. */
     void applySettings();
 
@@ -139 +138 @@
     QString         m_strLog;
     /** Stores full path and name of the log file. */
-    QString         m_strFileName;
+    QString         m_strLogFileName;
     /** This is the index of the tab containing this widget in UIVMLogViewerWidget. */
     int             m_tabIndex;

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

@@ -111 +111 @@
     }
 
-
     m_pGotoSelectedBookmark = new QIToolButton(this);
     if (m_pGotoSelectedBookmark)
@@ -133 +132 @@
             pContainerLayout->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing) / 2);
 #endif
-       m_pPreviousButton = new QIToolButton;
-       if (m_pPreviousButton)
-       {
-           pContainerLayout->addWidget(m_pPreviousButton);
-           m_pPreviousButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
-       }
-
-       m_pNextButton = new QIToolButton;
-       if (m_pNextButton){
-           pContainerLayout->addWidget(m_pNextButton);
-           m_pNextButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
-       }
+
+    m_pPreviousButton = new QIToolButton;
+    if (m_pPreviousButton)
+    {
+        pContainerLayout->addWidget(m_pPreviousButton);
+        m_pPreviousButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowBack, this));
+    }
+
+    m_pNextButton = new QIToolButton;
+    if (m_pNextButton){
+        pContainerLayout->addWidget(m_pNextButton);
+        m_pNextButton->setIcon(UIIconPool::defaultIcon(UIIconPool::UIDefaultIconType_ArrowForward, this));
+    }
     }
 

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

@@ -77 +77 @@
 
     void retranslateUi();
-
     CMachine m_comMachine;
 };
 
 #endif /* !___UIVMLogViewerDialog_h___ */
-

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

@@ -72 +72 @@
     /** Holds the reference to VM Log-Viewer this panel belongs to. */
     UIVMLogViewerWidget *m_pViewer;
-    /** Holds the instance of main-layout we create. */
     QHBoxLayout         *m_pMainLayout;
-    /** Holds the instance of close-button we create. */
     QIToolButton        *m_pCloseButton;
 };

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

@@ -35 +35 @@
 class UIVMLogViewerWidget;
 
-/** QWidget extension
+/** UIVMLogViewerPanel extension
   * providing GUI for search-panel in VM Log-Viewer. */
 class UIVMLogViewerSearchPanel : public UIVMLogViewerPanel

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

@@ -27 +27 @@
 
 
-/* QPlainTextEdit extension for some addtional context menu items,
-   a special scrollbar, line number area, and bookmarking support: */
+/* QPlainTextEdit extension with some addtional context menu items,
+   a special scrollbar, line number area, bookmarking support,
+   background watermarking etc.: */
 class UIVMLogViewerTextEdit : public QIWithRetranslateUI<QPlainTextEdit>
 {

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

@@ -229 +229 @@
         return;
 
-    const QString& fileName = logPage->fileName();
+    const QString& fileName = logPage->logFileName();
     if (fileName.isEmpty())
         return;
@@ -873 +873 @@
         /* Set the file name only if we really have log file to read. */
         if (!noLogsToShow)
-            pLogPage->setFileName(strFileName);
+            pLogPage->setLogFileName(strFileName);
 
         /* Add page-container to viewer-container: */