Changeset 48316 in vbox

Timestamp:

Sep 5, 2013 4:14:52 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of few local UIMedium dependencies over whole the GUI project.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• medium/UIMediumManager.cpp (modified) (2 diffs)
• medium/UIMediumManager.h (modified) (3 diffs)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/UISelectorWindow.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -30 +30 @@
 
 /* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
 #include "UIMessageCenter.h"
-#include "VBoxGlobal.h"
 #include "UISelectorWindow.h"
 #include "UIProgressDialog.h"
 #include "UINetworkManager.h"
 #include "UINetworkManagerDialog.h"
-#include "UIConverter.h"
 #include "UIModalWindowManager.h"
+#include "UIMedium.h"
 #ifdef VBOX_OSE
 # include "UIDownloaderUserManual.h"

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

@@ -39 +39 @@
 #include "UIIconPool.h"
 #include "UIMediumTypeChangeDialog.h"
+#include "UIMedium.h"
 
 /* COM includes: */
@@ -1753 +1754 @@
 
 /* static */
-bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(UIMedium medium)
+bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium)
 {
     /* Iterate till the root: */
+    UIMedium mediumIterator = medium;
     do
     {
         /* Ignore medium if its hidden
          * or attached to hidden machines only: */
-        if (medium.isHidden())
+        if (mediumIterator.isHidden())
             return true;
         /* Move iterator to parent: */
-        medium = medium.parent();
-    }
-    while (!medium.isNull());
+        mediumIterator = mediumIterator.parent();
+    }
+    while (!mediumIterator.isNull());
     /* False by default: */
     return false;

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

@@ -24 +24 @@
 #include "QIWithRetranslateUI.h"
 #include "QIMainDialog.h"
-#include "UIMedium.h"
+#include "UIMediumDefs.h"
 
 /* COM includes: */
@@ -35 +35 @@
 class UIMediumItem;
 class UIEnumerationProgressBar;
+class UIMedium;
 
 /* Medium Manager Dialog: */
@@ -152 +153 @@
 
     /* Static helper: Enumeration stuff: */
-    static bool isMediumAttachedToHiddenMachinesOnly(UIMedium medium);
+    static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
 
     /* Variable: Singleton instance: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -46 +46 @@
 #include "UIVirtualBoxEventHandler.h"
 #include "UIMediumManager.h"
+#include "UIMedium.h"
 #include "UIMessageCenter.h"
 #include "UISelectorWindow.h"

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h

@@ -26 +26 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIMedium.h"
 #include "UINetworkDefs.h"
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -44 +44 @@
 
 /* COM includes: */
+#include "CVirtualBox.h"
 #include "CMachine.h"
-#include "CVirtualBox.h"
+#include "CMedium.h"
 
 /* Type defs: */