Changeset 67119 in vbox for trunk/src

Timestamp:

May 26, 2017 3:54:23 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: Get rid of Qt deps in header.

Location:

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

Files:

• UISnapshotPane.cpp (modified) (15 diffs)
• UISnapshotPane.h (modified) (7 diffs)

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

@@ -25 +25 @@
 # include <QDateTime>
 # include <QHeaderView>
+# include <QIcon>
 # include <QMenu>
 # include <QPointer>
+# include <QReadWriteLock>
 # include <QScrollBar>
+# include <QTimer>
 # include <QWriteLocker>
 
@@ -344 +347 @@
         setText(0, m_comSnapshot.GetName());
         m_fOnline = m_comSnapshot.GetOnline();
-        setIcon(0, m_pSnapshotWidget->snapshotItemIcon(m_fOnline));
+        setIcon(0, *m_pSnapshotWidget->snapshotItemIcon(m_fOnline));
         m_strDesc = m_comSnapshot.GetDescription();
         m_timestamp.setTime_t(m_comSnapshot.GetTimeStamp() / 1000);
@@ -517 +520 @@
 UISnapshotPane::UISnapshotPane(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_enmSessionState(KSessionState_Null)
     , m_pCurrentSnapshotItem(0)
+    , m_pLockReadWrite(0)
     , m_pActionTakeSnapshot(0)
     , m_pActionRestoreSnapshot(0)
@@ -523 +528 @@
     , m_pActionShowSnapshotDetails(0)
     , m_pActionCloneSnapshot(0)
+    , m_pTimerUpdateAge(0)
     , m_fShapshotOperationsAllowed(false)
+    , m_pIconSnapshotOffline(0)
+    , m_pIconSnapshotOnline(0)
     , m_pSnapshotTree(0)
 {
+    /* Create locker: */
+    m_pLockReadWrite = new QReadWriteLock;
+
     /* Cache pixmaps: */
-    m_snapshotIconOffline = UIIconPool::iconSet(":/snapshot_offline_16px.png");
-    m_snapshotIconOnline = UIIconPool::iconSet(":/snapshot_online_16px.png");
+    m_pIconSnapshotOffline = new QIcon(UIIconPool::iconSet(":/snapshot_offline_16px.png"));
+    m_pIconSnapshotOnline = new QIcon(UIIconPool::iconSet(":/snapshot_online_16px.png"));
 
     /* Create layout: */
@@ -627 +638 @@
 
     /* Setup timer: */
-    m_ageUpdateTimer.setSingleShot(true);
-    connect(&m_ageUpdateTimer, SIGNAL(timeout()), this, SLOT(sltUpdateSnapshotsAge()));
+    m_pTimerUpdateAge = new QTimer;
+    m_pTimerUpdateAge->setSingleShot(true);
+    connect(m_pTimerUpdateAge, SIGNAL(timeout()), this, SLOT(sltUpdateSnapshotsAge()));
 
     /* Setup Main event connections: */
@@ -642 +654 @@
 }
 
+UISnapshotPane::~UISnapshotPane()
+{
+    /* Stop timer if active: */
+    if (m_pTimerUpdateAge->isActive())
+        m_pTimerUpdateAge->stop();
+    /* Destroy timer: */
+    delete m_pTimerUpdateAge;
+    m_pTimerUpdateAge = 0;
+
+    /* Destroy icons: */
+    delete m_pIconSnapshotOffline;
+    delete m_pIconSnapshotOnline;
+    m_pIconSnapshotOffline = 0;
+    m_pIconSnapshotOnline = 0;
+
+    /* Destroy read-write locker: */
+    delete m_pLockReadWrite;
+    m_pLockReadWrite = 0;
+}
+
 void UISnapshotPane::setMachine(const CMachine &comMachine)
 {
@@ -663 +695 @@
     /* Refresh everything: */
     refreshAll();
+}
+
+const QIcon *UISnapshotPane::snapshotItemIcon(bool fOnline) const
+{
+    return !fOnline ? m_pIconSnapshotOffline : m_pIconSnapshotOnline;
 }
 
@@ -791 +828 @@
 {
     /* Make sure nothing being edited in the meantime: */
-    if (!m_lockReadWrite.tryLockForWrite())
+    if (!m_pLockReadWrite->tryLockForWrite())
         return;
 
@@ -804 +841 @@
 
     /* Allows editing again: */
-    m_lockReadWrite.unlock();
+    m_pLockReadWrite->unlock();
 }
 
@@ -828 +865 @@
 
     /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
+    QWriteLocker locker(m_pLockReadWrite);
 
     /* Recache state current item: */
@@ -841 +878 @@
 
     /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
+    QWriteLocker locker(m_pLockReadWrite);
 
     /* Recache new machine state: */
@@ -855 +892 @@
 
     /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
+    QWriteLocker locker(m_pLockReadWrite);
 
     /* Recache new session state: */
@@ -865 +902 @@
 {
     /* Stop timer if active: */
-    if (m_ageUpdateTimer.isActive())
-        m_ageUpdateTimer.stop();
+    if (m_pTimerUpdateAge->isActive())
+        m_pTimerUpdateAge->stop();
 
     /* Search for smallest snapshot age to optimize timer timeout: */
@@ -872 +909 @@
     switch (age)
     {
-        case SnapshotAgeFormat_InSeconds: m_ageUpdateTimer.setInterval(5 * 1000); break;
-        case SnapshotAgeFormat_InMinutes: m_ageUpdateTimer.setInterval(60 * 1000); break;
-        case SnapshotAgeFormat_InHours:   m_ageUpdateTimer.setInterval(60 * 60 * 1000); break;
-        case SnapshotAgeFormat_InDays:    m_ageUpdateTimer.setInterval(24 * 60 * 60 * 1000); break;
-        default:                          m_ageUpdateTimer.setInterval(0); break;
+        case SnapshotAgeFormat_InSeconds: m_pTimerUpdateAge->setInterval(5 * 1000); break;
+        case SnapshotAgeFormat_InMinutes: m_pTimerUpdateAge->setInterval(60 * 1000); break;
+        case SnapshotAgeFormat_InHours:   m_pTimerUpdateAge->setInterval(60 * 60 * 1000); break;
+        case SnapshotAgeFormat_InDays:    m_pTimerUpdateAge->setInterval(24 * 60 * 60 * 1000); break;
+        default:                          m_pTimerUpdateAge->setInterval(0); break;
     }
 
     /* Restart timer if necessary: */
-    if (m_ageUpdateTimer.interval() > 0)
-        m_ageUpdateTimer.start();
+    if (m_pTimerUpdateAge->interval() > 0)
+        m_pTimerUpdateAge->start();
 }
 
@@ -1177 +1214 @@
 {
     /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
+    QWriteLocker locker(m_pLockReadWrite);
 
     /* If VM is null, just updated the current itm: */

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

@@ -19 +19 @@
 #define ___UISnapshotPane_h___
 
-/* Qt includes: */
-#include <QIcon>
-#include <QTimer>
-#include <QReadWriteLock>
-
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
@@ -32 +27 @@
 
 /* Forward declarations: */
+class QIcon;
+class QReadWriteLock;
+class QTimer;
+class QTreeWidgetItem;
+class QITreeWidgetItem;
 class UISnapshotTree;
 class UISnapshotItem;
-class QTreeWidgetItem;
-class QITreeWidgetItem;
 
 
@@ -58 +56 @@
     /** Constructs snapshot pane passing @a pParent to the base-class. */
     UISnapshotPane(QWidget *pParent = 0);
+    /** Destructs snapshot pane. */
+    virtual ~UISnapshotPane() /* override */;
 
     /** Defines the @a comMachine object to be parsed. */
@@ -63 +63 @@
 
     /** Returns cached snapshot-item icon depending on @a fOnline flag. */
-    const QIcon &snapshotItemIcon(bool fOnline) const { return !fOnline ? m_snapshotIconOffline : m_snapshotIconOnline; }
+    const QIcon *snapshotItemIcon(bool fOnline) const;
 
 protected:
@@ -157 +157 @@
         UISnapshotItem *m_pCurrentSnapshotItem;
         /** Holds the snapshot item editing protector. */
-        QReadWriteLock m_lockReadWrite;
+        QReadWriteLock *m_pLockReadWrite;
     /** @} */
 
@@ -174 +174 @@
 
         /** Holds the snapshot age update timer. */
-        QTimer m_ageUpdateTimer;
+        QTimer *m_pTimerUpdateAge;
 
         /** Holds whether the snapshot operations are allowed. */
@@ -180 +180 @@
 
         /** Holds the cached snapshot-item pixmap for 'offline' state. */
-        QIcon m_snapshotIconOffline;
+        QIcon *m_pIconSnapshotOffline;
         /** Holds the cached snapshot-item pixmap for 'online' state. */
-        QIcon m_snapshotIconOnline;
+        QIcon *m_pIconSnapshotOnline;
 
         /** Holds the snapshot tree instance. */