Changeset 43126 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 30, 2012 7:22:02 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM settings stuff: Protect widget validator with Qt safe-pointer stuff.

Location:

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

Files:

• QIWidgetValidator.cpp (modified) (3 diffs)
• QIWidgetValidator.h (modified) (2 diffs)

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

@@ -153 +153 @@
     foreach (Watched watched, mWatched)
     {
-        if (watched.widget->inherits ("QLineEdit"))
-        {
-            QLineEdit *le = ((QLineEdit *) watched.widget);
+        if (QLineEdit *le = qobject_cast<QLineEdit*>(watched.widget))
+        {
             Assert (le->validator());
             if (!le->validator() || !le->isEnabled())
@@ -163 +162 @@
             state = le->validator()->validate (text, pos);
         }
-        else if (watched.widget->inherits ("QComboBox"))
-        {
-            QComboBox *cb = ((QComboBox *) watched.widget);
+        else if (QComboBox *cb = qobject_cast<QComboBox*>(watched.widget))
+        {
             Assert (cb->validator());
             if (!cb->validator() || !cb->isEnabled())
@@ -299 +297 @@
             /* Remove '&' symbol from the buddy field name */
             title = VBoxGlobal::
-                removeAccelMark (((QLabel *) mLastInvalid.buddy)->text());
+                removeAccelMark(qobject_cast<QLabel*>(mLastInvalid.buddy)->text());
 
             /* Remove ':' symbol from the buddy field name */

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

@@ -26 +26 @@
 #include <QValidator>
 #include <QList>
+#include <QPointer>
 
 class QIWidgetValidator : public QObject
@@ -72 +73 @@
     {
         Watched()
-            : widget (NULL), buddy (NULL)
-            , state (QValidator::Acceptable) {}
+            : state (QValidator::Acceptable) {}
 
-        QWidget *widget;
-        QWidget *buddy;
+        QPointer<QWidget> widget;
+        QPointer<QWidget> buddy;
         QValidator::State state;
     };