Changeset 57510 in vbox

Timestamp:

Aug 24, 2015 1:09:47 PM (10 years ago)

Author:

vboxsync

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

102301

Message:

FE/Qt: 7958: Desktop-widget watchdog manual cleanup.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UIDesktopWidgetWatchdog.cpp (modified) (6 diffs)
• UIDesktopWidgetWatchdog.h (modified) (3 diffs)

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

@@ -86 +86 @@
     /* Notify listeners about host-screen available-geometry was calulated: */
     emit sigHostScreenAvailableGeometryCalculated(m_iHostScreenIndex, QRect(x(), y(), width(), height()));
-
-    /* Ask window for suicide: */
-    deleteLater();
 }
 
@@ -100 +97 @@
 }
 
+UIDesktopWidgetWatchdog::~UIDesktopWidgetWatchdog()
+{
+    /* Cleanup: */
+    cleanup();
+}
+
 const QRect     UIDesktopWidgetWatchdog::screenGeometry(int iHostScreenIndex /* = -1 */) const
 {
@@ -129 +132 @@
     m_cHostScreenCount = cHostScreenCount != -1 ? cHostScreenCount : m_pDesktopWidget->screenCount();
 
-    /* Resize vector to new host-screen count: */
+    /* Resize vectors to new host-screen count: */
+    qDeleteAll(m_availableGeometryWorkers);
+    m_availableGeometryWorkers.clear();
+    m_availableGeometryWorkers.resize(m_cHostScreenCount);
     m_availableGeometryData.clear();
     m_availableGeometryData.resize(m_cHostScreenCount);
@@ -151 +157 @@
     AssertPtrReturnVoid(pWorker);
     {
+        /* Remember created worker: */
+        if (m_availableGeometryWorkers.value(iHostScreenIndex))
+            delete m_availableGeometryWorkers.value(iHostScreenIndex);
+        m_availableGeometryWorkers[iHostScreenIndex] = pWorker;
         /* Get the screen-geometry: */
         const QRect hostScreenGeometry = screenGeometry(iHostScreenIndex);
@@ -172 +182 @@
     /* Apply received data: */
     m_availableGeometryData[iHostScreenIndex] = availableGeometry;
+    /* Forget finished worker: */
+    AssertPtrReturnVoid(m_availableGeometryWorkers.value(iHostScreenIndex));
+    m_availableGeometryWorkers.value(iHostScreenIndex)->deleteLater();
+    m_availableGeometryWorkers[iHostScreenIndex] = 0;
 }
 
@@ -184 +198 @@
 }
 
+void UIDesktopWidgetWatchdog::cleanup()
+{
+    /* Cleanup connections: */
+    disconnect(m_pDesktopWidget, SIGNAL(screenCountChanged(int)), this, SLOT(sltUpdateHostScreenConfiguration(int)));
+    disconnect(m_pDesktopWidget, SIGNAL(resized(int)), this, SLOT(sltRecalculateHostScreenAvailableGeometry(int)));
+
+    /* Cleanup existing workers: */
+    qDeleteAll(m_availableGeometryWorkers);
+    m_availableGeometryWorkers.clear();
+}
+
 #include "UIDesktopWidgetWatchdog.moc"
 

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

@@ -38 +38 @@
     /** Constructs watchdog for the @a pParent being passed into the base-class. */
     UIDesktopWidgetWatchdog(QObject *pParent);
+    /** Destructs watchdog. */
+    ~UIDesktopWidgetWatchdog();
 
     /** Returns the geometry of the host-screen with @a iHostScreenIndex.
@@ -62 +64 @@
     /** Prepare routine. */
     void prepare();
+    /** Cleanup routine. */
+    void cleanup();
 
     /** Holds the desktop-widget reference pointer. */
@@ -70 +74 @@
     /** Holds current host-screen available-geometries. */
     QVector<QRect> m_availableGeometryData;
+    /** Holds current workers determining host-screen available-geometries. */
+    QVector<QWidget*> m_availableGeometryWorkers;
 };