Changeset 52497 in vbox

Timestamp:

Aug 25, 2014 4:40:13 PM (10 years ago)

Author:

vboxsync

Message:

Main/Machine: simplify object reference assignments

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -891 +891 @@
     /* mParent is constant during life time, no need to lock */
     ComObjPtr<VirtualBox> pVirtualBox(mParent);
-    pVirtualBox.queryInterfaceTo(aParent.asOutParam());
+    aParent = pVirtualBox;
 
     return S_OK;
@@ -969 +969 @@
                         Utf8Str(mData->mAccessError.getComponent()).c_str(),
                         Utf8Str(mData->mAccessError.getText()));
-        rc = errorInfo.queryInterfaceTo(aAccessError.asOutParam());
+        aAccessError = errorInfo;
     }
 
@@ -2091 +2091 @@
 {
     /* mBIOSSettings is constant during life time, no need to lock */
-    mBIOSSettings.queryInterfaceTo(aBIOSSettings.asOutParam());
+    aBIOSSettings = mBIOSSettings;
 
     return S_OK;
@@ -2523 +2523 @@
     for (MediaData::AttachmentList::iterator it = mMediaData->mAttachments.begin();
          it != mMediaData->mAttachments.end(); ++it, ++i)
-        (*it).queryInterfaceTo(aMediumAttachments[i].asOutParam());
+        aMediumAttachments[i] = *it;
 
     return S_OK;
@@ -2534 +2534 @@
     Assert(!!mVRDEServer);
 
-    mVRDEServer.queryInterfaceTo(aVRDEServer.asOutParam());
+    aVRDEServer = mVRDEServer;
 
     return S_OK;
@@ -2543 +2543 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mAudioAdapter.queryInterfaceTo(aAudioAdapter.asOutParam());
+    aAudioAdapter = mAudioAdapter;
 
     return S_OK;
@@ -2565 +2565 @@
     size_t i = 0;
     for (USBControllerList::iterator it = data.begin(); it != data.end(); ++i, ++it)
-        (*it).queryInterfaceTo(aUSBControllers[i].asOutParam());
+        aUSBControllers[i] = *it;
 
     return S_OK;
@@ -2590 +2590 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    return rc = mUSBDeviceFilters.queryInterfaceTo(aUSBDeviceFilters.asOutParam());
+    aUSBDeviceFilters = mUSBDeviceFilters;
+    return rc;
 #else
     /* Note: The GUI depends on this method returning E_NOTIMPL with no
@@ -2693 +2694 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    mData->mCurrentSnapshot.queryInterfaceTo(aCurrentSnapshot.asOutParam());
+    aCurrentSnapshot = mData->mCurrentSnapshot;
 
     return S_OK;
@@ -2732 +2733 @@
     for (std::list<ComObjPtr<SharedFolder> >::iterator it = mHWData->mSharedFolders.begin();
          it != mHWData->mSharedFolders.end(); ++i, ++it)
-        (*it).queryInterfaceTo(aSharedFolders[i].asOutParam());
+        aSharedFolders[i] = *it;
 
     return S_OK;
@@ -2836 +2837 @@
     aStorageControllers.resize(data.size());
     for (StorageControllerList::iterator it = data.begin(); it != data.end(); ++it, ++i)
-        (*it).queryInterfaceTo(aStorageControllers[i].asOutParam());
+        aStorageControllers[i] = *it;
     return S_OK;
 }
@@ -3594 +3595 @@
             if (SUCCEEDED(rc))
             {
-                progress.queryInterfaceTo(aProgress.asOutParam());
+                aProgress = progress;
 
                 /* signal the client watcher thread */
@@ -4779 +4780 @@
                         aDevice, aControllerPort, aName.c_str());
 
-    pAttach->i_getMedium().queryInterfaceTo(aMedium.asOutParam());
+    aMedium = pAttach->i_getMedium();
 
     return S_OK;