Changeset 1469 in vbox

Timestamp:

Mar 14, 2007 2:54:19 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Don't pollute public namespace with one-time private methods.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -338 +338 @@
     bool startMachine (const QUuid &id);
 
-    void addMediaToList (const CUnknown&, VBoxDefs::DiskType);
-
     void startEnumeratingMedia();
 

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

@@ -1147 +1147 @@
 
 /**
- *  Appends media_list with passed disk & it's children
- */
-void VBoxGlobal::addMediaToList (const CUnknown &aDisk,
-                                 VBoxDefs::DiskType aType)
+ *  Appends the disk object and all its children to the media list.
+ */
+static
+void addMediaToList (VBoxMediaList &aList,
+                     const CUnknown &aDisk,
+                     VBoxDefs::DiskType aType)
 {
     VBoxMedia media (aDisk, aType, VBoxMedia::Unknown);
-    media_list += media;
-    /* appending all vdi children */
+    aList += media;
+    /* append all vdi children */
     if (aType == VBoxDefs::HD)
     {
@@ -1162 +1164 @@
         {
             CHardDisk subHd = enumerator.GetNext();
-            addMediaToList (CUnknown (subHd), VBoxDefs::HD);
+            addMediaToList (aList, CUnknown (subHd), VBoxDefs::HD);
         }
     }
@@ -1194 +1196 @@
         CHardDiskEnumerator enHD = vbox.GetHardDisks().Enumerate();
         while (enHD.HasMore())
-            addMediaToList (CUnknown (enHD.GetNext()), VBoxDefs::HD);
+            addMediaToList (media_list, CUnknown (enHD.GetNext()), VBoxDefs::HD);
 
         CDVDImageEnumerator enCD = vbox.GetDVDImages().Enumerate();
         while (enCD.HasMore())
-            addMediaToList (CUnknown (enCD.GetNext()), VBoxDefs::CD);
+            addMediaToList (media_list, CUnknown (enCD.GetNext()), VBoxDefs::CD);
 
         CFloppyImageEnumerator enFD = vbox.GetFloppyImages().Enumerate();
         while (enFD.HasMore())
-            addMediaToList (CUnknown (enFD.GetNext()), VBoxDefs::FD);
+            addMediaToList (media_list, CUnknown (enFD.GetNext()), VBoxDefs::FD);
     }