Changeset 46650 in vbox

Timestamp:

Jun 19, 2013 11:49:38 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: UI status-bar indicator interface: Cleanup (part 2).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIStateIndicator.cpp (modified) (1 diff)
• extensions/QIStateIndicator.h (modified) (2 diffs)
• net/UINetworkManagerIndicator.h (modified) (2 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (21 diffs)

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

@@ -26 +26 @@
 #endif
 
-/** @clas QIStateIndicator
- *
- *  The QIStateIndicator class is a simple class that can visually indicate
- *  the state of some thing, as described by the state property.
- */
-
-QIStateIndicator::QIStateIndicator(QWidget *pParent /* = 0 */)
-  : QFrame(pParent)
+QIStateIndicator::QIStateIndicator(QWidget *pParent /*= 0*/)
+  : QIWithRetranslateUI<QFrame>(pParent)
   , mState(0)
   , mSize(0, 0)

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

@@ -24 +24 @@
 #include <QHash>
 
-class QIStateIndicator : public QFrame
+/* GUI includes: */
+#include "QIWithRetranslateUI.h"
+
+class QIStateIndicator : public QIWithRetranslateUI<QFrame>
 {
     Q_OBJECT;
@@ -30 +33 @@
 public:
 
-    QIStateIndicator (QWidget *pParent = 0);
+    QIStateIndicator(QWidget *pParent = 0);
     ~QIStateIndicator();
 

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h

@@ -25 +25 @@
 
 /* Local includes: */
-#include "QIWithRetranslateUI.h"
 #include "QIStateIndicator.h"
 
@@ -40 +39 @@
 
 /* Network-manager status-bar indicator: */
-class UINetworkManagerIndicator : public QIWithRetranslateUI<QIStateIndicator>
+class UINetworkManagerIndicator : public QIStateIndicator
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp

@@ -25 +25 @@
 #include "VBoxGlobal.h"
 #include "UIMachineDefs.h"
-#include "QIWithRetranslateUI.h"
 #include "UIConverter.h"
 
@@ -45 +44 @@
 #include <iprt/time.h>
 
-class UIIndicatorHardDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorHardDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -52 +51 @@
 
     UIIndicatorHardDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/hd_16px.png"));
@@ -112 +110 @@
 };
 
-class UIIndicatorOpticalDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorOpticalDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -119 +117 @@
 
     UIIndicatorOpticalDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/cd_16px.png"));
@@ -183 +180 @@
 };
 
-class UIIndicatorFloppyDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorFloppyDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -190 +187 @@
 
     UIIndicatorFloppyDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/fd_16px.png"));
@@ -254 +250 @@
 };
 
-class UIIndicatorNetworkAdapters : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorNetworkAdapters : public QIStateIndicator
 {
     Q_OBJECT;
@@ -261 +257 @@
 
     UIIndicatorNetworkAdapters(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
       , m_pUpdateTimer(new QTimer(this))
     {
@@ -361 +356 @@
 };
 
-class UIIndicatorUSBDevices : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorUSBDevices : public QIStateIndicator
 {
     Q_OBJECT;
@@ -368 +363 @@
 
     UIIndicatorUSBDevices(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/usb_16px.png"));
@@ -419 +413 @@
 };
 
-class UIIndicatorSharedFolders : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorSharedFolders : public QIStateIndicator
 {
     Q_OBJECT;
@@ -426 +420 @@
 
     UIIndicatorSharedFolders(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/shared_folder_16px.png"));
@@ -495 +488 @@
 };
 
-class UIIndicatorVideoCapture : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorVideoCapture : public QIStateIndicator
 {
     Q_OBJECT;
@@ -511 +504 @@
     /* Constructor: */
     UIIndicatorVideoCapture(CSession &session)
-        : QIWithRetranslateUI<QIStateIndicator>()
-        , m_session(session)
+        : m_session(session)
         , m_pUpdateTimer(new QTimer(this))
     {
@@ -587 +579 @@
 };
 
-class UIIndicatorVirtualization : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorVirtualization : public QIStateIndicator
 {
     Q_OBJECT;
@@ -594 +586 @@
 
     UIIndicatorVirtualization(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/vtx_amdv_disabled_16px.png"));
@@ -663 +654 @@
 };
 
-class UIIndicatorMouse : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorMouse : public QIStateIndicator
 {
     Q_OBJECT;
@@ -670 +661 @@
 
     UIIndicatorMouse(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/mouse_disabled_16px.png"));
@@ -715 +705 @@
 };
 
-class UIIndicatorHostkey : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorHostkey : public QIStateIndicator
 {
     Q_OBJECT;
@@ -722 +712 @@
 
     UIIndicatorHostkey(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/hostkey_16px.png"));