Changeset 63834 in vbox

Timestamp:

Sep 14, 2016 1:15:45 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 29): Selector UI: UISnapshotPane: Replacing self-made guard-block with QReadWriteLock.

Location:

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

Files:

• UISnapshotPane.cpp (modified) (8 diffs)
• UISnapshotPane.h (modified) (2 diffs)

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

@@ -27 +27 @@
 # include <QPointer>
 # include <QApplication>
+# include <QWriteLocker>
 
 /* GUI includes: */
@@ -407 +408 @@
 
 
-/** Simple guard block to prevent cyclic call caused by:
-  * changing tree-widget item content (rename) leads to snapshot
-  * update & snapshot update leads to changing tree-widget item content. */
-class SnapshotEditBlocker
-{
-public:
-
-    /** Constructs edit blocker. */
-    SnapshotEditBlocker(bool &fProtector) : m_fProtector(fProtector) { m_fProtector = true; }
-    /** Destructs edit blocker. */
-    virtual ~SnapshotEditBlocker() { m_fProtector = false; }
-
-private:
-
-    /** Holds the protector flag reference. */
-    bool &m_fProtector;
-};
-
-
 UISnapshotPane::UISnapshotPane(QWidget *pParent)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_pCurrentSnapshotItem(0)
-    , m_fEditProtector(false)
     , m_pSnapshotItemActionGroup(new QActionGroup(this))
     , m_pCurrentStateItemActionGroup(new QActionGroup(this))
@@ -680 +661 @@
 void UISnapshotPane::sltItemChanged(QTreeWidgetItem *pItem)
 {
-    /* Make sure nothing is being edited currently: */
-    if (m_fEditProtector)
+    /* Make sure nothing being edited in the meantime: */
+    if (!m_lockReadWrite.tryLockForWrite())
         return;
 
@@ -692 +673 @@
     if (!comSnapshot.isNull() && comSnapshot.isOk() && comSnapshot.GetName() != pSnapshotItem->text(0))
         comSnapshot.SetName(pSnapshotItem->text(0));
+
+    /* Allows editing again: */
+    m_lockReadWrite.unlock();
 }
 
 void UISnapshotPane::sltItemDoubleClicked(QTreeWidgetItem *pItem)
 {
-    /* Make sure nothing is being edited currently: */
-    if (m_fEditProtector)
-        return;
-
     /* Acquire corresponding snapshot item: */
     const SnapshotWgtItem *pSnapshotItem = toSnapshotItem(pItem);
@@ -858 +838 @@
 void UISnapshotPane::sltMachineDataChange(QString strMachineID)
 {
-    /* Prevent snapshot editing in the meantime: */
-    SnapshotEditBlocker guardBlock(m_fEditProtector);
-
     /* Make sure it's our VM: */
     if (strMachineID != m_strMachineID)
         return;
 
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
+
     /* Recache state current item: */
     currentStateItem()->recache();
@@ -871 +851 @@
 void UISnapshotPane::sltMachineStateChange(QString strMachineID, KMachineState enmState)
 {
-    /* Prevent snapshot editing in the meantime: */
-    SnapshotEditBlocker guardBlock(m_fEditProtector);
-
     /* Make sure it's our VM: */
     if (strMachineID != m_strMachineID)
         return;
 
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
+
     /* Recache new machine state: */
     currentStateItem()->recache();
@@ -885 +865 @@
 void UISnapshotPane::sltSessionStateChange(QString strMachineID, KSessionState enmState)
 {
-    /* Prevent snapshot editing in the meantime: */
-    SnapshotEditBlocker guardBlock(m_fEditProtector);
-
     /* Make sure it's our VM: */
     if (strMachineID != m_strMachineID)
         return;
+
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
 
     /* Recache new session state: */
@@ -1003 +983 @@
 {
     /* Prevent snapshot editing in the meantime: */
-    SnapshotEditBlocker guardBlock(m_fEditProtector);
+    QWriteLocker locker(&m_lockReadWrite);
 
     /* If VM is null, just updated the current itm: */

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

@@ -22 +22 @@
 #include <QTimer>
 #include <QIcon>
+#include <QReadWriteLock>
 
 /* GUI includes: */
@@ -155 +156 @@
     SnapshotWgtItem *m_pCurrentSnapshotItem;
     /** Holds the snapshot item editing protector. */
-    bool             m_fEditProtector;
+    QReadWriteLock   m_lockReadWrite;
 
     /** Holds the snapshot item action group instance. */