Changeset 25012 in vbox

Timestamp:

Nov 26, 2009 3:06:37 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: fix some -Wshadow warnings

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/CIShared.h (modified) (1 diff)
• include/VBoxGlobalSettings.h (modified) (1 diff)
• include/VBoxUtils.h (modified) (1 diff)
• src/QILabelSeparator.cpp (modified) (1 diff)
• src/VBoxFilePathSelectorWidget.cpp (modified) (1 diff)

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

@@ -99 +99 @@
 
 private:
-    CIShared( Data *data ) : d( data ) {}
+    CIShared( Data *aData ) : d( aData ) {}
     Data *d;
 

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

@@ -85 +85 @@
 
     bool autoCapture() const { return data()->autoCapture; }
-    void setAutoCapture (bool autoCapture) {
-        mData()->autoCapture = autoCapture;
+    void setAutoCapture (bool aAutoCapture)
+    {
+        mData()->autoCapture = aAutoCapture;
         resetError();
     }

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

@@ -53 +53 @@
         if (aEvent->type() == QEvent::KeyPress || aEvent->type() == QEvent::KeyRelease)
         {
-            QKeyEvent *event = static_cast<QKeyEvent *> (aEvent);
-            if (event->modifiers() & Qt::AltModifier)
+            QKeyEvent *pEvent = static_cast<QKeyEvent *> (aEvent);
+            if (pEvent->modifiers() & Qt::AltModifier)
                 return true;
         }

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

@@ -75 +75 @@
     separator->setSizePolicy (QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
 
-    QHBoxLayout *layout = new QHBoxLayout (this);
-    VBoxGlobal::setLayoutMargin (layout, 0);
-    layout->addWidget (mLabel);
-    layout->addWidget (separator, Qt::AlignBottom);
+    QHBoxLayout *pLayout = new QHBoxLayout (this);
+    VBoxGlobal::setLayoutMargin (pLayout, 0);
+    pLayout->addWidget (mLabel);
+    pLayout->addWidget (separator, Qt::AlignBottom);
 }
 

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

@@ -390 +390 @@
         initDir = mHomeDir;
 
-    QString path;
+    QString selPath;
     switch (mMode)
     {
         case Mode_File_Open:
-            path = QIFileDialog::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
+            selPath = QIFileDialog::getOpenFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle); break;
         case Mode_File_Save:
             {
-                path = QIFileDialog::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
-                if (!path.isEmpty() && QFileInfo (path).suffix().isEmpty())
-                    path = QString ("%1.%2").arg (path).arg (mDefaultSaveExt);
+                selPath = QIFileDialog::getSaveFileName (initDir, mFileFilters, parentWidget(), mFileDialogTitle);
+                if (!selPath.isEmpty() && QFileInfo (selPath).suffix().isEmpty())
+                    selPath = QString ("%1.%2").arg (selPath).arg (mDefaultSaveExt);
                 break;
             }
         case Mode_Folder:
-            path = QIFileDialog::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
-    }
-
-    if (path.isNull())
+            selPath = QIFileDialog::getExistingDirectory (initDir, parentWidget(), mFileDialogTitle); break;
+    }
+
+    if (selPath.isNull())
         return;
 
-    path.remove (QRegExp ("[\\\\/]$"));
-    changePath (path);
+    selPath.remove (QRegExp ("[\\\\/]$"));
+    changePath (selPath);
 }