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

Timestamp:

Feb 20, 2009 9:14:28 AM (16 years ago)

Author:

vboxsync

Message:

#3551: “Main: Replace remaining collections with safe arrays”
Converted SharedFolderCollection. Approved by dmik. Tested with GUI.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (4 diffs)
• VirtualBox/include/VBoxVMSettingsSF.h (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (3 diffs)
• VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/VBoxVMSettingsSF.cpp (modified) (9 diffs)

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

@@ -1438 +1438 @@
     /* now VM mappings */
     {
-        ComPtr<ISharedFolderCollection> sfColl;
-        ComPtr<ISharedFolderEnumerator> sfEnum;
-        CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
-        CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
+        com::SafeIfaceArray <ISharedFolder> folders;
+
+        CHECK_ERROR_RET(machine, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
         ULONG index = 0;
-        BOOL fMore;
-        sfEnum->HasMore(&fMore);
-        while (fMore)
-        {
-            ComPtr<ISharedFolder> sf;
-            CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
+
+        for (size_t i = 0; i < folders.size(); ++i)
+        {
+            ComPtr <ISharedFolder> sf = folders[i];
+
             Bstr name, hostPath;
             BOOL writable;
@@ -1467 +1465 @@
                          name.raw(), hostPath.raw(), writable ? "writable" : "readonly");
             ++numSharedFolders;
-            CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
         }
     }
@@ -1473 +1470 @@
     if (console)
     {
-        ComPtr<ISharedFolderCollection> sfColl;
-        ComPtr<ISharedFolderEnumerator> sfEnum;
-        CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(sfColl.asOutParam()), rc);
-        CHECK_ERROR_RET(sfColl, Enumerate(sfEnum.asOutParam()), rc);
+        com::SafeIfaceArray <ISharedFolder> folders;
+
+        CHECK_ERROR_RET(console, COMGETTER(SharedFolders)(ComSafeArrayAsOutParam(folders)), rc);
         ULONG index = 0;
-        BOOL fMore;
-        sfEnum->HasMore(&fMore);
-        while (fMore)
-        {
-            ComPtr<ISharedFolder> sf;
-            CHECK_ERROR_RET(sfEnum, GetNext(sf.asOutParam()), rc);
+
+        for (size_t i = 0; i < folders.size(); ++i)
+        {
+            ComPtr <ISharedFolder> sf = folders[i];
+
             Bstr name, hostPath;
             sf->COMGETTER(Name)(name.asOutParam());
@@ -1499 +1494 @@
                 RTPrintf("Name: '%lS', Host path: '%lS' (transient mapping)\n", name.raw(), hostPath.raw());
             ++numSharedFolders;
-            CHECK_ERROR_RET(sfEnum, HasMore(&fMore), rc);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMSettingsSF.h

@@ -91 +91 @@
                              SFDialogType aType);
 
-    void getFrom (const CSharedFolderEnumerator &aEn, SFTreeViewItem *aItem);
-    void putBackTo (CSharedFolderEnumerator &aEn, SFTreeViewItem *aItem);
+    void getFrom (const CSharedFolderVector &aVec, SFTreeViewItem *aItem);
+    void putBackTo     (CSharedFolderVector &aVec, SFTreeViewItem *aItem);
 
     SFTreeViewItem* searchRoot (bool aIsPermanent,
@@ -112 +112 @@
 
 #endif // __VBoxVMSettingsSF_h__
-

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

@@ -745 +745 @@
 
 #ifdef Q_WS_MAC
-    /* We have to make sure that we are get the front most process. This is
+    /* We have to make sure that we are getting the front most process. This is
      * necessary for Qt versions > 4.3.3 */
     ProcessSerialNumber psn = { 0, kCurrentProcess };
@@ -911 +911 @@
 
     /* initialize shared folders stuff */
-    CSharedFolderCollection sfcoll = cconsole.GetSharedFolders();
-    if (sfcoll.isNull())
+    CSharedFolderVector sfvec = cconsole.GetSharedFolders();
+    if (sfvec.size() == 0)
     {
         /* hide shared folders menu action & sf_separator & sf_status_icon */
@@ -2047 +2047 @@
 
         /* permanent folders */
-        CSharedFolderEnumerator en = cmachine.GetSharedFolders().Enumerate();
-        while (en.HasMore())
-        {
-            CSharedFolder sf = en.GetNext();
+        CSharedFolderVector psfvec = cmachine.GetSharedFolders();
+
+        for (int i = 0; i < psfvec.size(); ++i)
+        {
+            CSharedFolder sf = psfvec[i];
             sfs.insert (sf.GetName(), sf.GetHostPath());
         }
+
         /* transient folders */
-        en = cconsole.GetSharedFolders().Enumerate();
-        while (en.HasMore())
-        {
-            CSharedFolder sf = en.GetNext();
+        CSharedFolderVector tsfvec = cconsole.GetSharedFolders();
+
+        for (int i = 0; i < tsfvec.size(); ++i)
+        {
+            CSharedFolder sf = tsfvec[i];
             sfs.insert (sf.GetName(), sf.GetHostPath());
         }

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

@@ -2543 +2543 @@
         /* Shared folders */
         {
-            ulong count = aMachine.GetSharedFolders().GetCount();
+            ulong count = aMachine.GetSharedFolders().size();
             if (count > 0)
             {

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

@@ -272 +272 @@
     //SFTreeViewItem *root = searchRoot (true, GlobalType);
     //root->setHidden (false);
-    //getFrom (vboxGlobal().virtualBox().GetSharedFolders().Enumerate(), root);
+    //getFrom (vboxGlobal().virtualBox().GetSharedFolders(), root);
 }
 
@@ -280 +280 @@
     SFTreeViewItem *root = searchRoot (true, MachineType);
     root->setHidden (false);
-    getFrom (mMachine.GetSharedFolders().Enumerate(), root);
+    getFrom (mMachine.GetSharedFolders(), root);
 }
 
@@ -288 +288 @@
     SFTreeViewItem *root = searchRoot (true, ConsoleType);
     root->setHidden (false);
-    getFrom (mConsole.GetSharedFolders().Enumerate(), root);
+    getFrom (mConsole.GetSharedFolders(), root);
 }
 
@@ -303 +303 @@
     //SFTreeViewItem *root = searchRoot (true, GlobalType);
     //Assert (root);
-    //CSharedFolderEnumerator en =
-    //    vboxGlobal().virtualBox().GetSharedFolders().Enumerate();
-    //putBackTo (en, root);
+    //CSharedFolderVector vec =
+    //    vboxGlobal().virtualBox().GetSharedFolders();
+    //putBackTo (vec, root);
 }
 
@@ -318 +318 @@
     SFTreeViewItem *root = searchRoot (true,  MachineType);
     Assert (root);
-    CSharedFolderEnumerator en = mMachine.GetSharedFolders().Enumerate();
-    putBackTo (en, root);
+    CSharedFolderVector sfvec = mMachine.GetSharedFolders();
+    putBackTo (sfvec, root);
 }
 
@@ -332 +332 @@
     SFTreeViewItem *root = searchRoot (true, ConsoleType);
     Assert (root);
-    CSharedFolderEnumerator en = mConsole.GetSharedFolders().Enumerate();
-    putBackTo (en, root);
+    CSharedFolderVector sfvec = mConsole.GetSharedFolders();
+    putBackTo (sfvec, root);
 }
 
@@ -622 +622 @@
 
 
-void VBoxVMSettingsSF::getFrom (const CSharedFolderEnumerator &aEn,
+void VBoxVMSettingsSF::getFrom (const CSharedFolderVector &aVec,
                                 SFTreeViewItem *aRoot)
 {
-    while (aEn.HasMore())
-    {
-        CSharedFolder sf = aEn.GetNext();
+    for (int i = 0; i < aVec.size(); ++i)
+    {
+        CSharedFolder sf = aVec[i];
         QStringList fields;
         fields << sf.GetName() /* name */
@@ -641 +641 @@
 }
 
-void VBoxVMSettingsSF::putBackTo (CSharedFolderEnumerator &aEn,
+void VBoxVMSettingsSF::putBackTo (CSharedFolderVector &aVec,
                                   SFTreeViewItem *aRoot)
 {
@@ -648 +648 @@
 
     /* delete all changed folders from vm */
-    while (aEn.HasMore())
-    {
-        CSharedFolder sf = aEn.GetNext();
+    for (int idx = 0; idx < aVec.size(); ++idx)
+    {
+        CSharedFolder sf = aVec[idx];
 
         /* Iterate through this root's children */