Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp	(revision 46649)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.cpp	(revision 46650)
@@ -26,12 +26,6 @@
 #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)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h	(revision 46649)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h	(revision 46650)
@@ -24,5 +24,8 @@
 #include <QHash>
 
-class QIStateIndicator : public QFrame
+/* GUI includes: */
+#include "QIWithRetranslateUI.h"
+
+class QIStateIndicator : public QIWithRetranslateUI<QFrame>
 {
     Q_OBJECT;
@@ -30,5 +33,5 @@
 public:
 
-    QIStateIndicator (QWidget *pParent = 0);
+    QIStateIndicator(QWidget *pParent = 0);
     ~QIStateIndicator();
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h	(revision 46649)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.h	(revision 46650)
@@ -25,5 +25,4 @@
 
 /* Local includes: */
-#include "QIWithRetranslateUI.h"
 #include "QIStateIndicator.h"
 
@@ -40,5 +39,5 @@
 
 /* Network-manager status-bar indicator: */
-class UINetworkManagerIndicator : public QIWithRetranslateUI<QIStateIndicator>
+class UINetworkManagerIndicator : public QIStateIndicator
 {
     Q_OBJECT;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 46649)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 46650)
@@ -25,5 +25,4 @@
 #include "VBoxGlobal.h"
 #include "UIMachineDefs.h"
-#include "QIWithRetranslateUI.h"
 #include "UIConverter.h"
 
@@ -45,5 +44,5 @@
 #include <iprt/time.h>
 
-class UIIndicatorHardDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorHardDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -52,6 +51,5 @@
 
     UIIndicatorHardDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/hd_16px.png"));
@@ -112,5 +110,5 @@
 };
 
-class UIIndicatorOpticalDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorOpticalDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -119,6 +117,5 @@
 
     UIIndicatorOpticalDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/cd_16px.png"));
@@ -183,5 +180,5 @@
 };
 
-class UIIndicatorFloppyDisks : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorFloppyDisks : public QIStateIndicator
 {
     Q_OBJECT;
@@ -190,6 +187,5 @@
 
     UIIndicatorFloppyDisks(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/fd_16px.png"));
@@ -254,5 +250,5 @@
 };
 
-class UIIndicatorNetworkAdapters : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorNetworkAdapters : public QIStateIndicator
 {
     Q_OBJECT;
@@ -261,6 +257,5 @@
 
     UIIndicatorNetworkAdapters(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
       , m_pUpdateTimer(new QTimer(this))
     {
@@ -361,5 +356,5 @@
 };
 
-class UIIndicatorUSBDevices : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorUSBDevices : public QIStateIndicator
 {
     Q_OBJECT;
@@ -368,6 +363,5 @@
 
     UIIndicatorUSBDevices(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/usb_16px.png"));
@@ -419,5 +413,5 @@
 };
 
-class UIIndicatorSharedFolders : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorSharedFolders : public QIStateIndicator
 {
     Q_OBJECT;
@@ -426,6 +420,5 @@
 
     UIIndicatorSharedFolders(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(KDeviceActivity_Idle, QPixmap(":/shared_folder_16px.png"));
@@ -495,5 +488,5 @@
 };
 
-class UIIndicatorVideoCapture : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorVideoCapture : public QIStateIndicator
 {
     Q_OBJECT;
@@ -511,6 +504,5 @@
     /* Constructor: */
     UIIndicatorVideoCapture(CSession &session)
-        : QIWithRetranslateUI<QIStateIndicator>()
-        , m_session(session)
+        : m_session(session)
         , m_pUpdateTimer(new QTimer(this))
     {
@@ -587,5 +579,5 @@
 };
 
-class UIIndicatorVirtualization : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorVirtualization : public QIStateIndicator
 {
     Q_OBJECT;
@@ -594,6 +586,5 @@
 
     UIIndicatorVirtualization(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/vtx_amdv_disabled_16px.png"));
@@ -663,5 +654,5 @@
 };
 
-class UIIndicatorMouse : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorMouse : public QIStateIndicator
 {
     Q_OBJECT;
@@ -670,6 +661,5 @@
 
     UIIndicatorMouse(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/mouse_disabled_16px.png"));
@@ -715,5 +705,5 @@
 };
 
-class UIIndicatorHostkey : public QIWithRetranslateUI<QIStateIndicator>
+class UIIndicatorHostkey : public QIStateIndicator
 {
     Q_OBJECT;
@@ -722,6 +712,5 @@
 
     UIIndicatorHostkey(CSession &session)
-      : QIWithRetranslateUI<QIStateIndicator>()
-      , m_session(session)
+      : m_session(session)
     {
         setStateIcon(0, QPixmap(":/hostkey_16px.png"));