Changeset 13580 in vbox for trunk/src/VBox/Main/include/FloppyDriveImpl.h

Timestamp:

Oct 27, 2008 2:04:18 PM (16 years ago)

Author:

vboxsync

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

38479

Message:

Ported s2 branch (r37120:38456).

File:

• trunk/src/VBox/Main/include/FloppyDriveImpl.h (modified) (6 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2008 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 #include "VirtualBoxBase.h"
 
+#include "MediumImpl.h"
+
 class Machine;
 
@@ -42 +44 @@
         {
             mEnabled    = true;
-            mDriveState = DriveState_NotMounted;
+            mState = DriveState_NotMounted;
         }
 
@@ -48 +50 @@
         {
             return this == &that ||
-                   (mDriveState == that.mDriveState &&
-                    mFloppyImage.equalsTo (that.mFloppyImage) &&
+                   (mState == that.mState &&
+                    mImage.equalsTo (that.mImage) &&
                     mHostDrive.equalsTo (that.mHostDrive));
         }
 
         BOOL mEnabled;
-        ComPtr <IFloppyImage> mFloppyImage;
+        ComObjPtr <FloppyImage2> mImage;
         ComPtr <IHostFloppyDrive> mHostDrive;
-        DriveState_T mDriveState;
+        DriveState_T mState;
     };
 
@@ -86 +88 @@
     STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
     STDMETHOD(COMSETTER(Enabled)) (BOOL aEnabled);
-    STDMETHOD(COMGETTER(State)) (DriveState_T *aDriveState);
+    STDMETHOD(COMGETTER(State)) (DriveState_T *aState);
 
     // IFloppyDrive methods
@@ -92 +94 @@
     STDMETHOD(CaptureHostDrive) (IHostFloppyDrive *aHostFloppyDrive);
     STDMETHOD(Unmount)();
-    STDMETHOD(GetImage) (IFloppyImage **aFloppyImage);
+    STDMETHOD(GetImage) (IFloppyImage2 **aFloppyImage);
     STDMETHOD(GetHostDrive) (IHostFloppyDrive **aHostFloppyDrive);