Changeset 16668 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 11, 2009 2:12:11 PM (16 years ago)

Author:

vboxsync

Message:

OVF: create new IAppliance::read() method instead of reading in constructor; IVirtualBox::openAppliance -> createAppliance; IAppliance->importAppliance -> importMachines

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageImport.cpp (modified) (1 diff)
• VirtualBox/src/VBoxImportAppliance.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -428 +428 @@
                     CHECK_ERROR_BREAK(aVirtualSystemDescriptions[i],
                                       SetFinalValues(ComSafeArrayAsInParam(aEnabled),
-                                                     ComSafeArrayAsInParam(aFinalValues)));
+                                                     ComSafeArrayAsInParam(aFinalValues),
+                                                     ComSafeArrayAsInParam(aExtraConfigValues)));
 
             } // for (unsigned i = 0; i < cVirtualSystemDescriptions; ++i)

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

@@ -128 +128 @@
 
     virtual void restoreDefaults() {}
-    virtual void putBack (QVector<QString>& aFinalValues, QVector<BOOL>& aFinalStates)
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
     {
         for (int i = 0; i < childCount(); ++i)
-            child (i)->putBack (aFinalValues, aFinalStates);
+            child (i)->putBack (aFinalStates, aFinalValues, aFinalExtraValues);
     }
 
@@ -162 +162 @@
     }
 
-    virtual void putBack (QVector<QString>& aFinalValues, QVector<BOOL>& aFinalStates)
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
     {
         /* Resize the vectors */
         unsigned long count = mDesc.GetCount();
+        aFinalStates.resize (count);
         aFinalValues.resize (count);
-        aFinalStates.resize (count);
+        aFinalExtraValues.resize (count);
         /* Recursively fill the vectors */
-        ModelItem::putBack (aFinalValues, aFinalStates);
+        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
         /* Set all final values at once */
-        mDesc.SetFinalValues (aFinalStates, aFinalValues);
+        mDesc.SetFinalValues (aFinalStates, aFinalValues, aFinalExtraValues);
     }
 
@@ -202 +203 @@
     {}
 
-    virtual void putBack (QVector<QString>& aFinalValues, QVector<BOOL>& aFinalStates)
-    {
+    virtual void putBack (QVector<BOOL>& aFinalStates, QVector<QString>& aFinalValues, QVector<QString>& aFinalExtraValues)
+    {
+        aFinalStates[mNumber] = mCheckState == Qt::Checked;
         aFinalValues[mNumber] = mConfigValue;
-        aFinalStates[mNumber] = mCheckState == Qt::Checked;
-        ModelItem::putBack (aFinalValues, aFinalStates);
+        aFinalExtraValues[mNumber] = mExtraConfigValue;
+        ModelItem::putBack (aFinalStates, aFinalValues, aFinalExtraValues);
     }
 
@@ -927 +929 @@
 void VirtualSystemModel::putBack()
 {
-    QVector<QString> v1;
-    QVector<BOOL> v2;
-    mRootItem->putBack (v1, v2);
+    QVector<BOOL> v1;
+    QVector<QString> v2;
+    QVector<QString> v3;
+    mRootItem->putBack (v1, v2, v3);
 }