Changeset 68155 in vbox for trunk

Timestamp:

Jul 28, 2017 1:07:39 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8938: Fixing crash revealed by the Qt4=>Qt5 migration process (s.a. r117115).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QITableView.cpp (modified) (2 diffs)
• QITableView.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp

@@ -409 +409 @@
     : QTableView(pParent)
 {
-    /* Prepare all: */
+    /* Prepare: */
     prepare();
+}
+
+QITableView::~QITableView()
+{
+    /* Cleanup: */
+    cleanup();
 }
 
@@ -476 +482 @@
 }
 
+void QITableView::cleanup()
+{
+    /* Disconnect all the editors prematurelly: */
+    foreach (QObject *pEditor, m_editors.values())
+        disconnect(pEditor, 0, this, 0);
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.h

@@ -98 +98 @@
     /** Constructs table-view passing @a pParent to the base-class. */
     QITableView(QWidget *pParent = 0);
+    /** Destructs table-view. */
+    virtual ~QITableView() /* override */;
 
     /** Returns the number of children. */
@@ -123 +125 @@
     /** Prepares all. */
     void prepare();
+    /** Cleanups all. */
+    void cleanup();
 
     /** Holds the map of editors stored for passed indexes. */