Changeset 24989 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Nov 26, 2009 11:31:46 AM (15 years ago)

Author:

vboxsync

Message:

Main: enable -Wshadow gcc option to warn about shadowed variables and fix all resulting warnings; in particular, rename some stack and member variables and rename getter methods like id() to getId()

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (12 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1055 +1055 @@
         // don't lock the folder because methods we access are const
 
-        Utf8Str name = folder->name();
+        Utf8Str name = folder->getName();
         vrc = SSMR3PutU32(pSSM, (uint32_t)name.length() + 1 /* term. 0 */);
         AssertRC(vrc);
@@ -1061 +1061 @@
         AssertRC(vrc);
 
-        Utf8Str hostPath = folder->hostPath();
+        Utf8Str hostPath = folder->getHostPath();
         vrc = SSMR3PutU32(pSSM, (uint32_t)hostPath.length() + 1 /* term. 0 */);
         AssertRC(vrc);
@@ -1067 +1067 @@
         AssertRC(vrc);
 
-        vrc = SSMR3PutBool(pSSM, !!folder->writable());
+        vrc = SSMR3PutBool(pSSM, !!folder->isWritable());
         AssertRC(vrc);
     }
@@ -2668 +2668 @@
         pTask->mProgress.queryInterfaceTo(aProgress);
     }
-    catch (HRESULT rc)
+    catch (HRESULT erc)
     {
         delete pTask;
-        NOREF(rc);
+        NOREF(erc);
         mptrCancelableProgress.setNull();
     }
@@ -4792 +4792 @@
         for (SharedFolderMap::const_iterator it = mSharedFolders.begin();
              it != mSharedFolders.end(); ++ it)
-            sharedFolders[it->first] = SharedFolderData(it->second->hostPath(), it->second->writable());
+            sharedFolders[it->first] = SharedFolderData(it->second->getHostPath(), it->second->isWritable());
     }
 
@@ -5194 +5194 @@
         {
             PPDMIBASE pBase;
-            int vrc = PDMR3QueryLun(mpVM, "usb-ohci", 0, 0, &pBase);
+            vrc = PDMR3QueryLun(mpVM, "usb-ohci", 0, 0, &pBase);
             if (RT_SUCCESS(vrc))
             {
@@ -6061 +6061 @@
         ComObjPtr<OUSBDevice> device;
         device.createObject();
-        HRESULT hrc = device->init(aHostDevice);
+        hrc = device->init(aHostDevice);
         AssertComRC(hrc);
 
@@ -6629 +6629 @@
      * Mark all existing remote USB devices as dirty.
      */
-    RemoteUSBDeviceList::iterator it = mRemoteUSBDevices.begin();
-    while (it != mRemoteUSBDevices.end())
+    for (RemoteUSBDeviceList::iterator it = mRemoteUSBDevices.begin();
+         it != mRemoteUSBDevices.end();
+         ++it)
     {
         (*it)->dirty(true);
-        ++ it;
     }
 
@@ -6653 +6653 @@
         bool fNewDevice = true;
 
-        it = mRemoteUSBDevices.begin();
-        while (it != mRemoteUSBDevices.end())
+        for (RemoteUSBDeviceList::iterator it = mRemoteUSBDevices.begin();
+             it != mRemoteUSBDevices.end();
+             ++it)
         {
             if ((*it)->devId() == e->id
@@ -6664 +6665 @@
                break;
             }
-
-            ++ it;
         }
 
@@ -7309 +7308 @@
 
         /* Pass all custom parameters. */
-        SafeArray<BSTR> names;
-        SafeArray<BSTR> values;
+        SafeArray<BSTR> aNames;
+        SafeArray<BSTR> aValues;
         hrc = medium->GetProperties(NULL,
-                                    ComSafeArrayAsOutParam(names),
-                                    ComSafeArrayAsOutParam(values));            H();
-
-        if (names.size() != 0)
+                                    ComSafeArrayAsOutParam(aNames),
+                                    ComSafeArrayAsOutParam(aValues));            H();
+
+        if (aNames.size() != 0)
         {
             PCFGMNODE pVDC;
             rc = CFGMR3InsertNode(pCur, "VDConfig", &pVDC);             RC_CHECK();
-            for (size_t i = 0; i < names.size(); ++ i)
+            for (size_t i = 0; i < aNames.size(); ++ i)
             {
-                if (values[i])
+                if (aValues[i])
                 {
-                    Utf8Str name = names[i];
-                    Utf8Str value = values[i];
+                    Utf8Str name = aNames[i];
+                    Utf8Str value = aValues[i];
                     rc = CFGMR3InsertString(pVDC, name.c_str(), value.c_str());
                     if (    !(name.compare("HostIPStack"))
@@ -7508 +7507 @@
                  * to access Console.
                  */
-                int vrc = VMR3ReqCallWait(that->mpVM,
-                                          VMCPUID_ANY,
-                                          (PFNRT)reconfigureMedium,
-                                          6,
-                                          that->mpVM,
-                                          lInstance,
-                                          enmController,
-                                          enmBus,
-                                          atts[i],
-                                          &rc);
+                vrc = VMR3ReqCallWait(that->mpVM,
+                                      VMCPUID_ANY,
+                                      (PFNRT)reconfigureMedium,
+                                      6,
+                                      that->mpVM,
+                                      lInstance,
+                                      enmController,
+                                      enmBus,
+                                      atts[i],
+                                      &rc);
                 if (RT_FAILURE(vrc))
                     throw setError(E_FAIL, Console::tr("%Rrc"), vrc);