Changeset 25045 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 27, 2009 10:50:46 AM (15 years ago)

Author:

vboxsync

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

55378

Message:

FE/Qt4: -Wshadow fixes

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxFrameBuffer.h (modified) (1 diff)
• src/VBoxMedium.cpp (modified) (13 diffs)
• src/main.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxFrameBuffer.h

@@ -90 +90 @@
 {
 public:
-    VBoxRepaintEvent (int x, int y, int w, int h) :
+    VBoxRepaintEvent (int iX, int iY, int iW, int iH) :
         QEvent ((QEvent::Type) VBoxDefs::RepaintEventType),
-        ex (x), ey (y), ew (w), eh (h)
+        ex (iX), ey (iY), ew (iW), eh (iH)
     {}
     int x() { return ex; }

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

@@ -135 +135 @@
 
         /* Adjust the parent if its possible */
-        CMedium parent = mMedium.GetParent();
-        Assert (!parent.isNull() || mParent == NULL);
-
-        if (!parent.isNull() && (mParent == NULL || mParent->mMedium != parent))
+        CMedium parentMedium = mMedium.GetParent();
+        Assert (!parentMedium.isNull() || mParent == NULL);
+
+        if (!parentMedium.isNull() && (mParent == NULL || mParent->mMedium != parentMedium))
         {
             /* Search for the parent (might be there) */
@@ -147 +147 @@
                     break;
 
-                if ((*it).mMedium == parent)
+                if ((*it).mMedium == parentMedium)
                 {
                     mParent = unconst (&*it);
@@ -184 +184 @@
         if (machineIds.size() > 0)
         {
-            QString usage;
+            QString sUsage;
 
             CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -192 +192 @@
                 CMachine machine = vbox.GetMachine (*it);
 
-                QString name = machine.GetName();
-                QString snapshots;
+                QString sName = machine.GetName();
+                QString sSnapshots;
 
                 QVector <QString> snapIds = mMedium.GetSnapshotIds (*it);
@@ -210 +210 @@
                     if (!snapshot.isNull())           // can be NULL while takeSnaphot is in progress
                     {
-                        if (!snapshots.isNull())
-                            snapshots += ", ";
-                        snapshots += snapshot.GetName();
+                        if (!sSnapshots.isNull())
+                            sSnapshots += ", ";
+                        sSnapshots += snapshot.GetName();
                     }
                 }
 
-                if (!usage.isNull())
-                    usage += ", ";
-
-                usage += name;
-
-                if (!snapshots.isNull())
+                if (!sUsage.isNull())
+                    sUsage += ", ";
+
+                sUsage += sName;
+
+                if (!sSnapshots.isNull())
                 {
-                    usage += QString (" (%2)").arg (snapshots);
+                    sUsage += QString (" (%2)").arg (sSnapshots);
                     mIsUsedInSnapshots = true;
                 }
@@ -230 +230 @@
             }
 
-            Assert (!usage.isEmpty());
-            mUsage = usage;
+            Assert (!sUsage.isEmpty());
+            mUsage = sUsage;
         }
     }
@@ -286 +286 @@
 VBoxMedium &VBoxMedium::root() const
 {
-    VBoxMedium *root = unconst (this);
-    while (root->mParent != NULL)
-        root = root->mParent;
-
-    return *root;
+    VBoxMedium *pRoot = unconst (this);
+    while (pRoot->mParent != NULL)
+        pRoot = pRoot->mParent;
+
+    return *pRoot;
 }
 
@@ -307 +307 @@
 QString VBoxMedium::toolTip (bool aNoDiffs /* = false */, bool aCheckRO /* = false */, bool aNullAllowed /* = false */) const
 {
-    QString tip;
+    QString sTip;
 
     if (mMedium.isNull())
     {
-        tip = aNullAllowed ? mRow.arg (VBoxGlobal::tr ("<b>No medium selected</b>", "medium")) +
-                             mRow.arg (VBoxGlobal::tr ("You can also change this while the machine is running.")) :
-                             mRow.arg (VBoxGlobal::tr ("<b>No media available</b>", "medium")) +
-                             mRow.arg (VBoxGlobal::tr ("You can create media images using the virtual media manager."));
+        sTip = aNullAllowed ? mRow.arg (VBoxGlobal::tr ("<b>No medium selected</b>", "medium")) +
+                              mRow.arg (VBoxGlobal::tr ("You can also change this while the machine is running.")) :
+                              mRow.arg (VBoxGlobal::tr ("<b>No media available</b>", "medium")) +
+                              mRow.arg (VBoxGlobal::tr ("You can create media images using the virtual media manager."));
     }
     else
@@ -320 +320 @@
         unconst (this)->checkNoDiffs (aNoDiffs);
 
-        tip = aNoDiffs ? mNoDiffs.toolTip : mToolTip;
+        sTip = aNoDiffs ? mNoDiffs.toolTip : mToolTip;
 
         if (aCheckRO && mIsReadOnly)
-            tip += mRow.arg ("<hr>") +
-                   mRow.arg (VBoxGlobal::tr ("Attaching this hard disk will be performed indirectly using "
-                                             "a newly created differencing hard disk.", "medium"));
-    }
-
-    return mTable.arg (tip);
+            sTip += mRow.arg ("<hr>") +
+                    mRow.arg (VBoxGlobal::tr ("Attaching this hard disk will be performed indirectly using "
+                                              "a newly created differencing hard disk.", "medium"));
+    }
+
+    return mTable.arg (sTip);
 }
 
@@ -347 +347 @@
 QPixmap VBoxMedium::icon (bool aNoDiffs /* = false */, bool aCheckRO /* = false */) const
 {
-    QPixmap icon;
+    QPixmap pixmap;
 
     if (state (aNoDiffs) == KMediumState_Inaccessible)
-        icon = result (aNoDiffs).isOk() ? vboxGlobal().warningIcon() : vboxGlobal().errorIcon();
+        pixmap = result (aNoDiffs).isOk() ? vboxGlobal().warningIcon() : vboxGlobal().errorIcon();
 
     if (aCheckRO && mIsReadOnly)
-        icon = VBoxGlobal::joinPixmaps (icon, QPixmap (":/new_16px.png"));
-
-    return icon;
+        pixmap = VBoxGlobal::joinPixmaps (pixmap, QPixmap (":/new_16px.png"));
+
+    return pixmap;
 }
 
@@ -407 +407 @@
         return QString::null;
 
-    QString details, str;
-
-    VBoxMedium *root = unconst (this);
-    KMediumState state = mState;
+    QString sDetails, sStr;
+
+    VBoxMedium *pRoot = unconst (this);
+    KMediumState eState = mState;
 
     if (mType == VBoxDefs::MediumType_HardDisk)
@@ -416 +416 @@
         if (aNoDiffs)
         {
-            root = &this->root();
+            pRoot = &this->root();
 
             bool isDiff = (!aPredictDiff && mParent != NULL) || (aPredictDiff && mIsReadOnly);
 
-            details = isDiff && aUseHTML ?
-                QString ("<i>%1</i>, ").arg (root->mHardDiskType) :
-                QString ("%1, ").arg (root->mHardDiskType);
-
-            state = this->state (true /* aNoDiffs */);
-
-            if (root->mState == KMediumState_NotCreated)
-                state = KMediumState_NotCreated;
+            sDetails = isDiff && aUseHTML ?
+                QString ("<i>%1</i>, ").arg (pRoot->mHardDiskType) :
+                QString ("%1, ").arg (pRoot->mHardDiskType);
+
+            eState = this->state (true /* aNoDiffs */);
+
+            if (pRoot->mState == KMediumState_NotCreated)
+                eState = KMediumState_NotCreated;
         }
         else
         {
-            details = QString ("%1, ").arg (root->mHardDiskType);
+            sDetails = QString ("%1, ").arg (pRoot->mHardDiskType);
         }
     }
@@ -437 +437 @@
     // @todo prepend the details with the warning/error icon when not accessible
 
-    switch (state)
+    switch (eState)
     {
         case KMediumState_NotCreated:
-            str = VBoxGlobal::tr ("Checking...", "medium");
-            details += aUseHTML ? QString ("<i>%1</i>").arg (str) : str;
+            sStr = VBoxGlobal::tr ("Checking...", "medium");
+            sDetails += aUseHTML ? QString ("<i>%1</i>").arg (sStr) : sStr;
             break;
         case KMediumState_Inaccessible:
-            str = VBoxGlobal::tr ("Inaccessible", "medium");
-            details += aUseHTML ? QString ("<b>%1</b>").arg (str) : str;
+            sStr = VBoxGlobal::tr ("Inaccessible", "medium");
+            sDetails += aUseHTML ? QString ("<b>%1</b>").arg (sStr) : sStr;
             break;
         default:
-            details += mType == VBoxDefs::MediumType_HardDisk ? root->mLogicalSize : root->mSize;
+            sDetails += mType == VBoxDefs::MediumType_HardDisk ? pRoot->mLogicalSize : pRoot->mSize;
             break;
     }
 
-    details = aUseHTML ?
-        QString ("%1 (<nobr>%2</nobr>)").arg (VBoxGlobal::locationForHTML (root->mName), details) :
-        QString ("%1 (%2)").arg (VBoxGlobal::locationForHTML (root->mName), details);
-
-    return details;
+    sDetails = aUseHTML ?
+        QString ("%1 (<nobr>%2</nobr>)").arg (VBoxGlobal::locationForHTML (pRoot->mName), sDetails) :
+        QString ("%1 (%2)").arg (VBoxGlobal::locationForHTML (pRoot->mName), sDetails);
+
+    return sDetails;
 }
 

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

@@ -298 +298 @@
 #endif
 
-    int i;
-    for (i=0; i<argc; i++)
+    for (int i=0; i<argc; i++)
         if (   !strcmp(argv[i], "-h")
             || !strcmp(argv[i], "-?")