Changeset 25018 in vbox

Timestamp:

Nov 26, 2009 3:31:22 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: -Wshadow fixes

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (13 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -775 +775 @@
 QString VBoxGlobal::brandingGetKey (QString aKey)
 {
-    QSettings settings(mBrandingConfig, QSettings::IniFormat);
-    return settings.value(QString("%1").arg(aKey)).toString();
+    QSettings s(mBrandingConfig, QSettings::IniFormat);
+    return s.value(QString("%1").arg(aKey)).toString();
 }
 
@@ -1449 +1449 @@
 QString VBoxGlobal::details (const CUSBDevice &aDevice) const
 {
-    QString details;
+    QString sDetails;
     QString m = aDevice.GetManufacturer().trimmed();
     QString p = aDevice.GetProduct().trimmed();
     if (m.isEmpty() && p.isEmpty())
     {
-        details =
+        sDetails =
             tr ("Unknown device %1:%2", "USB device details")
             .arg (QString().sprintf ("%04hX", aDevice.GetVendorId()))
@@ -1462 +1462 @@
     {
         if (p.toUpper().startsWith (m.toUpper()))
-            details = p;
+            sDetails = p;
         else
-            details = m + " " + p;
+            sDetails = m + " " + p;
     }
     ushort r = aDevice.GetRevision();
     if (r != 0)
-        details += QString().sprintf (" [%04hX]", r);
-
-    return details.trimmed();
+        sDetails += QString().sprintf (" [%04hX]", r);
+
+    return sDetails.trimmed();
 }
 
@@ -2422 +2422 @@
     if (aMedium.type() == VBoxDefs::MediumType_HardDisk)
     {
-        VBoxMediaList::iterator parent = mMediaList.end();
+        VBoxMediaList::iterator itParent = mMediaList.end();
 
         for (; it != mMediaList.end(); ++ it)
@@ -2432 +2432 @@
                 break;
 
-            if (aMedium.parent() != NULL && parent == mMediaList.end())
+            if (aMedium.parent() != NULL && itParent == mMediaList.end())
             {
                 if (&*it == aMedium.parent())
-                    parent = it;
+                    itParent = it;
             }
             else
@@ -2441 +2441 @@
                 /* break if met a parent's sibling (will insert before it) */
                 if (aMedium.parent() != NULL &&
-                    (*it).parent() == (*parent).parent())
+                    (*it).parent() == (*itParent).parent())
                     break;
 
@@ -2451 +2451 @@
         }
 
-        AssertReturnVoid (aMedium.parent() == NULL || parent != mMediaList.end());
+        AssertReturnVoid (aMedium.parent() == NULL || itParent != mMediaList.end());
     }
     else
@@ -2526 +2526 @@
 #endif
 
-    VBoxMedium *parent = (*it).parent();
+    VBoxMedium *pParent = (*it).parent();
 
     /* remove the medium from the list to keep it in sync with the server "for
@@ -2536 +2536 @@
     /* also emit the parent update signal because some attributes like
      * isReadOnly() may have been changed after child removal */
-    if (parent != NULL)
-    {
-        parent->refresh();
-        emit mediumUpdated (*parent);
+    if (pParent != NULL)
+    {
+        pParent->refresh();
+        emit mediumUpdated (*pParent);
     }
 }
@@ -4240 +4240 @@
                 if (aEvent->type() == QEvent::User)
                 {
-                    ServiceEvent *event = static_cast <ServiceEvent*> (aEvent);
-                    mResult = event->result();
-                    event->accept();
+                    ServiceEvent *pEvent = static_cast <ServiceEvent*> (aEvent);
+                    mResult = pEvent->result();
+                    pEvent->accept();
                     quit();
                     return true;
@@ -4257 +4257 @@
         public:
 
-            ServiceServer (ServiceClient &aClient, const QString &aURL)
-                : mClient (aClient), mURL (aURL) {}
+            ServiceServer (ServiceClient &aClient, const QString &sURL)
+                : mClient (aClient), mURL (sURL) {}
 
         private:
@@ -4571 +4571 @@
     /* Load the customized language as early as possible to get possible error
      * messages translated */
-    QString languageId = gset.languageId();
-    if (!languageId.isNull())
-        loadLanguage (languageId);
+    QString sLanguageId = gset.languageId();
+    if (!sLanguageId.isNull())
+        loadLanguage (sLanguageId);
 
     retranslateUi();
@@ -4877 +4877 @@
     if (mDbgEnabled)
     {
-        int rc = SUPR3HardenedLdrLoadAppPriv("VBoxDbg", &mhVBoxDbg);
-        if (RT_FAILURE(rc))
+        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxDbg", &mhVBoxDbg);
+        if (RT_FAILURE(vrc))
         {
             mhVBoxDbg = NIL_RTLDRMOD;