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

Timestamp:

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

Author:

vboxsync

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

55293

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/HostImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1348 +1348 @@
     /* notify the proxy (only when the filter is active) */
     if (    m->pUSBProxyService->isActive()
-         && pFilter->data().mActive)
-    {
-        ComAssertRet(pFilter->id() == NULL, E_FAIL);
-        pFilter->id() = m->pUSBProxyService->insertFilter(&pFilter->data().mUSBFilter);
+         && pFilter->getData().mActive)
+    {
+        ComAssertRet(pFilter->getId() == NULL, E_FAIL);
+        pFilter->getId() = m->pUSBProxyService->insertFilter(&pFilter->getData().mUSBFilter);
     }
 
@@ -1402 +1402 @@
 
     /* notify the proxy (only when the filter is active) */
-    if (m->pUSBProxyService->isActive() && filter->data().mActive)
-    {
-        ComAssertRet (filter->id() != NULL, E_FAIL);
-        m->pUSBProxyService->removeFilter (filter->id());
-        filter->id() = NULL;
+    if (m->pUSBProxyService->isActive() && filter->getData().mActive)
+    {
+        ComAssertRet(filter->getId() != NULL, E_FAIL);
+        m->pUSBProxyService->removeFilter(filter->getId());
+        filter->getId() = NULL;
     }
 
@@ -1677 +1677 @@
 
         /* notify the proxy (only when the filter is active) */
-        if (pFilter->data().mActive)
+        if (pFilter->getData().mActive)
         {
             HostUSBDeviceFilter *flt = pFilter; /* resolve ambiguity */
-            flt->id() = m->pUSBProxyService->insertFilter(&pFilter->data().mUSBFilter);
+            flt->getId() = m->pUSBProxyService->insertFilter(&pFilter->getData().mUSBFilter);
         }
     }
@@ -1775 +1775 @@
         {
             // insert/remove the filter from the proxy
-            if (aFilter->data().mActive)
+            if (aFilter->getData().mActive)
             {
-                ComAssertRet (aFilter->id() == NULL, E_FAIL);
-                aFilter->id() = m->pUSBProxyService->insertFilter (&aFilter->data().mUSBFilter);
+                ComAssertRet(aFilter->getId() == NULL, E_FAIL);
+                aFilter->getId() = m->pUSBProxyService->insertFilter(&aFilter->getData().mUSBFilter);
             }
             else
             {
-                ComAssertRet (aFilter->id() != NULL, E_FAIL);
-                m->pUSBProxyService->removeFilter (aFilter->id());
-                aFilter->id() = NULL;
+                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
+                m->pUSBProxyService->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);
-                m->pUSBProxyService->removeFilter (aFilter->id());
-                aFilter->id() = m->pUSBProxyService->insertFilter (&aFilter->data().mUSBFilter);
+                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
+                m->pUSBProxyService->removeFilter(aFilter->getId());
+                aFilter->getId() = m->pUSBProxyService->insertFilter(&aFilter->getData().mUSBFilter);
             }
         }