Changeset 48314 in vbox for trunk/src/VBox

Timestamp:

Sep 5, 2013 3:54:32 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Get rid of global UIMedium dependency over whole the GUI project.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIMediumTypeChangeDialog.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (2 diffs)
• runtime/UIIndicatorsPool.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (1 diff)
• widgets/VBoxMediaComboBox.cpp (modified) (1 diff)
• wizards/clonevd/UIWizardCloneVDPageBasic1.cpp (modified) (1 diff)
• wizards/firstrun/UIWizardFirstRun.cpp (modified) (1 diff)
• wizards/firstrun/UIWizardFirstRunPageBasic.cpp (modified) (1 diff)
• wizards/newvd/UIWizardNewVD.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic3.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp

@@ -31 +31 @@
 #include "QIDialogButtonBox.h"
 #include "UIConverter.h"
+#include "UIMedium.h"
 
 /* Constructor: */

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

@@ -71 +71 @@
 #include "UIConverter.h"
 #include "UIMediumEnumerator.h"
+#include "UIMedium.h"
 
 #ifdef Q_WS_X11

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -33 +33 @@
 /* GUI includes: */
 #include "UIDefs.h"
+#include "UIMediumDefs.h"
 #include "VBoxGlobalSettings.h"
-#include "UIMedium.h"
 
 /* COM includes: */
@@ -53 +53 @@
 class QSpinBox;
 class UIMediumEnumerator;
+class UIMedium;
 
 // VBoxGlobal class

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

@@ -28 +28 @@
 #include "UIConverter.h"
 #include "UIAnimationFramework.h"
+#include "UIMedium.h"
 
 /* COM includes: */

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

@@ -54 +54 @@
 #include "UIConverter.h"
 #include "UIModalWindowManager.h"
+#include "UIMedium.h"
 #ifdef Q_WS_MAC
 # include "DockIconPreview.h"

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

@@ -27 +27 @@
 #include "UISession.h"
 #include "UIMachine.h"
+#include "UIMedium.h"
 #include "UIActionPoolRuntime.h"
 #include "UIMachineLogic.h"
@@ -70 +71 @@
 #include "CUSBDeviceFilters.h"
 #include "CSnapshot.h"
+#include "CMedium.h"
 
 UISession::UISession(UIMachine *pMachine, CSession &sessionReference)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -45 +45 @@
 #include "CUSBDeviceFilter.h"
 #include "CSharedFolder.h"
+#include "CMedium.h"
 
 /* Constructor: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -37 +37 @@
 #include "UIMachineSettingsStorage.h"
 #include "UIConverter.h"
+#include "UIMedium.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp

@@ -18 +18 @@
  */
 
-#include "VBoxMediaComboBox.h"
-
+/* Qt includes: */
 #include <QFileInfo>
 #include <QDir>
 #include <QAbstractItemView>
+
+/* GUI includes: */
+#include "VBoxMediaComboBox.h"
+#include "UIMedium.h"
 
 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp

@@ -29 +29 @@
 #include "VBoxMediaComboBox.h"
 #include "QIToolButton.h"
+#include "UIMedium.h"
 
 UIWizardCloneVDPage1::UIWizardCloneVDPage1()

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp

@@ -23 +23 @@
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

@@ -31 +31 @@
 #include "QIToolButton.h"
 #include "QIRichTextLabel.h"
+#include "UIMedium.h"
 
 UIWizardFirstRunPage::UIWizardFirstRunPage(bool fBootHardDiskWasSet)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp

@@ -22 +22 @@
 
 /* GUI includes: */
+#include "VBoxGlobal.h"
 #include "UIWizardNewVD.h"
 #include "UIWizardNewVDPageBasic1.h"
@@ -27 +28 @@
 #include "UIWizardNewVDPageBasic3.h"
 #include "UIWizardNewVDPageExpert.h"
-#include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -19 +19 @@
 
 /* GUI includes: */
+#include "VBoxGlobal.h"
 #include "UIWizardNewVM.h"
 #include "UIWizardNewVMPageBasic1.h"
@@ -24 +25 @@
 #include "UIWizardNewVMPageBasic3.h"
 #include "UIWizardNewVMPageExpert.h"
-#include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp

@@ -33 +33 @@
 #include "UIWizardNewVD.h"
 #include "QIRichTextLabel.h"
+#include "UIMedium.h"
 
 UIWizardNewVMPage3::UIWizardNewVMPage3()

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -37 +37 @@
 #include "VBoxMediaComboBox.h"
 #include "QIToolButton.h"
+#include "UIMedium.h"
 
 UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)