Changeset 7763 in vbox

Timestamp:

Apr 7, 2008 9:48:29 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Ported mostly of the VBoxGlobal related function to Qt4.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxGlobal.h (modified) (16 diffs)
• src/VBoxDownloaderWgt.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (55 diffs)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (2 diffs)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (1 diff)
• ui/VBoxVMLogViewer.ui.h (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

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

@@ -24 +24 @@
 #include "VBoxGlobalSettings.h"
 
-#include <qapplication.h>
-#include <qpixmap.h>
-#include <qicon.h>
-#include <qcolor.h>
-#include <quuid.h>
-#include <qthread.h>
-#include <q3popupmenu.h>
+/* Qt includes */
+#include <QApplication>
+#include <QLayout>
+#include <QHash>
+#include <QPixmap>
 #include <QMenu>
-#include <qtooltip.h>
-
-#include <q3ptrvector.h>
-#include <q3valuevector.h>
-#include <q3valuelist.h>
-#include <q3dict.h>
-#include <q3intdict.h>
-//Added by qt3to4:
-#include <QLabel>
-#include <QEvent>
-#include <QLayout>
 
 class QAction;
@@ -66 +53 @@
 };
 
-typedef Q3ValueList <VBoxMedia> VBoxMediaList;
+typedef QList <VBoxMedia> VBoxMediaList;
 
 // VirtualBox callback events
@@ -196 +183 @@
     QPixmap toIcon (KMachineState s) const
     {
-        QPixmap *pm = mStateIcons [s];
+        QPixmap *pm = mStateIcons.value (s);
         AssertMsg (pm, ("Icon for VM state %d must be defined", s));
         return pm ? *pm : QPixmap();
@@ -204 +191 @@
     {
         static const QColor none;
-        AssertMsg (vm_state_color [s], ("No color for %d", s));
-        return vm_state_color [s] ? *vm_state_color [s] : none;
+        AssertMsg (vm_state_color.value (s), ("No color for %d", s));
+        return vm_state_color.value (s) ? *vm_state_color.value(s) : none;
     }
 
     QString toString (KMachineState s) const
     {
-        AssertMsg (!machineStates [s].isNull(), ("No text for %d", s));
-        return machineStates [s];
+        AssertMsg (!machineStates.value (s).isNull(), ("No text for %d", s));
+        return machineStates.value (s);
     }
 
     QString toString (KSessionState s) const
     {
-        AssertMsg (!sessionStates [s].isNull(), ("No text for %d", s));
-        return sessionStates [s];
+        AssertMsg (!sessionStates.value (s).isNull(), ("No text for %d", s));
+        return sessionStates.value (s);
     }
 
     QString toString (KStorageBus t) const
     {
-        AssertMsg (!storageBuses [t].isNull(), ("No text for %d", t));
-        return storageBuses [t];
+        AssertMsg (!storageBuses.value (t).isNull(), ("No text for %d", t));
+        return storageBuses.value (t);
     }
 
@@ -231 +218 @@
     QString toString (KHardDiskType t) const
     {
-        AssertMsg (!diskTypes [t].isNull(), ("No text for %d", t));
-        return diskTypes [t];
+        AssertMsg (!diskTypes.value (t).isNull(), ("No text for %d", t));
+        return diskTypes.value (t);
     }
 
     QString toString (KHardDiskStorageType t) const
     {
-        AssertMsg (!diskStorageTypes [t].isNull(), ("No text for %d", t));
-        return diskStorageTypes [t];
+        AssertMsg (!diskStorageTypes.value (t).isNull(), ("No text for %d", t));
+        return diskStorageTypes.value (t);
     }
 
     QString toString (KVRDPAuthType t) const
     {
-        AssertMsg (!vrdpAuthTypes [t].isNull(), ("No text for %d", t));
-        return vrdpAuthTypes [t];
+        AssertMsg (!vrdpAuthTypes.value (t).isNull(), ("No text for %d", t));
+        return vrdpAuthTypes.value (t);
     }
 
     QString toString (KPortMode t) const
     {
-        AssertMsg (!portModeTypes [t].isNull(), ("No text for %d", t));
-        return portModeTypes [t];
+        AssertMsg (!portModeTypes.value (t).isNull(), ("No text for %d", t));
+        return portModeTypes.value (t);
     }
 
     QString toString (KUSBDeviceFilterAction t) const
     {
-        AssertMsg (!usbFilterActionTypes [t].isNull(), ("No text for %d", t));
-        return usbFilterActionTypes [t];
+        AssertMsg (!usbFilterActionTypes.value (t).isNull(), ("No text for %d", t));
+        return usbFilterActionTypes.value (t);
     }
 
     QString toString (KClipboardMode t) const
     {
-        AssertMsg (!clipboardTypes [t].isNull(), ("No text for %d", t));
-        return clipboardTypes [t];
+        AssertMsg (!clipboardTypes.value (t).isNull(), ("No text for %d", t));
+        return clipboardTypes.value (t);
     }
 
@@ -275 +262 @@
     QString toString (KIDEControllerType t) const
     {
-        AssertMsg (!ideControllerTypes [t].isNull(), ("No text for %d", t));
-        return ideControllerTypes [t];
+        AssertMsg (!ideControllerTypes.value (t).isNull(), ("No text for %d", t));
+        return ideControllerTypes.value (t);
     }
 
@@ -327 +314 @@
     QString toString (KDeviceType t) const
     {
-        AssertMsg (!deviceTypes [t].isNull(), ("No text for %d", t));
-        return deviceTypes [t];
+        AssertMsg (!deviceTypes.value (t).isNull(), ("No text for %d", t));
+        return deviceTypes.value (t);
     }
 
@@ -343 +330 @@
     QString toString (KAudioDriverType t) const
     {
-        AssertMsg (!audioDriverTypes [t].isNull(), ("No text for %d", t));
-        return audioDriverTypes [t];
+        AssertMsg (!audioDriverTypes.value (t).isNull(), ("No text for %d", t));
+        return audioDriverTypes.value (t);
     }
 
@@ -357 +344 @@
     QString toString (KAudioControllerType t) const
     {
-        AssertMsg (!audioControllerTypes [t].isNull(), ("No text for %d", t));
-        return audioControllerTypes [t];
+        AssertMsg (!audioControllerTypes.value (t).isNull(), ("No text for %d", t));
+        return audioControllerTypes.value (t);
     }
 
@@ -371 +358 @@
     QString toString (KNetworkAdapterType t) const
     {
-        AssertMsg (!networkAdapterTypes [t].isNull(), ("No text for %d", t));
-        return networkAdapterTypes [t];
+        AssertMsg (!networkAdapterTypes.value (t).isNull(), ("No text for %d", t));
+        return networkAdapterTypes.value (t);
     }
 
@@ -385 +372 @@
     QString toString (KNetworkAttachmentType t) const
     {
-        AssertMsg (!networkAttachmentTypes [t].isNull(), ("No text for %d", t));
-        return networkAttachmentTypes [t];
+        AssertMsg (!networkAttachmentTypes.value (t).isNull(), ("No text for %d", t));
+        return networkAttachmentTypes.value (t);
     }
 
@@ -399 +386 @@
     QString toString (KUSBDeviceState aState) const
     {
-        AssertMsg (!USBDeviceStates [aState].isNull(), ("No text for %d", aState));
-        return USBDeviceStates [aState];
+        AssertMsg (!USBDeviceStates.value (aState).isNull(), ("No text for %d", aState));
+        return USBDeviceStates.value (aState);
     }
 
@@ -513 +500 @@
 
     static QString getExistingDirectory (const QString &aDir, QWidget *aParent,
-                                         const char *aName = 0,
                                          const QString &aCaption = QString::null,
                                          bool aDirOnly = TRUE,
@@ -519 +505 @@
 
     static QString getOpenFileName (const QString &, const QString &, QWidget*,
-                                    const char*, const QString &,
-                                    QString *defaultFilter = 0,
+                                    const QString &, QString *defaultFilter = 0,
                                     bool resolveSymLinks = true);
 
@@ -601 +586 @@
 
     VBoxGlobal();
-    ~VBoxGlobal() {}
+    ~VBoxGlobal();
 
     void init();
@@ -637 +622 @@
     CVirtualBoxCallback callback;
 
-    typedef Q3ValueVector <QString> QStringVector;
+    typedef QVector <QString> QStringVector;
 
     QString verString;
 
-    Q3ValueVector <CGuestOSType> vm_os_types;
-    Q3Dict <QPixmap> vm_os_type_icons;
-    Q3PtrVector <QColor> vm_state_color;
-
-    Q3IntDict <QPixmap> mStateIcons;
+    QVector <CGuestOSType> vm_os_types;
+    QHash <QString, QPixmap *> vm_os_type_icons;
+    QVector <QColor *> vm_state_color;
+
+    QHash <long int, QPixmap *> mStateIcons;
     QPixmap mOfflineSnapshotIcon, mOnlineSnapshotIcon;
 

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

@@ -270 +270 @@
                 /// the title)
                 QString target = vboxGlobal().getExistingDirectory (
-                    QFileInfo (mTarget).absolutePath(), this, "selectSaveDir",
+                    QFileInfo (mTarget).absolutePath(), this, 
                     tr ("Select folder to save Guest Additions image to"), true);
                 if (target.isNull())

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

@@ -26 +26 @@
 #include "QIMessageBox.h"
 
-//Added by qt3to4:
-#include <QDesktopWidget>
-#include <QTranslator>
-#include <Q3VBoxLayout>
-#include <Q3Frame>
-#include <QEvent>
-#include <QShowEvent>
-#include <Q3PopupMenu>
-#include <Q3HBoxLayout>
-
 #ifdef VBOX_WITH_REGISTRATION
 #include "VBoxRegistrationDlg.h"
 #endif
 
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
-#include <qicon.h>
-#include <qwidget.h>
-#include <q3filedialog.h>
-#include <qimage.h>
-#include <qlabel.h>
-#include <qtoolbutton.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qmutex.h>
-#include <qregexp.h>
-#include <qlocale.h>
+/* Qt includes */
+#include <QLibraryInfo>
+#include <QDialogButtonBox>
+#include <QFileDialog>
+#include <QToolTip>
+#include <QTranslator>
+#include <QDesktopWidget>
+#include <QMutex>
+#include <QToolButton>
 #include <QProcess>
-#include <QList>
 
 #ifdef Q_WS_X11
-#include <q3textbrowser.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
+#include <QTextBrowser>
+#include <QScrollBar>
+#include <QX11Info>
 #endif
 
@@ -70 +54 @@
 #if defined (Q_WS_WIN)
 #include "shlobj.h"
-#include <qeventloop.h>
+#include <QEventLoop>
 #endif
 
@@ -224 +208 @@
         {
             /* it's a global extra data key someone wants to change */
-            QString sKey = QString::fromUcs2 (key);
-            QString sVal = QString::fromUcs2 (value);
+            QString sKey = QString::fromUtf16 (key);
+            QString sVal = QString::fromUtf16 (value);
             if (sKey.startsWith ("GUI/"))
             {
@@ -252 +236 @@
                         /* disallow the change when there is an error*/
                         *error = SysAllocString ((const OLECHAR *)
-                                                 gs.lastError().ucs2());
+                                                 gs.lastError().utf16());
                         *allowChange = FALSE;
                     }
@@ -272 +256 @@
         if (COMBase::ToQUuid (id).isNull())
         {
-            QString sKey = QString::fromUcs2 (key);
-            QString sVal = QString::fromUcs2 (value);
+            QString sKey = QString::fromUtf16 (key);
+            QString sVal = QString::fromUtf16 (value);
             if (sKey.startsWith ("GUI/"))
             {
@@ -487 +471 @@
         if (!initDir->isEmpty())
         {
-            SendMessage (hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG (initDir->ucs2()));
-            //SendMessage (hwnd, BFFM_SETEXPANDED, TRUE, Q_ULONG (initDir->ucs2()));
+            SendMessage (hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG (initDir->utf16()));
+            //SendMessage (hwnd, BFFM_SETEXPANDED, TRUE, Q_ULONG (initDir->utf16()));
         }
     }
@@ -495 +479 @@
         TCHAR path [MAX_PATH];
         SHGetPathFromIDList (LPITEMIDLIST (lParam), path);
-        QString tmpStr = QString::fromUcs2 ((ushort*)path);
+        QString tmpStr = QString::fromUtf16 ((ushort*)path);
         if (!tmpStr.isEmpty())
             SendMessage (hwnd, BFFM_ENABLEOK, 1, 1);
@@ -565 +549 @@
 
     VBoxLicenseViewer (const QString &aFilePath)
-        : QDialog (0, "VBoxLicenseViewerObject")
+        : QDialog ()
         , mFilePath (aFilePath)
         , mLicenseText (0), mAgreeButton (0), mDisagreeButton (0)
     {
-        setCaption ("VirtualBox License");
-        setIcon (QPixmap (":/ico40x01.png"));
-
-        mLicenseText = new Q3TextBrowser (this);
+        setWindowTitle ("VirtualBox License");
+        setWindowIcon (QIcon (":/ico40x01.png"));
+
+        mLicenseText = new QTextBrowser (this);
         mAgreeButton = new QPushButton (tr ("I &Agree"), this);
         mDisagreeButton = new QPushButton (tr ("I &Disagree"), this);
-
-        mLicenseText->setTextFormat (Qt::RichText);
+        QDialogButtonBox *dbb = new QDialogButtonBox (this);
+        dbb->addButton (mAgreeButton, QDialogButtonBox::AcceptRole);
+        dbb->addButton (mDisagreeButton, QDialogButtonBox::RejectRole);
 
         connect (mLicenseText->verticalScrollBar(), SIGNAL (valueChanged (int)),
@@ -583 +568 @@
         connect (mDisagreeButton, SIGNAL (clicked()), SLOT (reject()));
 
-        Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 10, 10);
+        QVBoxLayout *mainLayout = new QVBoxLayout (this);
+        mainLayout->setSpacing (10);
+        VBoxGlobal::setLayoutMargin (mainLayout, 10);
         mainLayout->addWidget (mLicenseText);
-
-        Q3HBoxLayout *buttonLayout = new Q3HBoxLayout (mainLayout, 10);
-        buttonLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
-                                                      QSizePolicy::Preferred));
-        buttonLayout->addWidget (mAgreeButton);
-        buttonLayout->addWidget (mDisagreeButton);
+        mainLayout->addWidget (dbb);
 
         mLicenseText->verticalScrollBar()->installEventFilter (this);
@@ -619 +601 @@
     void onScrollBarMoving (int aValue)
     {
-        if (aValue == mLicenseText->verticalScrollBar()->maxValue())
+        if (aValue == mLicenseText->verticalScrollBar()->maximum())
             unlockButtons();
     }
@@ -645 +627 @@
         {
             case QEvent::Hide:
-                if (aObject == mLicenseText->verticalScrollBar() &&
-                    (windowState() & Qt::WindowActive))
+                if (aObject == mLicenseText->verticalScrollBar())
+                    /* Doesn't work on wm's like ion3 where the window starts
+                     * maximized: isActiveWindow() */
                     unlockButtons();
             default:
@@ -655 +638 @@
 
     QString       mFilePath;
-    Q3TextBrowser *mLicenseText;
+    QTextBrowser *mLicenseText;
     QPushButton  *mAgreeButton;
     QPushButton  *mDisagreeButton;
@@ -819 +802 @@
 }
 
+VBoxGlobal::~VBoxGlobal()
+{
+    qDeleteAll (vm_os_type_icons);
+    qDeleteAll (mStateIcons);
+    qDeleteAll (vm_state_color);
+}
+
 /**
  *  Sets the new global settings and saves them to the VirtualBox server.
@@ -927 +917 @@
     CGuestOSType type;
     if (aIndex >= 0 && aIndex < (int) vm_os_types.count())
-        type = vm_os_types [aIndex];
+        type = vm_os_types.value (aIndex);
     AssertMsg (!type.isNull(), ("Index for OS type must be valid: %d", aIndex));
     return type;
@@ -954 +944 @@
 {
     static const QPixmap none;
-    QPixmap *p = vm_os_type_icons [aId];
-    AssertMsg (p, ("Icon for type `%s' must be defined", aId.latin1()));
+    QPixmap *p = vm_os_type_icons.value (aId);
+    AssertMsg (p, ("Icon for type `%s' must be defined", aId.toLatin1().constData()));
     return p ? *p : none;
 }
@@ -1114 +1104 @@
 {
     for (size_t i = 0; i < ELEMENTS (comKnownPorts); ++ i)
-        if (strcmp (comKnownPorts [i].name, aName.utf8().data()) == 0)
+        if (strcmp (comKnownPorts [i].name, aName.toUtf8().data()) == 0)
         {
             aIRQ = comKnownPorts [i].IRQ;
@@ -1133 +1123 @@
 {
     for (size_t i = 0; i < ELEMENTS (lptKnownPorts); ++ i)
-        if (strcmp (lptKnownPorts [i].name, aName.utf8().data()) == 0)
+        if (strcmp (lptKnownPorts [i].name, aName.toUtf8().data()) == 0)
         {
             aIRQ = lptKnownPorts [i].IRQ;
@@ -1234 +1224 @@
 {
     QString details;
-    QString m = aDevice.GetManufacturer().stripWhiteSpace();
-    QString p = aDevice.GetProduct().stripWhiteSpace();
+    QString m = aDevice.GetManufacturer().trimmed();
+    QString p = aDevice.GetProduct().trimmed();
     if (m.isEmpty() && p.isEmpty())
     {
@@ -1245 +1235 @@
     else
     {
-        if (p.upper().startsWith (m.upper()))
+        if (p.toUpper().startsWith (m.toUpper()))
             details = p;
         else
@@ -1254 +1244 @@
         details += QString().sprintf (" [%04hX]", r);
 
-    return details.stripWhiteSpace();
+    return details.trimmed();
 }
 
@@ -1818 +1808 @@
     QDir docDir (path);
     docDir.setFilter (QDir::Files);
-    docDir.setNameFilter ("License-*.html");
+    docDir.setNameFilters (QStringList ("License-*.html"));
 
     /* get the license files list and search for the latest license */
@@ -1826 +1816 @@
     {
         QRegExp regExp ("License-([\\d\\.]+).html");
-        regExp.search (filesList [index]);
+        regExp.indexIn (filesList [index]);
         QString version = regExp.cap (1);
         if (maxVersionNumber < version.toDouble())
@@ -1839 +1829 @@
     /* compose the latest license file full path */
     QString latestVersion = QString::number (maxVersionNumber);
-    QString latestFilePath = docDir.absFilePath (
+    QString latestFilePath = docDir.absoluteFilePath (
         QString ("License-%1.html").arg (latestVersion));
 
@@ -2470 +2460 @@
 
     const QPixmap *pix = aLabel->pixmap();
-    QImage img = pix->convertToImage();
+    QImage img = pix->toImage();
     QRgb rgbBack = img.pixel (img.width() - 1, img.height() - 1);
     QRgb rgbFrame = img.pixel (img.width() - 1, 0);
@@ -2491 +2481 @@
 
     VBoxTranslator (QObject *aParent = 0)
-        : QTranslator (aParent, "VBoxTranslatorObject") {}
+        : QTranslator (aParent) {}
 
     bool loadFile (const QString &aFileName)
@@ -2555 +2545 @@
     {
         QRegExp regExp (gVBoxLangIDRegExp);
-        int pos = regExp.search (langId);
+        int pos = regExp.indexIn (langId);
         /* the language ID should match the regexp completely */
         AssertReturnVoid (pos == 0);
@@ -2563 +2553 @@
         if (nlsDir.exists (gVBoxLangFileBase + langId + gVBoxLangFileExt))
         {
-            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + langId +
-                                                   gVBoxLangFileExt);
+            languageFileName = nlsDir.absoluteFilePath (gVBoxLangFileBase + langId +
+                                                        gVBoxLangFileExt);
             selectedLangId = langId;
         }
         else if (nlsDir.exists (gVBoxLangFileBase + lang + gVBoxLangFileExt))
         {
-            languageFileName = nlsDir.absFilePath (gVBoxLangFileBase + lang +
-                                                   gVBoxLangFileExt);
+            languageFileName = nlsDir.absoluteFilePath (gVBoxLangFileBase + lang +
+                                                        gVBoxLangFileExt);
             selectedLangId = lang;
         }
@@ -2627 +2617 @@
         /* We use system installations of Qt on Linux systems, so first, try
          * to load the Qt translation from the system location. */
-        languageFileName = QString (qInstallPathTranslations()) + "/qt_" +
+        languageFileName = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" +
                            sLoadedLangId + gVBoxLangFileExt;
         QTranslator *qtSysTr = new QTranslator (sTranslator);
@@ -2642 +2632 @@
          * innotek translation is always the best one. */
 #endif
-        languageFileName =  nlsDir.absFilePath (QString ("qt_") +
-                                                sLoadedLangId +
-                                                gVBoxLangFileExt);
+        languageFileName =  nlsDir.absoluteFilePath (QString ("qt_") +
+                                                     sLoadedLangId +
+                                                     gVBoxLangFileExt);
         QTranslator *qtTr = new QTranslator (sTranslator);
         Assert (qtTr);
@@ -2686 +2676 @@
     QIcon iconSet;
 
-    iconSet.setPixmap (QPixmap (aNormal),
-                       QIcon::Large, QIcon::Normal);
-    iconSet.setPixmap (QPixmap (aSmallNormal),
-                       QIcon::Small, QIcon::Normal);
+    iconSet.addFile (aNormal, QSize(), QIcon::Normal);
+    iconSet.addFile (aSmallNormal, QSize(), QIcon::Normal);
     if (aSmallDisabled != NULL)
     {
-        iconSet.setPixmap (QPixmap (aDisabled),
-                           QIcon::Large, QIcon::Disabled);
-        iconSet.setPixmap (QPixmap (aSmallDisabled),
-                           QIcon::Small, QIcon::Disabled);
+        iconSet.addFile (aDisabled, QSize(), QIcon::Disabled);
+        iconSet.addFile (aSmallDisabled, QSize(), QIcon::Disabled);
     }
     if (aSmallActive != NULL)
     {
-        iconSet.setPixmap (QPixmap (aActive),
-                           QIcon::Large, QIcon::Active);
-        iconSet.setPixmap (QPixmap (aSmallActive),
-                           QIcon::Small, QIcon::Active);
+        iconSet.addFile (aActive, QSize(), QIcon::Active);
+        iconSet.addFile (aSmallActive, QSize(), QIcon::Active);
     }
 
@@ -2727 +2711 @@
 
     /* remember the icon set as setText() will kill it */
-    QIcon iset = aToolButton->iconSet();
+    QIcon iset = aToolButton->icon();
     /* re-use the setText() method to detect and set the accelerator */
     aToolButton->setText (aTextLabel);
-    QKeySequence accel = aToolButton->accel();
-    aToolButton->setTextLabel (aTextLabel);
-    aToolButton->setIconSet (iset);
+    QKeySequence accel = aToolButton->shortcut();
+    aToolButton->setText (aTextLabel);
+    aToolButton->setIcon (iset);
     /* set the accel last as setIconSet() would kill it */
-    aToolButton->setAccel (accel);
+    aToolButton->setShortcut (accel);
 }
 
@@ -2753 +2737 @@
     int rd = aBoundRect.right() - fr.right();
     int bd = aBoundRect.bottom() - fr.bottom();
-    fr.moveBy (rd < 0 ? rd : 0, bd < 0 ? bd : 0);
+    fr.translate (rd < 0 ? rd : 0, bd < 0 ? bd : 0);
 
     /* ensure the top left corner is visible */
     int ld = fr.left() - aBoundRect.left();
     int td = fr.top() - aBoundRect.top();
-    fr.moveBy (ld < 0 ? -ld : 0, td < 0 ? -td : 0);
+    fr.translate (ld < 0 ? -ld : 0, td < 0 ? -td : 0);
 
     if (aCanResize)
@@ -2766 +2750 @@
         bd = aBoundRect.bottom() - fr.bottom();
         if (rd < 0)
-            fr.rRight() += rd;
+            fr.setRight (fr.right() + rd);
         if (bd < 0)
-            fr.rBottom() += bd;
+            fr.setBottom (fr.bottom() + bd);
     }
 
@@ -2874 +2858 @@
 QChar VBoxGlobal::decimalSep()
 {
-    QString n = QLocale::system().toString (0.0, 'f', 1).stripWhiteSpace();
-    return n [1];
+    return QLocale::system().decimalPoint();
 }
 
@@ -2909 +2892 @@
 {
     QRegExp regexp (sizeRegexp());
-    int pos = regexp.search (aText);
+    int pos = regexp.indexIn (aText);
     if (pos != -1)
     {
@@ -2940 +2923 @@
             return intg;
 
-        Q_UINT64 hund = hundS.rightJustify (2, '0').toULongLong();
+        Q_UINT64 hund = hundS.rightJustified (2, '0').toULongLong();
         hund = hund * denom / 100;
         intg = intg * denom + hund;
@@ -3043 +3026 @@
         }
         number = QString ("%1%2%3").arg (intg).arg (decimalSep())
-                                   .arg (QString::number (hund).rightJustify (2, '0'));
+                                   .arg (QString::number (hund).rightJustified (2, '0'));
     }
     else
@@ -3156 +3139 @@
  */
 QString VBoxGlobal::getExistingDirectory (const QString &aDir,
-                                          QWidget *aParent, const char *aName,
+                                          QWidget *aParent,
                                           const QString &aCaption,
                                           bool aDirOnly,
@@ -3203 +3186 @@
             bi.hwndOwner = topParent ? topParent->winId() : 0;
             bi.pidlRoot = NULL;
-            bi.lpszTitle = (TCHAR*)title.ucs2();
+            bi.lpszTitle = (TCHAR*)title.utf16();
             bi.pszDisplayName = initPath;
             bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
@@ -3229 +3212 @@
                     pMalloc->Free (itemIdList);
                     pMalloc->Release();
-                    result = QString::fromUcs2 ((ushort*)path);
+                    result = QString::fromUtf16 ((ushort*)path);
                 }
             }
@@ -3259 +3242 @@
 #else
 
-    return Q3FileDialog::getExistingDirectory (aDir, aParent, aName, aCaption,
-                                              aDirOnly, aResolveSymlinks);
+    QFileDialog::Options o;
+    if (aDirOnly)
+        o = QFileDialog::ShowDirsOnly;
+    if (!aResolveSymlinks)
+        o |= QFileDialog::DontResolveSymlinks;
+    return QFileDialog::getExistingDirectory (aParent, aCaption, aDir, o);
 
 #endif
@@ -3269 +3256 @@
  *  oddities and limitations.
  *
- *  On Win32, this funciton makes sure a file filter is applied automatically
+ *  On Win32, this function makes sure a file filter is applied automatically
  *  right after it is selected from the drop-down list, to conform to common
  *  experience in other applications. Note that currently, @a selectedFilter
@@ -3281 +3268 @@
                                      const QString &aFilters,
                                      QWidget       *aParent,
-                                     const char    *aName,
                                      const QString &aCaption,
                                      QString       *aSelectedFilter,
@@ -3343 +3329 @@
             TCHAR buf [1024];
             if (initSel.length() > 0 && initSel.length() < sizeof (buf))
-                memcpy (buf, initSel.ucs2(), (initSel.length() + 1) * sizeof (TCHAR));
+                memcpy (buf, initSel.utf16(), (initSel.length() + 1) * sizeof (TCHAR));
             else
                 buf [0] = 0;
@@ -3352 +3338 @@
             ofn.lStructSize = sizeof (OPENFILENAME);
             ofn.hwndOwner = topParent ? topParent->winId() : 0;
-            ofn.lpstrFilter = (TCHAR *) winFilters.ucs2();
+            ofn.lpstrFilter = (TCHAR *) winFilters.utf16();
             ofn.lpstrFile = buf;
             ofn.nMaxFile = sizeof (buf) - 1;
-            ofn.lpstrInitialDir = (TCHAR *) workDir.ucs2();
-            ofn.lpstrTitle = (TCHAR *) title.ucs2();
+            ofn.lpstrInitialDir = (TCHAR *) workDir.utf16();
+            ofn.lpstrTitle = (TCHAR *) title.utf16();
             ofn.Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY |
                           OFN_EXPLORER | OFN_ENABLEHOOK |
@@ -3364 +3350 @@
             if (GetOpenFileName (&ofn))
             {
-                result = QString::fromUcs2 ((ushort *) ofn.lpstrFile);
+                result = QString::fromUtf16 ((ushort *) ofn.lpstrFile);
             }
 
@@ -3401 +3387 @@
 #else
 
-    return Q3FileDialog::getOpenFileName (aStartWith, aFilters, aParent, aName,
-                                         aCaption, aSelectedFilter, aResolveSymlinks);
-
+    QFileDialog::Options o;
+    if (!aResolveSymlinks)
+        o |= QFileDialog::DontResolveSymlinks;
+    return QFileDialog::getOpenFileName (aParent, aCaption, aStartWith, 
+                                         aFilters, aSelectedFilter, o);
 #endif
 }
@@ -3419 +3407 @@
     while (!dir.exists() && !dir.isRoot())
     {
-        QFileInfo dirInfo (dir.absPath());
-        dir = dirInfo.dirPath (true);
+        QFileInfo dirInfo (dir.absolutePath());
+        dir = dirInfo.absolutePath();
     }
     if (dir.exists() && !dir.isRoot())
-        result = dir.absPath();
+        result = dir.absolutePath();
     return result;
 }
@@ -3513 +3501 @@
 #elif defined (Q_WS_X11)
 
-    Display *dpy = QPaintDevice::x11AppDisplay();
+    Display *dpy = QX11Info::display();
 
     if (aSwitchDesktop)
@@ -3589 +3577 @@
 
     QRegExp accel ("\\(&[a-zA-Z]\\)");
-    int pos = accel.search (result);
+    int pos = accel.indexIn (result);
     if (pos >= 0)
         result.remove (pos, accel.cap().length());
     else
     {
-        pos = result.find ('&');
+        pos = result.indexOf ('&');
         if (pos >= 0)
             result.remove (pos, 1);
@@ -3668 +3656 @@
         void run()
         {
-            int rc = (int) ShellExecute (NULL, NULL, mURL.ucs2(), NULL, NULL, SW_SHOW);
+            int rc = (int) ShellExecute (NULL, NULL, mURL.utf16(), NULL, NULL, SW_SHOW);
             bool ok = rc > 32;
             QApplication::postEvent
@@ -3752 +3740 @@
         mRegDlg->setWindowState (mRegDlg->windowState() & ~Qt::WindowMinimized);
         mRegDlg->raise();
-        mRegDlg->setActiveWindow();
+        mRegDlg->activateWindow();
     }
     else
@@ -3967 +3955 @@
         {"l4",        ":/os_l4.png"},
     };
-    vm_os_type_icons.setAutoDelete (true); /* takes ownership of elements */
     for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); n ++)
     {
@@ -3995 +3982 @@
         {KMachineState_Discarding, ":/state_discarding_16px.png"},
     };
-    mStateIcons.setAutoDelete (true); // takes ownership of elements
     for (uint n = 0; n < SIZEOF_ARRAY (vmStateIcons); n ++)
     {
@@ -4007 +3993 @@
 
     /* initialize state colors vector */
-    vm_state_color.setAutoDelete (true); /* takes ownership of elements */
     vm_state_color.insert (KMachineState_Null,           new QColor(Qt::red));
     vm_state_color.insert (KMachineState_PoweredOff,     new QColor(Qt::gray));

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

@@ -18 +18 @@
 #include <QMenuItem>
 #include <QDir>
+#include <QToolTip>
 /**
  *
@@ -2015 +2016 @@
     }
 
-    QString src = VBoxGlobal::getOpenFileName (dir, filter, this,
-                                               "AddDiskImageDialog", title);
+    QString src = VBoxGlobal::getOpenFileName (dir, filter, this, title);
     src =  QDir::convertSeparators (src);
 

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

@@ -843 +843 @@
 
     QString path = le == leVRDPLib ?
-        VBoxGlobal::getOpenFileName (initDir, QString::null, this,
-                                     "getFile", QString::null) :
+        VBoxGlobal::getOpenFileName (initDir, QString::null, this, QString::null) :
         VBoxGlobal::getExistingDirectory (initDir, this);
     if (path.isNull())

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

@@ -10 +10 @@
 #include <Q3VBoxLayout>
 #include <QShowEvent>
+#include <QToolTip>
 /**
  *

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

@@ -9 +9 @@
 #include <QEvent>
 #include <Q3VBoxLayout>
+#include <QToolTip>
 /**
  *