Changeset 26550 in vbox for trunk/src/VBox/Main/ApplianceImpl.cpp

Timestamp:

Feb 15, 2010 5:14:18 PM (15 years ago)

Author:

vboxsync

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

57728

Message:

Main: Bstr makeover -- make Bstr(NULL) and Bstr() behave the same; resulting cleanup; make some more internal methods use Utf8Str instead of Bstr; fix a lot of CheckComArgNotNull() usage

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (11 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -370 +370 @@
     int i = 1;
     /* @todo: Maybe too cost-intensive; try to find a lighter way */
-    while (mVirtualBox->FindMachine(Bstr(tmpName), &machine) != VBOX_E_OBJECT_NOT_FOUND)
+    while (mVirtualBox->FindMachine(Bstr(tmpName).raw(), &machine) != VBOX_E_OBJECT_NOT_FOUND)
     {
         RTStrFree(tmpName);
@@ -391 +391 @@
     /* @todo: Maybe too cost-intensive; try to find a lighter way */
     while (RTPathExists(tmpName) ||
-           mVirtualBox->FindHardDisk(Bstr(tmpName), &harddisk) != VBOX_E_OBJECT_NOT_FOUND)
+           mVirtualBox->FindHardDisk(Bstr(tmpName).raw(), &harddisk) != VBOX_E_OBJECT_NOT_FOUND)
     {
         RTStrFree(tmpName);
@@ -501 +501 @@
 }
 
-HRESULT Appliance::setUpProgressFS(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
+HRESULT Appliance::setUpProgressFS(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
 {
     HRESULT rc;
@@ -532 +532 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         bstrDescription,
+                         strDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         bstrDescription, // CBSTR bstrFirstOperationDescription,
+                         strDescription, // CBSTR bstrFirstOperationDescription,
                          m->ulWeightPerOperation); // ULONG ulFirstOperationWeight,
     return rc;
 }
 
-HRESULT Appliance::setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
+HRESULT Appliance::setUpProgressImportS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
 {
     HRESULT rc;
@@ -572 +572 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         bstrDescription,
+                         strDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         Bstr(tr("Init")), // CBSTR bstrFirstOperationDescription,
+                         tr("Init"), // CBSTR bstrFirstOperationDescription,
                          ulInitWeight); // ULONG ulFirstOperationWeight,
     return rc;
 }
 
-HRESULT Appliance::setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Bstr &bstrDescription)
+HRESULT Appliance::setUpProgressWriteS3(ComObjPtr<Progress> &pProgress, const Utf8Str &strDescription)
 {
     HRESULT rc;
@@ -614 +614 @@
 
     rc = pProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                         bstrDescription,
+                         strDescription,
                          TRUE /* aCancelable */,
                          cOperations, // ULONG cOperations,
                          ulTotalOperationsWeight, // ULONG ulTotalOperationsWeight,
-                         bstrDescription, // CBSTR bstrFirstOperationDescription,
+                         strDescription, // CBSTR bstrFirstOperationDescription,
                          ulOVFCreationWeight); // ULONG ulFirstOperationWeight,
     return rc;
@@ -837 +837 @@
     task->locInfo = aLocInfo;
 
-    Bstr progressDesc = BstrFmt(tr("Import appliance '%s'"),
-                                aLocInfo.strPath.c_str());
+    Utf8Str progressDesc = Utf8StrFmt(tr("Import appliance '%s'"),
+                                      aLocInfo.strPath.c_str());
 
     HRESULT rc = S_OK;
@@ -1569 +1569 @@
                                                     mhda.lDevice,
                                                     DeviceType_Floppy,
-                                                    Bstr(""));
+                                                    NULL);
                         if (FAILED(rc)) throw rc;
 
@@ -1618 +1618 @@
                                                     mhda.lDevice,
                                                     DeviceType_DVD,
-                                                    Bstr(""));
+                                                    NULL);
                         if (FAILED(rc)) throw rc;
 
@@ -1744 +1744 @@
                             rc = mVirtualBox->OpenHardDisk(Bstr(strSrcFilePath),
                                                            AccessMode_ReadOnly,
-                                                           false, Bstr(""), false, Bstr(""),
+                                                           false, NULL, false, NULL,
                                                            srcHdVBox.asOutParam());
                             if (FAILED(rc)) throw rc;
@@ -4281 +4281 @@
                                                       IN_BSTR aExtraConfigValue)
 {
-    CheckComArgNotNull(aVboxValue);
-    CheckComArgNotNull(aExtraConfigValue);
-
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();