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

Timestamp:

Mar 18, 2013 5:27:22 PM (12 years ago)

Author:

vboxsync

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

84350

Message:

Main/Machine: rename two methods for better compatibility with programming languages - delete and export might be keywords.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageAppliance.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)
• VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -977 +977 @@
             ComPtr<IMachine> pMachine = *itM;
             ComPtr<IVirtualSystemDescription> pVSD;
-            CHECK_ERROR_BREAK(pMachine, Export(pAppliance, Bstr(pszAbsFilePath).raw(), pVSD.asOutParam()));
+            CHECK_ERROR_BREAK(pMachine, ExportTo(pAppliance, Bstr(pszAbsFilePath).raw(), pVSD.asOutParam()));
             // Add additional info to the virtual system description if the user wants so
             ArgsMap *pmapArgs = NULL;

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

@@ -162 +162 @@
     {
         ComPtr<IProgress> pProgress;
-        CHECK_ERROR_RET(machine, Delete(ComSafeArrayAsInParam(aMedia), pProgress.asOutParam()),
+        CHECK_ERROR_RET(machine, DeleteConfig(ComSafeArrayAsInParam(aMedia), pProgress.asOutParam()),
                         RTEXITCODE_FAILURE);
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1467 +1467 @@
                 {
                     /* Delete machine hard-disks: */
-                    CProgress progress = machine.Delete(mediums);
+                    CProgress progress = machine.DeleteConfig(mediums);
                     if (machine.isOk())
                     {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic4.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -55 +55 @@
             {
                 /* Add the export description to our appliance object: */
-                CVirtualSystemDescription vsd = machine.Export(*pAppliance, qobject_cast<UIWizardExportApp*>(wizardImp())->uri());
+                CVirtualSystemDescription vsd = machine.ExportTo(*pAppliance, qobject_cast<UIWizardExportApp*>(wizardImp())->uri());
                 fResult = machine.isOk();
                 if (!fResult)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -246 +246 @@
             if (vbox.isOk())
             {
-                CProgress progress = m_machine.Delete(aMedia);
+                CProgress progress = m_machine.DeleteConfig(aMedia);
                 progress.WaitForCompletion(-1);         // @todo do this nicely with a progress dialog, this can delete lots of files
             }