Changeset 7226 in vbox

Timestamp:

Feb 29, 2008 5:29:15 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Fixed memory leak.

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp (modified) (9 diffs)

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

@@ -3809 +3809 @@
     }
 
-    // initialize guest OS type vector
+    /* initialize guest OS type vector */
     CGuestOSTypeCollection coll = mVBox.GetGuestOSTypes();
     int osTypeCount = coll.GetCount();
@@ -3822 +3822 @@
     }
 
-    // fill in OS type icon dictionary
+    /* fill in OS type icon dictionary */
     static const char *osTypeIcons[][2] =
     {
@@ -3849 +3849 @@
         {"l4", "os_l4.png"},
     };
-    vm_os_type_icons.setAutoDelete (true); // takes ownership of elements
+    vm_os_type_icons.setAutoDelete (true); /* takes ownership of elements */
     for (uint n = 0; n < SIZEOF_ARRAY (osTypeIcons); n ++)
     {
@@ -3856 +3856 @@
     }
 
-    // fill in VM state icon dictionary
+    /* fill in VM state icon dictionary */
     static struct
     {
@@ -3884 +3884 @@
     }
 
-    // online/offline snapshot icons
+    /* online/offline snapshot icons */
     mOfflineSnapshotIcon = qPixmapFromMimeSource ("offline_snapshot_16px.png");
     mOnlineSnapshotIcon = qPixmapFromMimeSource ("online_snapshot_16px.png");
 
-    // initialize state colors vector
-    // no ownership of elements, we're passing pointers to existing objects
+    /* initialize state colors vector */
+    vm_state_color.setAutoDelete (true); /* takes ownership of elements */
     vm_state_color.insert (KMachineState_Null,           new QColor(Qt::red));
     vm_state_color.insert (KMachineState_PoweredOff,     new QColor(Qt::gray));
@@ -3905 +3905 @@
     qApp->installEventFilter (this);
 
-    // create default non-null global settings
+    /* create default non-null global settings */
     gset = VBoxGlobalSettings (false);
 
-    // try to load global settings
+    /* try to load global settings */
     gset.load (mVBox);
     if (!mVBox.isOk() || !gset)
@@ -3923 +3923 @@
     languageChange();
 
-    // process command line
+    /* process command line */
 
     vm_render_mode_str = 0;
@@ -3981 +3981 @@
     vm_render_mode = vboxGetRenderMode( vm_render_mode_str );
 
-    // setup the callback
+    /* setup the callback */
     callback = CVirtualBoxCallback (new VBoxCallback (*this));
     mVBox.RegisterCallback (callback);
@@ -3988 +3988 @@
         return;
 
-    /*
-     *  Redefine default large and small icon sizes. In particular, it is
-     *  necessary to consider both 32px and 22px icon sizes as Large when
-     *  we explicitly define them as Large (seems to be a bug in
-     *  QToolButton::sizeHint()).
-     */
+    /* Redefine default large and small icon sizes. In particular, it is
+     * necessary to consider both 32px and 22px icon sizes as Large when we
+     * explicitly define them as Large (seems to be a bug in
+     * QToolButton::sizeHint()). */
 #warning port me
 //    QIcon::setIconSize (QIcon::Small, QSize (16, 16));