Changeset 26044 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jan 26, 2010 12:21:34 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56955

Message:

Main: move Host::Get{DVD|Floppy}Drives implementation into implementation methods to eliminate useless conversions in mountMedium()

Location:

trunk/src/VBox/Main/include

Files:

• ApplianceImpl.h (modified) (1 diff)
• AudioAdapterImpl.h (modified) (1 diff)
• BIOSSettingsImpl.h (modified) (1 diff)
• DHCPServerImpl.h (modified) (1 diff)
• HostImpl.h (modified) (2 diffs)
• HostPower.h (modified) (1 diff)
• MachineImpl.h (modified) (1 diff)
• MediumAttachmentImpl.h (modified) (1 diff)
• MediumImpl.h (modified) (2 diffs)
• NetworkAdapterImpl.h (modified) (1 diff)
• ParallelPortImpl.h (modified) (1 diff)
• PerformanceImpl.h (modified) (1 diff)
• ProgressImpl.h (modified) (1 diff)
• SerialPortImpl.h (modified) (1 diff)
• SharedFolderImpl.h (modified) (2 diffs)
• SnapshotImpl.h (modified) (1 diff)
• StorageControllerImpl.h (modified) (1 diff)
• SystemPropertiesImpl.h (modified) (1 diff)
• USBControllerImpl.h (modified) (1 diff)
• VFSExplorerImpl.h (modified) (1 diff)
• VRDPServerImpl.h (modified) (1 diff)
• VirtualBoxBase.h (modified) (1 diff)
• VirtualBoxImpl.h (modified) (1 diff)

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -31 +31 @@
 
 /* VBox forward declarations */
-class VirtualBox;
 class Progress;
 

trunk/src/VBox/Main/include/AudioAdapterImpl.h

@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-
-class Machine;
 
 namespace settings

trunk/src/VBox/Main/include/BIOSSettingsImpl.h

@@ -27 +27 @@
 #include "VirtualBoxBase.h"
 
-class Machine;
 class GuestOSType;
 

trunk/src/VBox/Main/include/DHCPServerImpl.h

@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-
-class VirtualBox;
 
 #ifdef VBOX_WITH_HOSTNETIF_API

trunk/src/VBox/Main/include/HostImpl.h

@@ -27 +27 @@
 class HostUSBDeviceFilter;
 class USBProxyService;
-class VirtualBox;
 class SessionMachine;
 class Progress;
 class PerformanceCollector;
-class Medium;
 
 namespace settings
@@ -124 +122 @@
     HRESULT saveSettings(settings::Host &data);
 
+    HRESULT getDVDDrives(MediaList &ll);
+    HRESULT getFloppyDrives(MediaList &ll);
+
 #ifdef VBOX_WITH_USB
     typedef std::list< ComObjPtr<HostUSBDeviceFilter> > USBDeviceFilterList;

trunk/src/VBox/Main/include/HostPower.h

@@ -32 +32 @@
 # include <Carbon/Carbon.h>
 #endif /* RT_OS_DARWIN */
-
-class VirtualBox;
 
 typedef enum

trunk/src/VBox/Main/include/MachineImpl.h

@@ -57 +57 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-class VirtualBox;
 class Progress;
 class Keyboard;

trunk/src/VBox/Main/include/MediumAttachmentImpl.h

@@ -24 +24 @@
 
 #include "VirtualBoxBase.h"
-
-class Machine;
-class Medium;
 
 class ATL_NO_VTABLE MediumAttachment :

trunk/src/VBox/Main/include/MediumImpl.h

@@ -26 +26 @@
 #include "VirtualBoxBase.h"
 
-class VirtualBox;
 class Progress;
 struct VM;
@@ -36 +35 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-
-class Medium;
-typedef std::list< ComObjPtr<Medium> > MediaList;
 
 /**

trunk/src/VBox/Main/include/NetworkAdapterImpl.h

@@ -27 +27 @@
 #include "VirtualBoxBase.h"
 
-class Machine;
 class GuestOSType;
 

trunk/src/VBox/Main/include/ParallelPortImpl.h

@@ -25 +25 @@
 
 #include "VirtualBoxBase.h"
-
-class Machine;
 
 namespace settings

trunk/src/VBox/Main/include/PerformanceImpl.h

@@ -48 +48 @@
 #define VBOX_USAGE_SAMPLER_MIN_INTERVAL 1000
 
-class Machine;
 class HostUSBDevice;
 

trunk/src/VBox/Main/include/ProgressImpl.h

@@ -30 +30 @@
 #include <iprt/semaphore.h>
 
-class VirtualBox;
-
 ////////////////////////////////////////////////////////////////////////////////
 

trunk/src/VBox/Main/include/SerialPortImpl.h

@@ -27 +27 @@
 #include "VirtualBoxBase.h"
 
-class Machine;
 class GuestOSType;
 

trunk/src/VBox/Main/include/SharedFolderImpl.h

@@ -26 +26 @@
 #include <VBox/shflsvc.h>
 
-class Machine;
 class Console;
-class VirtualBox;
 
 class ATL_NO_VTABLE SharedFolder :
@@ -66 +64 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (Machine *aMachine, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
-    HRESULT initCopy (Machine *aMachine, SharedFolder *aThat);
-    HRESULT init (Console *aConsole, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
-    HRESULT init (VirtualBox *aVirtualBox, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
+    HRESULT init(Machine *aMachine, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
+    HRESULT initCopy(Machine *aMachine, SharedFolder *aThat);
+    HRESULT init(Console *aConsole, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
+    HRESULT init(VirtualBox *aVirtualBox, CBSTR aName, CBSTR aHostPath, BOOL aWritable);
     void uninit();
 

trunk/src/VBox/Main/include/SnapshotImpl.h

@@ -28 +28 @@
 
 class SnapshotMachine;
-class VirtualBox;
 
 namespace settings

trunk/src/VBox/Main/include/StorageControllerImpl.h

@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-
-class Machine;
 
 class ATL_NO_VTABLE StorageController :

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -32 +32 @@
 #include <list>
 
-class VirtualBox;
 namespace settings
 {

trunk/src/VBox/Main/include/USBControllerImpl.h

@@ -27 +27 @@
 #include "VirtualBoxBase.h"
 
-class Machine;
 class HostUSBDevice;
 class USBDeviceFilter;

trunk/src/VBox/Main/include/VFSExplorerImpl.h

@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
-
-class VirtualBox;
 
 class ATL_NO_VTABLE VFSExplorer :

trunk/src/VBox/Main/include/VRDPServerImpl.h

@@ -28 +28 @@
 
 #include <VBox/VRDPAuth.h>
-
-class Machine;
 
 namespace settings

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -47 +47 @@
 class AutoInitSpan;
 class AutoUninitSpan;
+
+class VirtualBox;
+class Machine;
+class Medium;
+class Host;
+typedef std::list< ComObjPtr<Medium> > MediaList;
 
 ////////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Main/include/VirtualBoxImpl.h

@@ -37 +37 @@
 }
 
-class Machine;
 class SessionMachine;
-class Medium;
 class GuestOSType;
 class SharedFolder;