Changeset 33051 in vbox for trunk/src

Timestamp:

Oct 12, 2010 10:38:24 AM (14 years ago)

Author:

vboxsync

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

66577

Message:

Main: use .vbox extension for machine XML of newly created or renamed machines

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)
• xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -475 +475 @@
     strConfigFile.append(RTPATH_DELIMITER);
     strConfigFile.append(strName);
-    strConfigFile.append(".xml");
+    strConfigFile.append(".vbox");
 
     HRESULT rc = initImpl(aParent, strConfigFile);
@@ -7642 +7642 @@
             }
 
-            newConfigFile = Utf8StrFmt("%s%c%s.xml",
+            newConfigFile = Utf8StrFmt("%s%c%s.vbox",
                 newConfigDir.c_str(), RTPATH_DELIMITER, newName.c_str());
 

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1174 +1174 @@
         getDefaultMachineFolder(strSettingsFile);
 
-    strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.xml",
+    strSettingsFile = Utf8StrFmt("%s%c%ls%c%ls.vbox",
                                  strSettingsFile.c_str(),
                                  RTPATH_DELIMITER,

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

@@ -856 +856 @@
        )
     {
-        // compose new filename: strip off trailing ".xml"
-        Utf8Str strFilenameNew = m->strFilename.substr(0, m->strFilename.length() - 4);
+        // compose new filename: strip off trailing ".xml"/".vbox"
+        Utf8Str strFilenameNew;
+        Utf8Str strExt = ".xml";
+        if (m->strFilename.endsWith(".xml"))
+            strFilenameNew = m->strFilename.substr(0, m->strFilename.length() - 4);
+        else if (m->strFilename.endsWith(".vbox"))
+        {
+            strFilenameNew = m->strFilename.substr(0, m->strFilename.length() - 5);
+            strExt = ".vbox";
+        }
+
         // and append something likd "-1.3-linux.xml"
         strFilenameNew.append("-");
         strFilenameNew.append(m->strSettingsVersionFull);       // e.g. "1.3-linux"
-        strFilenameNew.append(".xml");
+        strFilenameNew.append(strExt);                          // .xml for main config, .vbox for machine config
 
         RTFileMove(m->strFilename.c_str(),