Changeset 78298 in vbox for trunk/src/VBox

Timestamp:

Apr 25, 2019 5:09:37 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:7127: Heavy cleanup for UIMediumEnumerator classes: Reordering.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMediumEnumerator.cpp (modified) (3 diffs)
• UIMediumEnumerator.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -20 +20 @@
 
 /* GUI includes: */
+#include "VBoxGlobal.h"
 #include "UIMediumEnumerator.h"
 #include "UIThreadPool.h"
 #include "UIVirtualBoxEventHandler.h"
-#include "VBoxGlobal.h"
 
 /* COM includes: */
 #include "COMEnums.h"
 #include "CMachine.h"
+#include "CMediumAttachment.h"
 #include "CSnapshot.h"
-#include "CMediumAttachment.h"
 
 
@@ -202 +202 @@
 }
 
+void UIMediumEnumerator::retranslateUi()
+{
+    /* Translating NULL UIMedium by recreating it: */
+    if (m_media.contains(UIMedium::nullID()))
+        m_media[UIMedium::nullID()] = UIMedium();
+}
+
 void UIMediumEnumerator::sltHandleMachineUpdate(const QUuid &uMachineID)
 {
@@ -373 +380 @@
         emit sigMediumEnumerationFinished();
     }
-}
-
-void UIMediumEnumerator::retranslateUi()
-{
-    /* Translating NULL uimedium by recreating it: */
-    if (m_media.contains(UIMedium::nullID()))
-        m_media[UIMedium::nullID()] = UIMedium();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.h

@@ -27 +27 @@
 
 /* GUI includes: */
+#include "QIWithRetranslateUI.h"
 #include "UILibraryDefs.h"
 #include "UIMedium.h"
-#include "QIWithRetranslateUI.h"
 
 /* Forward declarations: */
+class UITask;
 class UIThreadPool;
-class UITask;
 
 /* Typedefs: */
@@ -71 +71 @@
     void refreshMedia();
 
+protected:
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */;
+
 private slots:
 
@@ -84 +89 @@
 
 private:
-
-    /** Handles translation event. */
-    virtual void retranslateUi() /* override */;
 
     /* Helpers: Medium-enumeration stuff: */