Changeset 7721 in vbox for trunk/src

Timestamp:

Apr 3, 2008 12:49:30 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Ported several classes from qt3 to qt4 and some minor changes.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/QIWidgetValidator.h (modified) (4 diffs)
• include/VBoxGlobalSettings.h (modified) (1 diff)
• src/QIWidgetValidator.cpp (modified) (9 diffs)
• src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• src/VBoxGlobalSettings.cpp (modified) (5 diffs)
• ui/VBoxSnapshotsWgt.ui.h (modified) (1 diff)

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

@@ -22 +22 @@
 #include <limits.h>
 
-#include <qobject.h>
-#include <qvalidator.h>
-#include <q3valuelist.h>
+/* Qt includes */
+#include <QObject>
+#include <QValidator>
+#include <QList>
 
 class QIWidgetValidator : public QObject
@@ -32 +33 @@
 public:
 
-    QIWidgetValidator (QWidget *aWidget, QObject *aParent = 0,
-                       const char *aName = 0);
+    QIWidgetValidator (QWidget *aWidget, QObject *aParent = 0);
     QIWidgetValidator (const QString &aCaption,
-                       QWidget *aWidget, QObject *aParent = 0,
-                       const char *aName = 0);
+                       QWidget *aWidget, QObject *aParent = 0);
     ~QIWidgetValidator();
 
@@ -74 +73 @@
     };
 
-    Q3ValueList <Watched> mWatched;
+    QList <Watched> mWatched;
     Watched mLastInvalid;
 
@@ -86 +85 @@
 public:
 
-    QIULongValidator (QObject *aParent, const char *aName = 0)
+    QIULongValidator (QObject *aParent)
         : QValidator (aParent)
         , mBottom (0), mTop (ULONG_MAX) {}
 
     QIULongValidator (ulong aMinimum, ulong aMaximum,
-                      QObject *aParent, const char *aName = 0)
+                      QObject *aParent)
         : QValidator (aParent)
         , mBottom (aMinimum), mTop (aMaximum) {}

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

@@ -22 +22 @@
 #include "CIShared.h"
 
-#include <qobject.h>
+/* Qt includes */
+#include <QObject>
 
 class CVirtualBox;

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

@@ -19 +19 @@
 #include "QIWidgetValidator.h"
 
-#include <qobject.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-//Added by qt3to4:
-#include <Q3ValueList>
+/* Qt includes */
+#include <QLineEdit>
+#include <QComboBox>
+#include <QLabel>
 
 #include <iprt/assert.h>
@@ -79 +77 @@
  *  @param aWidget  Widget whose children should be checked.
  */
-QIWidgetValidator::QIWidgetValidator (QWidget *aWidget, QObject *aParent,
-                                      const char *aName)
-    : QObject (aParent, aName)
+QIWidgetValidator::QIWidgetValidator (QWidget *aWidget, QObject *aParent)
+    : QObject (aParent)
     , mWidget (aWidget)
     , mOtherValid (true)
@@ -96 +93 @@
  */
 QIWidgetValidator::QIWidgetValidator (const QString &aCaption,
-                                      QWidget *aWidget, QObject *aParent,
-                                      const char *aName)
-    : QObject (aParent, aName)
+                                      QWidget *aWidget, QObject *aParent)
+    : QObject (aParent)
     , mCaption (aCaption)
     , mWidget (aWidget)
@@ -154 +150 @@
     QValidator::State state = QValidator::Acceptable;
 
-    for (Q3ValueList <Watched>::ConstIterator it = mWatched.begin();
-         it != mWatched.end(); ++ it)
+    foreach (Watched watched, mWatched)
     {
-        Watched watched = *it;
-
         if (watched.widget->inherits ("QLineEdit"))
         {
@@ -214 +207 @@
     Watched watched;
 
-    QObjectList list = mWidget->queryList();
-    QObject *obj;
+    QList<QWidget *> list = mWidget->findChildren<QWidget *>();
+    QWidget *wgt;
 
     /* detect all widgets that support validation */
-    QListIterator<QObject*> it (list);
+    QListIterator<QWidget *> it (list);
     while (it.hasNext())
     {
-        obj = it.next();
-        if (obj->inherits ("QLineEdit"))
-        {
-            QLineEdit *le = ((QLineEdit *) obj);
+        wgt = it.next();
+
+        if (QLineEdit *le = qobject_cast<QLineEdit *> (wgt))
+        {
             if (!le->validator())
                 continue;
@@ -233 +226 @@
                      this, SLOT (doRevalidate()));
         }
-        else if (obj->inherits ("QComboBox"))
-        {
-            QComboBox *cb = ((QComboBox *) obj);
+        else if (QComboBox *cb = qobject_cast<QComboBox *> (wgt))
+        {
+            
             if (!cb->validator() || !cb->lineEdit())
                 continue;
@@ -245 +238 @@
         }
 
-        watched.widget = (QWidget *) obj;
+        watched.widget = wgt;
 
         /* try to find a buddy widget in order to determine the title for
          * the watched widget which is used in the warning text */
-        QListIterator<QObject*> it2 (list);
+        QListIterator<QWidget *> it2 (list);
         while (it2.hasNext())
         {
-            obj = it2.next();
-            if (obj->inherits ("QLabel"))
-            {
-                QLabel *label = (QLabel *) obj;
+            wgt = it2.next();
+            if (QLabel *label = qobject_cast<QLabel *> (wgt))
                 if (label->buddy() == watched.widget)
                 {
@@ -261 +252 @@
                     break;
                 }
-            }
         }
 
@@ -363 +353 @@
     Q_UNUSED (aPos);
 
-    QString stripped = aInput.stripWhiteSpace();
+    QString stripped = aInput.trimmed();
 
     if (stripped.isEmpty() ||
-        stripped.upper() == QString ("0x").upper())
+        stripped.toUpper() == QString ("0x").toUpper())
         return Intermediate;
 

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

@@ -144 +144 @@
 
     /* ensure status bar is created */
-    new QIStatusBar (this);
+    setStatusBar (new QIStatusBar (this));
 
     ///// Actions ///////////////////////////////////////////////////////////
@@ -3295 +3295 @@
 {
 #warning "port me"
-    /* @todo: I'm not sure if it is the right way to force an shutdown if modal
-     * child widgets are open. Anyway, currently I didn't know how to achieve
-     * this. So for now we simply call close. */
+    /* It seems that Qt4 closes all child widgets if the parent widget get
+     * closed. So nothing to do here than to call close. */
      
      close();
 
+    /* We have this to test on Windows and Mac or maybe I forgot something, so
+     * we keep this as a reference: */
 //    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
 //

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

@@ -17 +17 @@
  */
 
-#include <qglobal.h>
-#include <qstring.h>
-#include <qregexp.h>
+/* Qt includes */
+#include <QString>
+#include <QRegExp>
+#include <QVariant>
 
 #include "VBoxGlobalSettings.h"
 #include "QIHotKeyEdit.h"
 #include "COMDefs.h"
-
-#include <qvariant.h>
 
 /** @class VBoxGlobalSettingsData
@@ -118 +117 @@
 bool VBoxGlobalSettings::isFeatureActive (const char *aFeature) const
 {
-    QStringList featureList = QStringList::split (',', data()->guiFeatures);
+    QStringList featureList = data()->guiFeatures.split (',');
     return featureList.contains (aFeature);
 }
@@ -164 +163 @@
     {
         QVariant value = property (gPropertyMap [i].name);
-        Assert (value.isValid() && value.canCast (QVariant::String));
+        Assert (value.isValid() && value.canConvert (QVariant::String));
 
         vbox.SetExtraData (gPropertyMap [i].publicName, value.toString());
@@ -183 +182 @@
         {
             QVariant value = property (gPropertyMap [i].name);
-            Assert (value.isValid() && value.canCast (QVariant::String));
-
-            if (value.isValid() && value.canCast (QVariant::String))
+            Assert (value.isValid() && value.canConvert (QVariant::String));
+
+            if (value.isValid() && value.canConvert (QVariant::String))
                 return value.toString();
             else
@@ -246 +245 @@
 
     QVariant oldVal = property (gPropertyMap [index].name);
-    Assert (oldVal.isValid() && oldVal.canCast (QVariant::String));
-
-    if (oldVal.isValid() && oldVal.canCast (QVariant::String) &&
+    Assert (oldVal.isValid() && oldVal.canConvert (QVariant::String));
+
+    if (oldVal.isValid() && oldVal.canConvert (QVariant::String) &&
         oldVal.toString() != value)
     {

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxSnapshotsWgt.ui.h

@@ -303 +303 @@
     toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
 #warning port me
+    vboxLayout->insertWidget (0, toolBar);
 //    VBoxSnapshotsWgtLayout->insertWidget (0, toolBar);
 #ifdef Q_WS_MAC