Changeset 32780 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Sep 27, 2010 7:00:22 PM (14 years ago)

Author:

vboxsync

Message:

com/Guid: remove conversion operators to eliminate any compiler surprises. Caught one totally unexpected issue which was indirectly caused by the similar Bstr cleanup, as there still is a Bstr->Guid conversion and thus the Guid magic was triggered

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (8 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -300 +300 @@
 
         mUserData->s.strName = strName;
-        mUserData->s.fNameSync = aNameSync;
+        mUserData->s.fNameSync = !!aNameSync;
 
         /* initialize the default snapshots folder
@@ -890 +890 @@
     {
         errorInfo->init(mData->mAccessError.getResultCode(),
-                        mData->mAccessError.getInterfaceID(),
+                        mData->mAccessError.getInterfaceID().ref(),
                         Utf8Str(mData->mAccessError.getComponent()).c_str(),
                         Utf8Str(mData->mAccessError.getText()));
@@ -6952 +6952 @@
                                 data.hardware,
                                 data.storage,
-                                data.uuid,
+                                data.uuid.ref(),
                                 strStateFile);
     if (FAILED(rc)) return rc;
@@ -7463 +7463 @@
         aSnapshot = mData->mFirstSnapshot;
     else
-        aSnapshot = mData->mFirstSnapshot->findChildOrSelf(aId);
+        aSnapshot = mData->mFirstSnapshot->findChildOrSelf(aId.ref());
 
     if (!aSnapshot)
@@ -8090 +8090 @@
         // memory
         data.ulMemorySizeMB = mHWData->mMemorySize;
-        data.fPageFusionEnabled = mHWData->mPageFusionEnabled;
+        data.fPageFusionEnabled = !!mHWData->mPageFusionEnabled;
 
         // firmware
@@ -10303 +10303 @@
     USBProxyService *service = mParent->host()->usbProxyService();
     AssertReturn(service, E_FAIL);
-    return service->captureDeviceForVM(this, Guid(aId));
+    return service->captureDeviceForVM(this, Guid(aId).ref());
 #else
     NOREF(aId);
@@ -10323 +10323 @@
     USBProxyService *service = mParent->host()->usbProxyService();
     AssertReturn(service, E_FAIL);
-    return service->detachDeviceFromVM(this, Guid(aId), !!aDone);
+    return service->detachDeviceFromVM(this, Guid(aId).ref(), !!aDone);
 #else
     NOREF(aId);
@@ -11219 +11219 @@
 
     /* remove the completed progress object */
-    mParent->removeProgress(mSnapshotData.mProgressId);
+    mParent->removeProgress(mSnapshotData.mProgressId.ref());
 
     /* clear out the temporary saved state data */