Changeset 8907 in vbox

Timestamp:

May 19, 2008 9:26:13 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Make sure that all VBoxVMItems are proberly deleted.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMListView.h (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (6 diffs)
• src/VBoxVMListView.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMListView.h

@@ -100 +100 @@
 
     VBoxVMModel(QObject *aParent = 0)
-        :QAbstractListModel (aParent) { refresh(); }
+        :QAbstractListModel (aParent) {}
 
     void addItem (VBoxVMItem *aItem);
@@ -108 +108 @@
     void itemChanged (VBoxVMItem *aItem);
 
-    void refresh();
+    void clear();
 
     VBoxVMItem *itemById (const QUuid &aId) const;

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

@@ -484 +484 @@
     /* VM list view */
     mVMListView = new VBoxVMListView();
-    mVMModel = new VBoxVMModel();
+    mVMModel = new VBoxVMModel(mVMListView);
     mVMListView->setModel (mVMModel);
 
@@ -622 +622 @@
     }
 
+    /* Update the list */
+    refreshVMList();
     /* Reset to the first item */
     mVMListView->selectItemByRow (0);
@@ -716 +718 @@
         vbox.SetExtraData (VBoxDefs::GUI_LastVMSelected, curVMId);
     }
+    /* Delete the items from our model */
+    mVMModel->clear();
 }
 
@@ -883 +887 @@
                 machine.DeleteSettings();
                 /* remove the item shortly: cmachine it refers to is no longer valid! */
-#warning "port me: check this"
                 int row = mVMModel->rowById (item->id());
                 mVMModel->removeItem (item);
+                delete item;
                 mVMListView->ensureSomeRowSelected (row);
             }
@@ -1057 +1061 @@
 void VBoxSelectorWnd::refreshVMList()
 {
-    mVMModel->refresh();
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    CMachineVector vec = vbox.GetMachines2();
+    for (CMachineVector::ConstIterator m = vec.begin();
+         m != vec.end(); ++ m)
+        mVMModel->addItem (new VBoxVMItem (*m));
+    mVMModel->sort();
+
     vmListViewCurrentChanged();
 }
@@ -1481 +1491 @@
             int row = mVMModel->rowById (item->id());
             mVMModel->removeItem (item);
+            delete item;
             mVMListView->ensureSomeRowSelected (row);
         }

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

@@ -438 +438 @@
 
 /**
- *  Refreshes the model contents by rereading the list of VM's using the
- *  IVirtualBox instance.
+ *  Clear the item model list. Please note that the items itself are also
+ *  deleted. 
  */
-void VBoxVMModel::refresh()
-{
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    CMachineVector vec = vbox.GetMachines2();
-    for (CMachineVector::ConstIterator m = vec.begin();
-         m != vec.end(); ++ m)
-        addItem(new VBoxVMItem (*m));
-
-    sort();
+void VBoxVMModel::clear()
+{
+    qDeleteAll (mVMItemList);
 }