Changeset 67260 in vbox for trunk/src/VBox

Timestamp:

Jun 5, 2017 4:08:22 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: A bit of cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISnapshotPane.cpp (modified) (17 diffs)
• UISnapshotPane.h (modified) (1 diff)

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

@@ -94 +94 @@
 
     /** Returns whether this is the "current state" item. */
-    bool isCurrentStateItem() const;
+    bool isCurrentStateItem() const { return m_fCurrentStateItem; }
 
     /** Calculates and returns the current item level. */
@@ -113 +113 @@
 
     /** Returns current machine state. */
-    KMachineState getCurrentState() const;
-
-    /** Recaches current machine state. */
-    void updateCurrentState(KMachineState enmState);
+    KMachineState machineState() const;
+    /** Defines current machine @a enmState. */
+    void setMachineState(KMachineState enmState);
 
     /** Updates item age. */
@@ -132 +131 @@
 
     /** Holds the pointer to the snapshot-widget this item belongs to. */
-    QPointer<UISnapshotPane> m_pSnapshotWidget;
+    QPointer<UISnapshotPane>  m_pSnapshotWidget;
 
     /** Holds whether this is a "current state" item. */
-    bool                     m_fCurrentState;
+    bool  m_fCurrentStateItem;
 
     /** Holds the snapshot COM wrapper. */
-    CSnapshot                m_comSnapshot;
+    CSnapshot  m_comSnapshot;
     /** Holds the machine COM wrapper. */
-    CMachine                 m_comMachine;
+    CMachine   m_comMachine;
 
     /** Holds the current snapshot ID. */
-    QString                  m_strSnapshotID;
+    QString  m_strSnapshotID;
     /** Holds whether the current snapshot is online one. */
-    bool                     m_fOnline;
+    bool     m_fOnline;
 
     /** Holds the item timestamp. */
-    QDateTime                m_timestamp;
+    QDateTime  m_timestamp;
 
     /** Holds whether the current state is modified. */
-    bool                     m_fCurrentStateModified;
+    bool           m_fCurrentStateModified;
     /** Holds the cached machine state. */
-    KMachineState            m_enmMachineState;
+    KMachineState  m_enmMachineState;
 };
 
@@ -200 +199 @@
     : QITreeWidgetItem(pTreeWidget)
     , m_pSnapshotWidget(pSnapshotWidget)
-    , m_fCurrentState(false)
+    , m_fCurrentStateItem(false)
     , m_comSnapshot(comSnapshot)
 {
@@ -208 +207 @@
     : QITreeWidgetItem(pRootItem)
     , m_pSnapshotWidget(pSnapshotWidget)
-    , m_fCurrentState(false)
+    , m_fCurrentStateItem(false)
     , m_comSnapshot(comSnapshot)
 {
@@ -216 +215 @@
     : QITreeWidgetItem(pTreeWidget)
     , m_pSnapshotWidget(pSnapshotWidget)
-    , m_fCurrentState(true)
+    , m_fCurrentStateItem(true)
     , m_comMachine(comMachine)
 {
     /* Fetch current machine state: */
-    updateCurrentState(m_comMachine.GetState());
+    setMachineState(m_comMachine.GetState());
 }
 
@@ -226 +225 @@
     : QITreeWidgetItem(pRootItem)
     , m_pSnapshotWidget(pSnapshotWidget)
-    , m_fCurrentState(true)
+    , m_fCurrentStateItem(true)
     , m_comMachine(comMachine)
 {
     /* Fetch current machine state: */
-    updateCurrentState(m_comMachine.GetState());
+    setMachineState(m_comMachine.GetState());
 }
 
@@ -240 +239 @@
         {
             /* Call to base-class for "current state" item, compose ourselves otherwise: */
-            return m_fCurrentState ? QTreeWidgetItem::data(iColumn, iRole) :
-                                     QString("%1%2")
-                                         .arg(QTreeWidgetItem::data(iColumn, Qt::DisplayRole).toString())
-                                         .arg(QTreeWidgetItem::data(iColumn, Qt::UserRole).toString());
+            return m_fCurrentStateItem ? QTreeWidgetItem::data(iColumn, iRole)
+                                       : QString("%1%2")
+                                             .arg(QTreeWidgetItem::data(iColumn, Qt::DisplayRole).toString())
+                                             .arg(QTreeWidgetItem::data(iColumn, Qt::UserRole).toString());
         }
         case Qt::SizeHintRole:
@@ -271 +270 @@
 }
 
-bool UISnapshotItem::isCurrentStateItem() const
-{
-    return m_comSnapshot.isNull();
-}
-
 int UISnapshotItem::level() const
 {
@@ -323 +317 @@
 {
     /* For "current state" item: */
-    if (m_fCurrentState)
+    if (m_fCurrentStateItem)
     {
         /* Fetch machine information: */
-        AssertReturnVoid(!m_comMachine.isNull());
+        AssertReturnVoid(m_comMachine.isNotNull());
         m_fCurrentStateModified = m_comMachine.GetCurrentStateModified();
-        m_strName = m_fCurrentStateModified ?
-                    UISnapshotPane::tr("Current State (changed)", "Current State (Modified)") :
-                    UISnapshotPane::tr("Current State", "Current State (Unmodified)");
+        m_strName = m_fCurrentStateModified
+                  ? UISnapshotPane::tr("Current State (changed)", "Current State (Modified)")
+                  : UISnapshotPane::tr("Current State", "Current State (Unmodified)");
         setText(0, m_strName);
-        m_strDescription = m_fCurrentStateModified ?
-                           UISnapshotPane::tr("The current state differs from the state stored in the current snapshot") :
-                           QTreeWidgetItem::parent() != 0 ?
-                           UISnapshotPane::tr("The current state is identical to the state stored in the current snapshot") :
-                           QString();
-    }
-    /* For others: */
+        m_strDescription = m_fCurrentStateModified
+                         ? UISnapshotPane::tr("The current state differs from the state stored in the current snapshot")
+                         : QTreeWidgetItem::parent() != 0
+                         ? UISnapshotPane::tr("The current state is identical to the state stored in the current snapshot")
+                         : QString();
+    }
+    /* For snapshot item: */
     else
     {
         /* Fetch snapshot information: */
-        AssertReturnVoid(!m_comSnapshot.isNull());
+        AssertReturnVoid(m_comSnapshot.isNotNull());
         m_strSnapshotID = m_comSnapshot.GetId();
         m_strName = m_comSnapshot.GetName();
@@ -359 +353 @@
 }
 
-KMachineState UISnapshotItem::getCurrentState() const
+KMachineState UISnapshotItem::machineState() const
 {
     /* Make sure machine is valid: */
@@ -369 +363 @@
 }
 
-void UISnapshotItem::updateCurrentState(KMachineState enmState)
+void UISnapshotItem::setMachineState(KMachineState enmState)
 {
     /* Make sure machine is valid: */
@@ -375 +369 @@
         return;
 
-    /* Set corresponding icon: */
-    setIcon(0, gpConverter->toIcon(enmState));
     /* Cache new state: */
     m_enmMachineState = enmState;
+    /* Set corresponding icon: */
+    setIcon(0, gpConverter->toIcon(m_enmMachineState));
     /* Update timestamp: */
     m_timestamp.setTime_t(m_comMachine.GetLastStateChange() / 1000);
@@ -452 +446 @@
 
     /* Compose date time: */
-    QString strDateTime = fDateTimeToday ?
-                          m_timestamp.time().toString(Qt::LocalDate) :
-                          m_timestamp.toString(Qt::LocalDate);
+    QString strDateTime = fDateTimeToday
+                        ? m_timestamp.time().toString(Qt::LocalDate)
+                        : m_timestamp.toString(Qt::LocalDate);
 
     /* Prepare details: */
     QString strDetails;
 
+    /* For "current state" item: */
+    if (m_fCurrentStateItem)
+    {
+        strDateTime = UISnapshotPane::tr("%1 since %2", "Current State (time or date + time)")
+                      .arg(gpConverter->toString(m_enmMachineState)).arg(strDateTime);
+    }
     /* For snapshot item: */
-    if (!m_comSnapshot.isNull())
+    else
     {
         /* The current snapshot is always bold: */
@@ -477 +477 @@
         else
             strDateTime = UISnapshotPane::tr("Taken on %1", "Snapshot (date + time)").arg(strDateTime);
-    }
-    /* For "current state" item: */
-    else
-    {
-        strDateTime = UISnapshotPane::tr("%1 since %2", "Current State (time or date + time)")
-                      .arg(gpConverter->toString(m_enmMachineState)).arg(strDateTime);
     }
 
@@ -644 +638 @@
     /* Recache current item data and machine-state: */
     currentStateItem()->recache();
-    currentStateItem()->updateCurrentState(enmState);
+    currentStateItem()->setMachineState(enmState);
 }
 
@@ -766 +760 @@
     KMachineState enmState = KMachineState_Null;
     if (currentStateItem())
-        enmState = currentStateItem()->getCurrentState();
+        enmState = currentStateItem()->machineState();
 
     /* Whether taking or deleting snapshots is possible right now: */

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.h

@@ -69 +69 @@
 protected:
 
-    /** Handles translation event. */
-    virtual void retranslateUi() /* override */;
+    /** @name Event-handling stuff.
+      * @{ */
+        /** Handles translation event. */
+        virtual void retranslateUi() /* override */;
+    /** @} */
 
 private slots: