Changeset 10852 in vbox for trunk/src/VBox/Frontends/VirtualBox4

Timestamp:

Jul 24, 2008 10:09:51 AM (16 years ago)

Author:

vboxsync

Message:

Fe/Qt4: Fixing the assert during taking/discarding snapshot in selector/snapshot sub-window.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxSnapshotsWgt.h (modified) (1 diff)
• src/VBoxSnapshotsWgt.cpp (modified) (10 diffs)

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

@@ -66 +66 @@
     void machineStateChanged (const VBoxMachineStateChangeEvent &aE);
     void sessionStateChanged (const VBoxSessionStateChangeEvent &aE);
+#if 0
     void snapshotChanged (const VBoxSnapshotEvent &aE);
+#endif
 
 private:

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

@@ -140 +140 @@
     void updateCurrentState (KMachineState aState)
     {
-        AssertReturn (!mMachine.isNull(), (void) 0);
+        if (mMachine.isNull())
+            return;
+
         setIcon (0, vboxGlobal().toIcon (aState));
         mMachineState = aState;
@@ -325 +327 @@
     connect (&vboxGlobal(), SIGNAL (sessionStateChanged (const VBoxSessionStateChangeEvent&)),
              this, SLOT (sessionStateChanged (const VBoxSessionStateChangeEvent&)));
+#if 0
     connect (&vboxGlobal(), SIGNAL (snapshotChanged (const VBoxSnapshotEvent&)),
              this, SLOT (snapshotChanged (const VBoxSnapshotEvent&)));
+#endif
 
     retranslateUi();
@@ -443 +447 @@
 void VBoxSnapshotsWgt::discardSnapshot()
 {
-    SnapshotWgtItem *item = mTreeWidget->selectedItems().count() ?
-        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+    SnapshotWgtItem *item = mTreeWidget->selectedItems().isEmpty() ? 0 :
+        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
     AssertReturn (item, (void) 0);
 
@@ -474 +478 @@
 void VBoxSnapshotsWgt::takeSnapshot()
 {
-    SnapshotWgtItem *item = mTreeWidget->selectedItems().count() ?
-        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+    SnapshotWgtItem *item = mTreeWidget->selectedItems().isEmpty() ? 0 :
+        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
     AssertReturn (item, (void) 0);
 
@@ -528 +532 @@
 void VBoxSnapshotsWgt::discardCurState()
 {
-    SnapshotWgtItem *item = mTreeWidget->selectedItems().count() ?
-        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+    SnapshotWgtItem *item = mTreeWidget->selectedItems().isEmpty() ? 0 :
+        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
     AssertReturn (item, (void) 0);
 
@@ -556 +560 @@
 void VBoxSnapshotsWgt::discardCurSnapAndState()
 {
-    SnapshotWgtItem *item = mTreeWidget->selectedItems().count() ?
-        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+    SnapshotWgtItem *item = mTreeWidget->selectedItems().isEmpty() ? 0 :
+        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
     AssertReturn (item, (void) 0);
 
@@ -584 +588 @@
 void VBoxSnapshotsWgt::showSnapshotDetails()
 {
-    SnapshotWgtItem *item = mTreeWidget->selectedItems().count() ?
-        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+    SnapshotWgtItem *item = mTreeWidget->selectedItems().isEmpty() ? 0 :
+        static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
     AssertReturn (item, (void) 0);
 
@@ -630 +634 @@
 
     mSessionState = aE.state;
-    onCurrentChanged (mTreeWidget->selectedItems().count() ?
-                      mTreeWidget->selectedItems() [0] : 0);
-}
-
+    onCurrentChanged (mTreeWidget->selectedItems().isEmpty() ? 0 :
+                      mTreeWidget->selectedItems() [0]);
+}
+
+#if 0
 void VBoxSnapshotsWgt::snapshotChanged (const VBoxSnapshotEvent &aE)
 {
@@ -660 +665 @@
     }
 }
+#endif
 
 void VBoxSnapshotsWgt::retranslateUi()
@@ -686 +692 @@
     if (aKeepSelected)
     {
-        SnapshotWgtItem *cur = mTreeWidget->selectedItems().count() ?
-            static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]) : 0;
+        SnapshotWgtItem *cur = mTreeWidget->selectedItems().isEmpty() ? 0 :
+            static_cast<SnapshotWgtItem*> (mTreeWidget->selectedItems() [0]);
         if (cur)
         {