Changeset 51614 in vbox for trunk/src/VBox

Timestamp:

Jun 12, 2014 5:00:55 PM (11 years ago)

Author:

vboxsync

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

94353

Message:

6813 Use of server side API wrapper code - ConsoleImpl.cpp - vn3

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -3235 +3235 @@
     ComObjPtr<IProgress> iProgress;
     MachineState_T machineState = MachineState_Null;
-    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, BSTR(aId.toString().c_str()), BSTR(aId.toString().c_str()),
-                                          FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
+    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, BSTR(aId.toString().c_str()), BSTR(aId.toString().c_str()), FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
     if (FAILED(rc)) return rc;
     iProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3256 +3255 @@
     ComObjPtr<IProgress> iProgress;
     MachineState_T machineState = MachineState_Null;
-    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, BSTR(aId.toString().c_str()), BSTR(aId.toString().c_str()),
-                                          TRUE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
+    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, BSTR(aId.toString().c_str()), BSTR(aId.toString().c_str()), TRUE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
     if (FAILED(rc)) return rc;
     iProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -8464 +8462 @@
  * @todo Move this back into the driver!
  */
-HRESULT Console::attachToTapInterface(INetworkAdapter *networkAdapter)
+HRESULT Console::i_attachToTapInterface(INetworkAdapter *networkAdapter)
 {
     LogFlowThisFunc(("\n"));
@@ -8529 +8527 @@
             if (fcntl(RTFileToNative(maTapFD[slot]), F_SETFL, O_NONBLOCK) != -1)
             {
-                Log(("attachToTapInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw()));
+                Log(("i_attachToTapInterface: %RTfile %ls\n", maTapFD[slot], tapDeviceName.raw()));
                 /*
                  * Here is the right place to communicate the TAP file descriptor and
@@ -8634 +8632 @@
  * @todo Move this back into the driver!
  */
-HRESULT Console::detachFromTapInterface(INetworkAdapter *networkAdapter)
+HRESULT Console::i_detachFromTapInterface(INetworkAdapter *networkAdapter)
 {
     /* sanity check */
@@ -8730 +8728 @@
         {
 #if ((defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)) && !defined(VBOX_WITH_NETFLT))
-            HRESULT rc2 = detachFromTapInterface(pNetworkAdapter);
+            HRESULT rc2 = i_detachFromTapInterface(pNetworkAdapter);
             if (FAILED(rc2) && SUCCEEDED(rc))
                 rc = rc2;
@@ -9280 +9278 @@
                                       "The shared folder setup will not be complete. It is recommended to power down the virtual "
                                       "machine and fix the shared folder settings while the machine is not running"),
-                                      it->first.c_str(), eik.getText().raw());
+                                    it->first.c_str(), eik.getText().raw());
                         }
                     }