Changeset 77041 in vbox

Timestamp:

Jan 30, 2019 12:48:39 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Proper prepare/cleanup cascade for Chooser machine item (s.a. r128309).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemMachine.cpp (modified) (5 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -60 +60 @@
     , m_iMaximumSnapshotNameWidth(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -82 +81 @@
     , m_iMaximumSnapshotNameWidth(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -88 +86 @@
 UIChooserItemMachine::~UIChooserItemMachine()
 {
-    /* If that item is focused: */
-    if (model()->focusItem() == this)
-    {
-        /* Unset the focus: */
-        model()->setFocusItem(0);
-    }
-    /* If that item is in selection list: */
-    if (model()->currentItems().contains(this))
-    {
-        /* Remove item from the selection list: */
-        model()->removeFromCurrentItems(this);
-    }
-    /* If that item is in navigation list: */
-    if (model()->navigationList().contains(this))
-    {
-        /* Remove item from the navigation list: */
-        model()->removeFromNavigationList(this);
-    }
-
-    /* Remove item from the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine-item!"));
-    parentItem()->removeItem(this);
+    cleanup();
 }
 
@@ -613 +590 @@
 
     /* Add item to the parent: */
-    AssertMsg(parentItem(), ("No parent set for machine-item!"));
+    AssertPtrReturnVoid(parentItem());
     parentItem()->addItem(this, m_iPosition);
     setZValue(parentItem()->zValue() + 1);
@@ -634 +611 @@
     /* Apply language settings: */
     retranslateUi();
+}
+
+void UIChooserItemMachine::cleanup()
+{
+    /* If that item is focused: */
+    if (model()->focusItem() == this)
+    {
+        /* Unset the focus: */
+        model()->setFocusItem(0);
+    }
+    /* If that item is in selection list: */
+    if (model()->currentItems().contains(this))
+    {
+        /* Remove item from the selection list: */
+        model()->removeFromCurrentItems(this);
+    }
+    /* If that item is in navigation list: */
+    if (model()->navigationList().contains(this))
+    {
+        /* Remove item from the navigation list: */
+        model()->removeFromNavigationList(this);
+    }
+
+    /* Remove item from the parent: */
+    AssertPtrReturnVoid(parentItem());
+    parentItem()->removeItem(this);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

@@ -220 +220 @@
         /** Prepares all. */
         void prepare();
+        /** Cleanups all. */
+        void cleanup();
     /** @} */