Changeset 9677 in vbox

Timestamp:

Jun 13, 2008 10:44:18 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: Removed the questionable QLivePointer class.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxVMSettingsDlg.h (modified) (2 diffs)
• src/VBoxVMSettingsDlg.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxVMSettingsDlg.h

@@ -34 +34 @@
 class QWidgetStack;
 
-/**
- *  QObject live pointer class to make alive link of some pointer to
- *  some object. It will be nulled in case of object in destroyed.
- */
-class QLivePointer : public QObject
-{
-    Q_OBJECT;
-
-public:
-
-    static void link (QWidget *aParent, QWidget **aPointer);
-    static void kill();
-
-protected:
-
-    QLivePointer() {}
-   ~QLivePointer();
-
-private:
-
-    void setPointer (QWidget **aPointer);
-
-    static QLivePointer *mThis;
-
-    QWidget **mPointer;
-};
-
-class VBoxVMSettingsDlg : public QDialog, 
+class VBoxVMSettingsDlg : public QDialog,
                           public Ui::VBoxVMSettingsDlg
 {
-    Q_OBJECT;
+    Q_OBJECT
 
 public:
@@ -82 +55 @@
     void updateWhatsThis (bool gotFocus = false);
     void resetFirstRunFlag();
+    void whatsThisCandidateDestroyed (QObject *aObj = NULL);
 
 private:

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxVMSettingsDlg.cpp

@@ -69 +69 @@
 }
 
-/**
- *  QObject live pointer class to make alive link of some pointer to some
- *  QWidget. It will be nulled in case of linked QWidget is destroyed.
- */
-QLivePointer* QLivePointer::mThis = 0;
-
-void QLivePointer::link (QWidget *aParent, QWidget **aPointer)
-{
-    if (!mThis)
-        mThis = new QLivePointer();
-    mThis->setParent (aParent);
-    mThis->setPointer (aPointer);
-}
-
-void QLivePointer::kill()
-{
-    delete mThis;
-}
-
-QLivePointer::~QLivePointer()
-{
-    *mPointer = 0;
-    mThis = 0;
-}
-
-void QLivePointer::setPointer (QWidget **aPointer)
-{
-    mPointer = aPointer;
-    *mPointer = static_cast<QWidget*> (parent());
-}
-
-
 class VBoxWarnIconLabel: public QWidget
 {
@@ -128 +96 @@
     , mValid (true)
     , mWhatsThisTimer (new QTimer (this))
-    , mWhatsThisCandidate (0)
+    , mWhatsThisCandidate (NULL)
 {
     /* Apply UI decorations */
@@ -471 +439 @@
 }
 
+void VBoxVMSettingsDlg::resetFirstRunFlag()
+{
+    if (mAllowResetFirstRunFlag)
+        mResetFirstRunFlag = true;
+}
+
+void VBoxVMSettingsDlg::whatsThisCandidateDestroyed (QObject *aObj /*= NULL*/)
+{
+    /* sanity */
+    Assert (mWhatsThisCandidate == aObj);
+
+    if (mWhatsThisCandidate == aObj)
+        mWhatsThisCandidate = NULL;
+}
+
 bool VBoxVMSettingsDlg::eventFilter (QObject *aObject, QEvent *aEvent)
 {
@@ -486 +469 @@
         {
             if (aEvent->type() == QEvent::Enter)
-                QLivePointer::link (widget, &mWhatsThisCandidate);
+            {
+                /* What if Qt sends Enter w/o Leave... */
+                if (mWhatsThisCandidate)
+                    disconnect (mWhatsThisCandidate, SIGNAL (destroyed (QObject *)),
+                                this, SLOT (whatsThisCandidateDestroyed (QObject *)));
+
+                mWhatsThisCandidate = widget;
+                /* make sure we don't reference a deleted object after the
+                 * timer is shot */
+                connect (mWhatsThisCandidate, SIGNAL (destroyed (QObject *)),
+                         this, SLOT (whatsThisCandidateDestroyed (QObject *)));
+            }
             else
             {
-                QLivePointer::kill();
-                mWhatsThisCandidate = 0;
+                /* cleanup */
+                if (mWhatsThisCandidate)
+                    disconnect (mWhatsThisCandidate, SIGNAL (destroyed (QObject *)),
+                                this, SLOT (whatsThisCandidateDestroyed (QObject *)));
+                mWhatsThisCandidate = NULL;
             }
+
             mWhatsThisTimer->start (100);
             break;
@@ -542 +540 @@
 }
 
-void VBoxVMSettingsDlg::resetFirstRunFlag()
-{
-    if (mAllowResetFirstRunFlag)
-        mResetFirstRunFlag = true;
-}
-
 void VBoxVMSettingsDlg::setWarning (const QString &aWarning)
 {