Changeset 105327 in vbox

Timestamp:

Jul 15, 2024 2:48:33 PM (5 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10672: Runtime UI: Moderate QIStatusBarIndicator cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QIStatusBarIndicator.cpp (modified) (4 diffs)
• QIStatusBarIndicator.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -30 +30 @@
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QIcon>
 #include <QPainter>
 #include <QStyle>
@@ -70 +69 @@
         if (cme.isAccepted())
             pEvent->accept();
-        else
-            QWidget::mousePressEvent(pEvent);
     }
-    else
-        QWidget::mousePressEvent(pEvent);
+
+    /* Call to base-class: */
+    QWidget::mousePressEvent(pEvent);
 }
 #endif /* VBOX_WS_MAC */
@@ -139 +137 @@
     , m_pLabel(0)
 {
-    /* Create main-layout: */
+    /* Prepare main-layout: */
     QHBoxLayout *pMainLayout = new QHBoxLayout(this);
     if (pMainLayout)
     {
-        /* Configure main-layout: */
         pMainLayout->setContentsMargins(0, 0, 0, 0);
         pMainLayout->setSpacing(0);
+
         /* Create label: */
-        m_pLabel = new QLabel;
+        m_pLabel = new QLabel(this);
         if (m_pLabel)
-        {
-            /* Add label into main-layout: */
             pMainLayout->addWidget(m_pLabel);
-        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2023 Oracle and/or its affiliates.
+ * Copyright (C) 2006-2024 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -35 +35 @@
 #include <QIcon>
 #include <QMap>
+#include <QSize>
 #include <QWidget>
 
@@ -41 +42 @@
 
 /* Forward declarations: */
-class QIcon;
 class QLabel;
-class QSize;
-class QString;
-class QWidget;
 
 
@@ -81 +78 @@
 
     /** Holds currently cached size. */
-    QSize m_size;
+    QSize  m_size;
 };
 
@@ -105 +102 @@
 public slots:
 
-    /** Defines int @a state. */
+    /** Defines int @a iState. */
     virtual void setState(int iState) { m_iState = iState; repaint(); }
-    /** Defines bool @a state. */
-    void setState(bool fState) { setState((int)fState); }
 
 protected:
@@ -121 +116 @@
 
     /** Holds current state. */
-    int m_iState;
+    int               m_iState;
     /** Holds cached state icons. */
-    QMap<int, QIcon> m_icons;
+    QMap<int, QIcon>  m_icons;
 };
 
 
-/** QIStatusBarIndicator extension used as status-bar state indicator. */
+/** QIStatusBarIndicator extension used as status-bar text indicator. */
 class SHARED_LIBRARY_STUFF QITextStatusBarIndicator : public QIStatusBarIndicator
 {