Changeset 23223 in vbox for trunk/src/VBox/Main/xpcom

Timestamp:

Sep 22, 2009 3:50:03 PM (16 years ago)

Author:

vboxsync

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

52692

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

File:

• trunk/src/VBox/Main/xpcom/server.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xpcom/server.cpp

@@ -78 +78 @@
 #include <SnapshotImpl.h>
 #include <MediumImpl.h>
-#include <HardDiskImpl.h>
-#include <HardDiskFormatImpl.h>
+#include <MediumFormatImpl.h>
 #include <ProgressImpl.h>
-#include <DVDDriveImpl.h>
-#include <FloppyDriveImpl.h>
 #include <VRDPServerImpl.h>
 #include <SharedFolderImpl.h>
 #include <HostImpl.h>
-#include <HostDVDDriveImpl.h>
-#include <HostFloppyDriveImpl.h>
 #include <HostNetworkInterfaceImpl.h>
 #include <GuestOSTypeImpl.h>
@@ -130 +125 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Snapshot, ISnapshot)
 
-NS_DECL_CLASSINFO(DVDImage)
-NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(DVDImage,
-                                           IMedium, ImageMediumBase,
-                                           IDVDImage, DVDImage)
-NS_DECL_CLASSINFO(FloppyImage)
-NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(FloppyImage,
-                                           IMedium, ImageMediumBase,
-                                           IFloppyImage, FloppyImage)
-
-NS_DECL_CLASSINFO(HardDisk)
-NS_IMPL_THREADSAFE_ISUPPORTS2_AMBIGUOUS_CI(HardDisk,
-                                           IMedium, MediumBase,
-                                           IHardDisk, HardDisk)
-
-NS_DECL_CLASSINFO(HardDiskFormat)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HardDiskFormat, IHardDiskFormat)
-
-NS_DECL_CLASSINFO(HardDiskAttachment)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HardDiskAttachment, IHardDiskAttachment)
+NS_DECL_CLASSINFO(Medium)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Medium, IMedium)
+
+NS_DECL_CLASSINFO(MediumFormat)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(MediumFormat, IMediumFormat)
+
+NS_DECL_CLASSINFO(MediumAttachment)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(MediumAttachment, IMediumAttachment)
 
 NS_DECL_CLASSINFO(Progress)
@@ -155 +139 @@
 NS_DECL_CLASSINFO(CombinedProgress)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(CombinedProgress, IProgress)
-
-NS_DECL_CLASSINFO(DVDDrive)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(DVDDrive, IDVDDrive)
-
-NS_DECL_CLASSINFO(FloppyDrive)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(FloppyDrive, IFloppyDrive)
 
 NS_DECL_CLASSINFO(SharedFolder)
@@ -172 +150 @@
 NS_DECL_CLASSINFO(Host)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Host, IHost)
-
-NS_DECL_CLASSINFO(HostDVDDrive)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostDVDDrive, IHostDVDDrive)
-
-NS_DECL_CLASSINFO(HostFloppyDrive)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostFloppyDrive, IHostFloppyDrive)
 
 NS_DECL_CLASSINFO(HostNetworkInterface)