Changeset 24989 in vbox for trunk/src/VBox/Main/USBControllerImpl.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/USBControllerImpl.cpp (modified) (14 diffs)

trunk/src/VBox/Main/USBControllerImpl.cpp

@@ -459 +459 @@
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->data().mActive && Global::IsOnline (adep.machineState()))
-    {
-        USBProxyService *service = mParent->virtualBox()->host()->usbProxyService();
+    if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
+    {
+        USBProxyService *service = mParent->getVirtualBox()->host()->usbProxyService();
         ComAssertRet (service, E_FAIL);
 
-        ComAssertRet (filter->id() == NULL, E_FAIL);
-        filter->id() = service->insertFilter (&filter->data().mUSBFilter);
+        ComAssertRet(filter->getId() == NULL, E_FAIL);
+        filter->getId() = service->insertFilter (&filter->getData().mUSBFilter);
     }
 
@@ -525 +525 @@
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->data().mActive && Global::IsOnline (adep.machineState()))
-    {
-        USBProxyService *service = mParent->virtualBox()->host()->usbProxyService();
+    if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
+    {
+        USBProxyService *service = mParent->getVirtualBox()->host()->usbProxyService();
         ComAssertRet (service, E_FAIL);
 
-        ComAssertRet (filter->id() != NULL, E_FAIL);
-        service->removeFilter (filter->id());
-        filter->id() = NULL;
+        ComAssertRet(filter->getId() != NULL, E_FAIL);
+        service->removeFilter(filter->getId());
+        filter->getId() = NULL;
     }
 
@@ -623 +623 @@
     {
         AutoWriteLock filterLock (*it);
-        const USBDeviceFilter::Data &filterData = (*it)->data();
+        const USBDeviceFilter::Data &filterData = (*it)->getData();
 
         Bstr str;
@@ -728 +728 @@
         while (thatIt != backDevices.end())
         {
-            if ((*it)->data() == (*thatIt)->data())
+            if ((*it)->getData() == (*thatIt)->getData())
             {
                 backDevices.erase (thatIt);
@@ -775 +775 @@
     if (mDeviceFilters.isBackedUp())
     {
-        USBProxyService *service = mParent->virtualBox()->host()->usbProxyService();
+        USBProxyService *service = mParent->getVirtualBox()->host()->usbProxyService();
         ComAssertRet (service, false);
 
@@ -787 +787 @@
             {
                 /* notify the proxy (only when it makes sense) */
-                if ((*it)->data().mActive &&
+                if ((*it)->getData().mActive &&
                     Global::IsOnline (adep.machineState()))
                 {
                     USBDeviceFilter *filter = *it;
-                    ComAssertRet (filter->id() != NULL, false);
-                    service->removeFilter (filter->id());
-                    filter->id() = NULL;
+                    ComAssertRet(filter->getId() != NULL, false);
+                    service->removeFilter(filter->getId());
+                    filter->getId() = NULL;
                 }
 
@@ -812 +812 @@
                 {
                     /* notify the proxy (only when necessary) */
-                    if ((*it)->data().mActive)
+                    if ((*it)->getData().mActive)
                     {
                         USBDeviceFilter *flt = *it; /* resolve ambiguity */
-                        ComAssertRet (flt->id() == NULL, false);
-                        flt->id() = service->insertFilter (&flt->data().mUSBFilter);
+                        ComAssertRet(flt->getId() == NULL, false);
+                        flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
                     }
                 }
@@ -1029 +1029 @@
     if (aFilter->mInList && mParent->isRegistered())
     {
-        USBProxyService *service = mParent->virtualBox()->host()->usbProxyService();
+        USBProxyService *service = mParent->getVirtualBox()->host()->usbProxyService();
         ComAssertRet (service, E_FAIL);
 
@@ -1035 +1035 @@
         {
             /* insert/remove the filter from the proxy */
-            if (aFilter->data().mActive)
+            if (aFilter->getData().mActive)
             {
-                ComAssertRet (aFilter->id() == NULL, E_FAIL);
-                aFilter->id() = service->insertFilter (&aFilter->data().mUSBFilter);
+                ComAssertRet(aFilter->getId() == NULL, E_FAIL);
+                aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
             }
             else
             {
-                ComAssertRet (aFilter->id() != NULL, E_FAIL);
-                service->removeFilter (aFilter->id());
-                aFilter->id() = NULL;
+                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
+                service->removeFilter(aFilter->getId());
+                aFilter->getId() = NULL;
             }
         }
         else
         {
-            if (aFilter->data().mActive)
+            if (aFilter->getData().mActive)
             {
                 /* update the filter in the proxy */
-                ComAssertRet (aFilter->id() != NULL, E_FAIL);
-                service->removeFilter (aFilter->id());
-                aFilter->id() = service->insertFilter (&aFilter->data().mUSBFilter);
+                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
+                service->removeFilter(aFilter->getId());
+                aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
             }
         }
@@ -1087 +1087 @@
     {
         AutoWriteLock filterLock (*it);
-        if (aDevice->isMatch ((*it)->data()))
+        if (aDevice->isMatch((*it)->getData()))
         {
-            *aMaskedIfs = (*it)->data().mMaskedIfs;
+            *aMaskedIfs = (*it)->getData().mMaskedIfs;
             return true;
         }
@@ -1184 +1184 @@
     {
         AutoWriteLock filterLock (*it);
-        const USBDeviceFilter::Data &aData = (*it)->data();
+        const USBDeviceFilter::Data &aData = (*it)->getData();
 
         if (!aData.mActive)
@@ -1221 +1221 @@
     AutoReadLock alock(this);
 
-    USBProxyService *service = mParent->virtualBox()->host()->usbProxyService();
+    USBProxyService *service = mParent->getVirtualBox()->host()->usbProxyService();
     AssertReturn(service, E_FAIL);
 
@@ -1230 +1230 @@
 
         /* notify the proxy (only if the filter is active) */
-        if (flt->data().mActive)
+        if (flt->getData().mActive)
         {
             if (aInsertFilters)
             {
-                AssertReturn(flt->id() == NULL, E_FAIL);
-                flt->id() = service->insertFilter (&flt->data().mUSBFilter);
+                AssertReturn(flt->getId() == NULL, E_FAIL);
+                flt->getId() = service->insertFilter(&flt->getData().mUSBFilter);
             }
             else
@@ -1242 +1242 @@
                  * when this method gets called (as a result of an early VM
                  * process crash for example. So, don't assert that ID != NULL. */
-                if (flt->id() != NULL)
+                if (flt->getId() != NULL)
                 {
-                    service->removeFilter (flt->id());
-                    flt->id() = NULL;
+                    service->removeFilter(flt->getId());
+                    flt->getId() = NULL;
                 }
             }