Changeset 37201 in vbox for trunk

Timestamp:

May 24, 2011 3:46:44 PM (14 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl: build fixes

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -7780 +7780 @@
         /* The name of the TAP interface we are using */
         Bstr tapDeviceName;
-        rc = networkAdapter->COMGETTER(HostInterface)(tapDeviceName.asOutParam());
+        rc = networkAdapter->COMGETTER(BridgedInterface)(tapDeviceName.asOutParam());
         if (FAILED(rc))
             tapDeviceName.setNull(); /* Is this necessary? */
@@ -7945 +7945 @@
         Bstr tapDeviceName, tapTerminateApplication;
         bool isStatic = true;
-        rc = networkAdapter->COMGETTER(HostInterface)(tapDeviceName.asOutParam());
+        rc = networkAdapter->COMGETTER(BridgedInterface)(tapDeviceName.asOutParam());
         if (FAILED(rc) || tapDeviceName.isEmpty())
         {

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

@@ -462 +462 @@
 {
     HRESULT hrc = S_OK;
-    PCFGMNODE pDev, pInst, pCfg, pLunL0;
+    PCFGMNODE pInst, pCfg, pLunL0;
 
     SafeIfaceArray<IPciDeviceAttachment> assignments;
@@ -3335 +3335 @@
                 SafeArray<BSTR> names;
                 SafeArray<BSTR> values;
-                hrc = pMedium->GetProperties((CBSTR)L"",
+                hrc = pMedium->GetProperties(Bstr().raw(),
                                              ComSafeArrayAsOutParam(names),
                                              ComSafeArrayAsOutParam(values));               H();
@@ -4385 +4385 @@
                 SafeArray<BSTR> names;
                 SafeArray<BSTR> values;
-                hrc = aNetworkAdapter->GetProperties((CBSTR)L"",
+                hrc = aNetworkAdapter->GetProperties(Bstr().raw(),
                                                      ComSafeArrayAsOutParam(names),
                                                      ComSafeArrayAsOutParam(values));       H();