Changeset 47847 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 19, 2013 3:44:05 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Some cleanup for r88139.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIWarningPane.cpp (modified) (5 diffs)
• UIWarningPane.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp

@@ -32 +32 @@
 UIWarningPane::UIWarningPane(QWidget *pParent)
     : QWidget(pParent)
-    , m_pWarningLabel(0)
+    , m_pIconLayout(0)
+    , m_pTextLabel(0)
 {
     /* Prepare: */
@@ -40 +41 @@
 void UIWarningPane::setWarningLabel(const QString &strWarningLabel)
 {
-    m_pWarningLabel->setText(strWarningLabel);
+    /* Assign passed text directly to warning-label: */
+    m_pTextLabel->setText(strWarningLabel);
 }
 
 void UIWarningPane::registerValidator(UIPageValidator *pValidator)
 {
-    /* Make sure validator is set! */
+    /* Make sure validator exists: */
     AssertPtrReturnVoid(pValidator);
 
-    /* Makre sure validator is not registered yet: */
+    /* Make sure validator is not registered yet: */
     if (m_validators.contains(pValidator))
     {
@@ -64 +66 @@
         m_icons << pIconLabel;
         /* Add icon-label into layout: */
-        m_pLayout->addWidget(pIconLabel);
+        m_pIconLayout->addWidget(pIconLabel);
         /* Configure icon-label: */
         pIconLabel->setMouseTracking(true);
@@ -73 +75 @@
     }
 
-    /* Mark icon as 'non-hovered': */
+    /* Mark icon as 'unhovered': */
     m_hovered << false;
 }
@@ -92 +94 @@
         /* Add left stretch: */
         pMainLayout->addStretch();
-        /* Create warning-label: */
-        m_pWarningLabel = new QLabel;
+        /* Create text-label: */
+        m_pTextLabel = new QLabel;
         {
             /* Add into main-layout: */
-            pMainLayout->addWidget(m_pWarningLabel);
+            pMainLayout->addWidget(m_pTextLabel);
         }
         /* Create layout: */
-        m_pLayout = new QHBoxLayout;
+        m_pIconLayout = new QHBoxLayout;
         {
             /* Configure layout: */
-            m_pLayout->setContentsMargins(0, 0, 0, 0);
+            m_pIconLayout->setContentsMargins(0, 0, 0, 0);
             /* Add into main-layout: */
-            pMainLayout->addLayout(m_pLayout);
+            pMainLayout->addLayout(m_pIconLayout);
         }
         /* Add right stretch: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.h

@@ -60 +60 @@
 
     /* Variables: */
-    QHBoxLayout *m_pLayout;
-    QLabel *m_pWarningLabel;
+    QHBoxLayout *m_pIconLayout;
+    QLabel *m_pTextLabel;
     QList<UIPageValidator*> m_validators;
     QList<QLabel*> m_icons;