Changeset 24989 in vbox for trunk/src/VBox/Main/xml

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/xml/Settings.cpp (modified) (6 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -179 +179 @@
         va_list args;
         va_start(args, pcszFormat);
-        Utf8StrFmtVA what(pcszFormat, args);
+        Utf8StrFmtVA strWhat(pcszFormat, args);
         va_end(args);
 
@@ -190 +190 @@
                        file->m->strFilename.c_str(),
                        (pcsz) ? pcsz : "",
-                       what.c_str());
+                       strWhat.c_str());
 
         setWhat(str.c_str());
@@ -1089 +1089 @@
  */
 void MainConfigFile::writeHardDisk(xml::ElementNode &elmMedium,
-                                   const Medium &m,
+                                   const Medium &mdm,
                                    uint32_t level)          // 0 for "root" call, incremented with each recursion
 {
     xml::ElementNode *pelmHardDisk = elmMedium.createChild("HardDisk");
-    pelmHardDisk->setAttribute("uuid", makeString(m.uuid));
-    pelmHardDisk->setAttribute("location", m.strLocation);
-    pelmHardDisk->setAttribute("format", m.strFormat);
-    if (m.fAutoReset)
-        pelmHardDisk->setAttribute("autoReset", m.fAutoReset);
-    if (m.strDescription.length())
-        pelmHardDisk->setAttribute("Description", m.strDescription);
-
-    for (PropertiesMap::const_iterator it = m.properties.begin();
-         it != m.properties.end();
+    pelmHardDisk->setAttribute("uuid", makeString(mdm.uuid));
+    pelmHardDisk->setAttribute("location", mdm.strLocation);
+    pelmHardDisk->setAttribute("format", mdm.strFormat);
+    if (mdm.fAutoReset)
+        pelmHardDisk->setAttribute("autoReset", mdm.fAutoReset);
+    if (mdm.strDescription.length())
+        pelmHardDisk->setAttribute("Description", mdm.strDescription);
+
+    for (PropertiesMap::const_iterator it = mdm.properties.begin();
+         it != mdm.properties.end();
          ++it)
     {
@@ -1114 +1114 @@
     {
         const char *pcszType =
-            m.hdType == MediumType_Normal ? "Normal" :
-            m.hdType == MediumType_Immutable ? "Immutable" :
-            /*m.hdType == MediumType_Writethrough ?*/ "Writethrough";
+            mdm.hdType == MediumType_Normal ? "Normal" :
+            mdm.hdType == MediumType_Immutable ? "Immutable" :
+            /*mdm.hdType == MediumType_Writethrough ?*/ "Writethrough";
         pelmHardDisk->setAttribute("type", pcszType);
     }
 
-    for (MediaList::const_iterator it = m.llChildren.begin();
-         it != m.llChildren.end();
+    for (MediaList::const_iterator it = mdm.llChildren.begin();
+         it != mdm.llChildren.end();
          ++it)
     {
@@ -1171 +1171 @@
          ++it)
     {
-        const Medium &m = *it;
+        const Medium &mdm = *it;
         xml::ElementNode *pelmMedium = pelmDVDImages->createChild("Image");
-        pelmMedium->setAttribute("uuid", makeString(m.uuid));
-        pelmMedium->setAttribute("location", m.strLocation);
-        if (m.strDescription.length())
-            pelmMedium->setAttribute("Description", m.strDescription);
+        pelmMedium->setAttribute("uuid", makeString(mdm.uuid));
+        pelmMedium->setAttribute("location", mdm.strLocation);
+        if (mdm.strDescription.length())
+            pelmMedium->setAttribute("Description", mdm.strDescription);
     }
 
@@ -1184 +1184 @@
          ++it)
     {
-        const Medium &m = *it;
+        const Medium &mdm = *it;
         xml::ElementNode *pelmMedium = pelmFloppyImages->createChild("Image");
-        pelmMedium->setAttribute("uuid", makeString(m.uuid));
-        pelmMedium->setAttribute("location", m.strLocation);
-        if (m.strDescription.length())
-            pelmMedium->setAttribute("Description", m.strDescription);
+        pelmMedium->setAttribute("uuid", makeString(mdm.uuid));
+        pelmMedium->setAttribute("location", mdm.strLocation);
+        if (mdm.strDescription.length())
+            pelmMedium->setAttribute("Description", mdm.strDescription);
     }