Changeset 55662 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 5, 2015 1:25:53 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

100048

Message:

FE/Qt: Selector UI: Some cleanup and crash protection inspired by the r100047.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.cpp

@@ -434 +434 @@
 bool UIVMItem::isItemEditable(UIVMItem *pItem)
 {
-    return pItem->accessible() &&
+    return pItem &&
+           pItem->accessible() &&
            pItem->sessionState() == KSessionState_Unlocked;
 }
@@ -441 +442 @@
 bool UIVMItem::isItemSaved(UIVMItem *pItem)
 {
-    if (pItem->accessible() &&
-        pItem->machineState() == KMachineState_Saved)
-        return true;
-    return false;
+    return pItem &&
+           pItem->accessible() &&
+           pItem->machineState() == KMachineState_Saved;
 }
 
@@ -450 +450 @@
 bool UIVMItem::isItemPoweredOff(UIVMItem *pItem)
 {
-    if (pItem &&
-        pItem->accessible() &&
-        (pItem->machineState() == KMachineState_PoweredOff ||
-         pItem->machineState() == KMachineState_Saved ||
-         pItem->machineState() == KMachineState_Teleported ||
-         pItem->machineState() == KMachineState_Aborted))
-        return true;
-    return false;
+    return pItem &&
+           pItem->accessible() &&
+           (pItem->machineState() == KMachineState_PoweredOff ||
+            pItem->machineState() == KMachineState_Saved ||
+            pItem->machineState() == KMachineState_Teleported ||
+            pItem->machineState() == KMachineState_Aborted);
 }
 
@@ -469 +467 @@
 bool UIVMItem::isItemRunning(UIVMItem *pItem)
 {
-    if (pItem->accessible() &&
-        (pItem->machineState() == KMachineState_Running ||
-         pItem->machineState() == KMachineState_Teleporting ||
-         pItem->machineState() == KMachineState_LiveSnapshotting))
-        return true;
-    return false;
+    return pItem &&
+           pItem->accessible() &&
+           (pItem->machineState() == KMachineState_Running ||
+            pItem->machineState() == KMachineState_Teleporting ||
+            pItem->machineState() == KMachineState_LiveSnapshotting);
 }
 
@@ -501 +498 @@
 bool UIVMItem::isItemPaused(UIVMItem *pItem)
 {
-    if (pItem->accessible() &&
-        (pItem->machineState() == KMachineState_Paused ||
-         pItem->machineState() == KMachineState_TeleportingPausedVM))
-        return true;
-    return false;
-
+    return pItem &&
+           pItem->accessible() &&
+           (pItem->machineState() == KMachineState_Paused ||
+            pItem->machineState() == KMachineState_TeleportingPausedVM);
 }
 
@@ -512 +507 @@
 bool UIVMItem::isItemStuck(UIVMItem *pItem)
 {
-    if (pItem->accessible() &&
-        pItem->machineState() == KMachineState_Stuck)
-        return true;
-    return false;
+    return pItem &&
+           pItem->accessible() &&
+           pItem->machineState() == KMachineState_Stuck;
 }