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

Timestamp:

Aug 20, 2013 2:08:20 PM (12 years ago)

Author:

vboxsync

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

88224

Message:

Main/xml/Settings.cpp: the convention for attributes is that they start with a lowercase letter, and putting very long ones last is helpful as it doesn't need checking what's behind it in the line.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

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

@@ -3810 +3810 @@
         Utf8Str str;
         elmMachine.getAttributeValue("Description", machineUserData.strDescription);
-        elmMachine.getAttributeValue("Icon", machineUserData.ovIcon);
-
         elmMachine.getAttributeValue("OSType", machineUserData.strOsType);
         if (m->sv < SettingsVersion_v1_5)
@@ -3830 +3828 @@
         if (elmMachine.getAttributeValue("aborted", fAborted))
             fAborted = true;
+
+        elmMachine.getAttributeValue("icon", machineUserData.ovIcon);
 
         // parse Hardware before the other elements because other things depend on it
@@ -5101 +5101 @@
     if (machineUserData.strDescription.length())
         elmMachine.createChild("Description")->addContent(machineUserData.strDescription);
-    if (machineUserData.ovIcon.length())
-        elmMachine.setAttribute("Icon", machineUserData.ovIcon);
     elmMachine.setAttribute("OSType", machineUserData.strOsType);
     if (    strStateFile.length()
@@ -5121 +5119 @@
     if (fAborted)
         elmMachine.setAttribute("aborted", fAborted);
+    // Please keep the icon last so that one doesn't have to check if there
+    // is anything in the line after this very long attribute in the XML.
+    if (machineUserData.ovIcon.length())
+        elmMachine.setAttribute("icon", machineUserData.ovIcon);
     if (    m->sv >= SettingsVersion_v1_9
         &&  (   machineUserData.fTeleporterEnabled