Changeset 7447 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include

Timestamp:

Mar 13, 2008 9:37:52 PM (17 years ago)

Author:

vboxsync

Message:

First group of qt3->qt4 convertions done:

1. VirtualBox About Dialog.
2. CloseVM Dialog.
3. NewVM Wizard.
4. NewHD Wizard.
5. FirstRun Wizard.

Wizards are rewritten fully due to qt designer 4.x is not supports QWizard class now.

Location:

trunk/src/VBox/Frontends/VirtualBox4/include

Files:

• VBoxMediaComboBox.h (modified) (2 diffs)
• VBoxUtils.h (modified) (2 diffs)

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

@@ -34 +34 @@
 public:
 
-    VBoxMediaComboBox (QWidget *aParent = 0, const char *aName = 0,
+    VBoxMediaComboBox (QWidget *aParent, const char *aName,
                        int aType = 0, bool aUseEmptyItem = false);
+    VBoxMediaComboBox (QWidget *aParent);
     ~VBoxMediaComboBox() {}
 
@@ -58 +59 @@
 protected:
 
+    void init();
     void updateToolTip (int);
     void processMedia (const VBoxMedia &);

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

@@ -23 +23 @@
 #include <qevent.h>
 #include <q3listview.h>
-#include <q3textedit.h>
 #include <qlabel.h>
 #include <qlayout.h>
@@ -171 +170 @@
 };
 
-
-/**
- *  Simple QTextEdit subclass to return its minimumSizeHint() as sizeHint()
- *  for getting more compact layout.
- */
-class QITextEdit : public Q3TextEdit
-{
-    Q_OBJECT
-
-public:
-
-    QITextEdit (QWidget *aParent)
-        : Q3TextEdit (aParent) {}
-
-    QSize sizeHint() const
-    {
-        return minimumSizeHint();
-    }
-
-    QSize minimumSizeHint() const
-    {
-        return QSize (width(), heightForWidth (width()));
-    }
-};
-
-
-/**
- *  Simple QLabel subclass to re-query and return its sizeHint()
- *  before the widget to be shown for getting more compact layout.
- */
-class QILabel : public QLabel
-{
-    Q_OBJECT
-
-public:
-
-    QILabel (QWidget *aParent, const char *aName)
-         : QLabel (aParent, aName), mShowed (false)
-    {
-        /* setup default size policy and alignment */
-        setSizePolicy (QSizePolicy ((QSizePolicy::SizeType)1,
-                                    (QSizePolicy::SizeType)0,
-                                    0, 0,
-                                    sizePolicy().hasHeightForWidth()));
-        setAlignment (int (Qt::AlignTop));
-        /* install show-parent-widget watcher */
-        aParent->topLevelWidget()->installEventFilter (this);
-    }
-
-    QSize sizeHint() const
-    {
-        return mShowed ?
-            QSize (width(), heightForWidth (width())) : QLabel::sizeHint();
-    }
-
-private:
-
-    bool eventFilter (QObject *aObject, QEvent *aEvent)
-    {
-        switch (aEvent->type())
-        {
-            case QEvent::Show:
-            {
-                mShowed = true;
-                if (parent() && ((QWidget*)parent())->layout())
-                    ((QWidget*)parent())->layout()->activate();
-                break;
-            }
-            default:
-                break;
-        }
-        return QLabel::eventFilter (aObject, aEvent);
-    }
-
-    bool mShowed;
-};
-
-
 #ifdef Q_WS_MAC
 # undef PAGE_SIZE