Changeset 60930 in vbox for trunk/src

Timestamp:

May 10, 2016 3:28:15 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​bugref:6769: Rework for New VM wizard (part 03): Moving machine filename composition code into separate function for reusing.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVMPageBasic1.cpp (modified) (2 diffs)
• UIWizardNewVMPageBasic1.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp

@@ -218 +218 @@
     }
 
-    /* Get VBox: */
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    /* Get default machine folder: */
-    const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
-    /* Fetch user's machine location: */
-    const QString strUserMachineLocation = m_pNameAndSystemEditor->name();
-    const QString strUserMachineFolder = QFileInfo(strUserMachineLocation).absolutePath();
-    const QString strUserMachineBaseName = QFileInfo(strUserMachineLocation).fileName();
-    const bool fUseDefaultPath = strUserMachineLocation == strUserMachineBaseName;
-    /* Compose machine filename: */
-    const QString strMachineFilePath = vbox.ComposeMachineFilename(strUserMachineBaseName,
-                                                                   fUseDefaultPath ? m_strGroup : QString() /* no group in that case */,
-                                                                   QString(),
-                                                                   fUseDefaultPath ? strDefaultMachineFolder : strUserMachineFolder);
-    /* Compose machine folder/basename: */
-    const QFileInfo fileInfo(strMachineFilePath);
-    const QString strMachineFolder = fileInfo.absolutePath();
-    const QString strMachineBaseName = fileInfo.completeBaseName();
+    /* Compose machine file-path, parse it to folder and base-name: */
+    const QString strMachineFilePath = composeMachineFilePath(m_pNameAndSystemEditor->name());
+    const QString strMachineFolder = QDir::toNativeSeparators(QFileInfo(strMachineFilePath).absolutePath());
+    const QString strMachineBaseName = QFileInfo(strMachineFilePath).completeBaseName();
 
     /* Make sure that folder doesn't exists: */
@@ -273 +259 @@
 }
 
+QString UIWizardNewVMPage1::composeMachineFilePath(const QString &strUserMachineLocation)
+{
+    /* Get VBox: */
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    /* Get default machine folder: */
+    const QString strDefaultMachineFolder = vbox.GetSystemProperties().GetDefaultMachineFolder();
+    /* Fetch user's machine location: */
+    const QString strUserMachineFolder = QFileInfo(strUserMachineLocation).absolutePath();
+    const QString strUserMachineBaseName = QFileInfo(strUserMachineLocation).fileName();
+    const bool fUseDefaultPath = strUserMachineLocation == strUserMachineBaseName;
+    /* Compose machine filename: */
+    return vbox.ComposeMachineFilename(strUserMachineBaseName,
+                                       fUseDefaultPath ? m_strGroup : QString() /* no group in that case */,
+                                       QString(),
+                                       fUseDefaultPath ? strDefaultMachineFolder : strUserMachineFolder);
+}
+
 UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
     : UIWizardNewVMPage1(strGroup)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.h

@@ -42 +42 @@
     bool createMachineFolder();
     bool cleanupMachineFolder();
+
+    /** Composes and returns machine file-path on the basis of passed @a strUserMachineLocation. */
+    QString composeMachineFilePath(const QString &strUserMachineLocation);
 
     /** Returns the machine folder value. */