Changeset 57663 in vbox

Timestamp:

Sep 9, 2015 12:59:10 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Thread-pool: Get rid of personal storage, use Qt property storage instead.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIThreadPool.cpp (modified) (1 diff)
• globals/UIThreadPool.h (modified) (2 diffs)
• medium/UIMediumEnumerator.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp

@@ -272 +272 @@
 }
 
-UITask::UITask(const QVariant &data)
-    : m_data(data)
-{
-}
-
 void UITask::start()
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.h

@@ -121 +121 @@
 public:
 
-    /** Constructs worker-thread task.
-      * @param data defines inter-thread task data to be processed
-      *             by worker-thread and returned back if necessary. */
-    UITask(const QVariant &data);
-
-    /** Returns the inter-thread task data. */
-    const QVariant& data() const { return m_data; }
-    /** Defines the inter-thread task @a data. */
-    void setData(const QVariant &data) { m_data = data; }
+    /** Constructs worker-thread task. */
+    UITask() {}
 
     /** Starts the task. */
@@ -139 +132 @@
       * @remarks To be reimplemented in sub-class. */
     virtual void run() = 0;
-
-private:
-
-    /** Holds the inter-thread task data. */
-    QVariant m_data;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
 
 
-
-/* GUI task prototype: Medium enumeration.
- * Extends UITask interface to be executed by the UIThreadWorker. */
+/** UITask extension used for medium enumeration purposes. */
 class UITaskMediumEnumeration : public UITask
 {
@@ -47 +45 @@
 public:
 
-    /* Constructor: */
+    /** Constructs @a medium enumeration task. */
     UITaskMediumEnumeration(const UIMedium &medium)
-        : UITask(QVariant::fromValue(medium))
-    {}
+    {
+        /* Store medium as property: */
+        setProperty("medium", QVariant::fromValue(medium));
+    }
 
 private:
 
-    /* Helper: Run stuff: */
-    void run();
+    /** Contains medium enumeration task body. */
+    void run()
+    {
+        /* Get medium: */
+        UIMedium medium = property("medium").value<UIMedium>();
+        /* Enumerate it: */
+        medium.blockAndQueryState();
+        /* Put it back: */
+        setProperty("medium", QVariant::fromValue(medium));
+    }
 };
-
-void UITaskMediumEnumeration::run()
-{
-    /* Get medium: */
-    UIMedium medium = data().value<UIMedium>();
-    /* Enumerate it: */
-    medium.blockAndQueryState();
-    /* Put medium back: */
-    setData(QVariant::fromValue(medium));
-}
 
 
@@ -279 +277 @@
 
     /* Get enumerated UIMedium: */
-    const UIMedium uimedium = pTask->data().value<UIMedium>();
+    const UIMedium uimedium = pTask->property("medium").value<UIMedium>();
     const QString strUIMediumKey = uimedium.key();
     LogRel2(("GUI: UIMediumEnumerator: Medium with key={%s} enumerated\n", strUIMediumKey.toAscii().constData()));