Changeset 7220 in vbox

Timestamp:

Feb 29, 2008 3:35:29 PM (17 years ago)

Author:

vboxsync

Message:

Compile VirtualBox with qt4 on linux.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• Makefile.kmk (modified) (10 diffs)
• include/COMDefs.h (modified) (10 diffs)
• include/COMWrappers.xsl (modified) (4 diffs)
• include/QIHotKeyEdit.h (modified) (2 diffs)
• include/QIMessageBox.h (modified) (3 diffs)
• include/QIRichLabel.h (modified) (4 diffs)
• include/QIStateIndicator.h (modified) (3 diffs)
• include/QIStatusBar.h (modified) (1 diff)
• include/QIWidgetValidator.h (modified) (3 diffs)
• include/VBoxAquaStyle.h (modified) (2 diffs)
• include/VBoxConsoleView.h (modified) (4 diffs)
• include/VBoxConsoleWnd.h (modified) (8 diffs)
• include/VBoxDownloaderWgt.h (modified) (2 diffs)
• include/VBoxFrameBuffer.h (modified) (1 diff)
• include/VBoxGlobal.h (modified) (6 diffs)
• include/VBoxMediaComboBox.h (modified) (2 diffs)
• include/VBoxNetworkFramework.h (modified) (2 diffs)
• include/VBoxProblemReporter.h (modified) (1 diff)
• include/VBoxSelectorWnd.h (modified) (6 diffs)
• include/VBoxToolBar.h (modified) (4 diffs)
• include/VBoxUtils.h (modified) (8 diffs)
• include/VBoxVMListBox.h (modified) (5 diffs)
• src/COMDefs.cpp (modified) (2 diffs)
• src/QIHotKeyEdit.cpp (modified) (6 diffs)
• src/QIMessageBox.cpp (modified) (9 diffs)
• src/QIRichLabel.cpp (modified) (40 diffs)
• src/QIStateIndicator.cpp (modified) (5 diffs)
• src/QIStatusBar.cpp (modified) (2 diffs)
• src/QIWidgetValidator.cpp (modified) (5 diffs)
• src/VBoxConsoleView.cpp (modified) (30 diffs)
• src/VBoxConsoleWnd.cpp (modified) (32 diffs)
• src/VBoxDownloaderWgt.cpp (modified) (6 diffs)
• src/VBoxFBDDRAW.cpp (modified) (1 diff)
• src/VBoxFBQuartz2D.cpp (modified) (2 diffs)
• src/VBoxFrameBuffer.cpp (modified) (3 diffs)
• src/VBoxGlobal.cpp (modified) (36 diffs)
• src/VBoxMediaComboBox.cpp (modified) (3 diffs)
• src/VBoxNetworkFramework.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (14 diffs)
• src/VBoxSelectorWnd.cpp (modified) (26 diffs)
• src/VBoxVMListBox.cpp (modified) (16 diffs)
• ui/VBoxAboutDlg.ui.h (modified) (1 diff)
• ui/VBoxDiskImageManagerDlg.ui (modified) (1 diff)
• ui/VBoxDiskImageManagerDlg.ui.h (modified) (61 diffs)
• ui/VBoxGlobalSettingsDlg.ui (modified) (1 diff)
• ui/VBoxGlobalSettingsDlg.ui.h (modified) (40 diffs)
• ui/VBoxNewHDWzd.ui.h (modified) (9 diffs)
• ui/VBoxNewVMWzd.ui.h (modified) (7 diffs)
• ui/VBoxRegistrationDlg.ui.h (modified) (7 diffs)
• ui/VBoxSharedFoldersSettings.ui.h (modified) (27 diffs)
• ui/VBoxSnapshotDetailsDlg.ui.h (modified) (3 diffs)
• ui/VBoxSnapshotsWgt.ui.h (modified) (18 diffs)
• ui/VBoxUSBFilterSettings.ui.h (modified) (2 diffs)
• ui/VBoxVMFirstRunWzd.ui.h (modified) (8 diffs)
• ui/VBoxVMInformationDlg.ui.h (modified) (12 diffs)
• ui/VBoxVMLogViewer.ui (modified) (1 diff)
• ui/VBoxVMLogViewer.ui.h (modified) (28 diffs)
• ui/VBoxVMNetworkSettings.ui.h (modified) (4 diffs)
• ui/VBoxVMSettingsDlg.ui (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (60 diffs)

trunk/src/VBox/Frontends/VirtualBox4/Makefile.kmk

@@ -38 +38 @@
 DEPTH = ../../../..
 include $(PATH_KBUILD)/header.kmk
+
+# Disable the debugger for now, this is another story.
+VBOX_WITH_DEBUGGER_GUI :=
+DEFS := $(filter-out VBOX_WITH_DEBUGGER_GUI,$(DEFS))
+
+# Handmade configuration of qt4
+VBOX_PATH_QT4 = /usr
+VBOX_MODULE_QT4 = QtCore QtGui QtNetwork Qt3Support
+VBOX_DEFS_QT4 = QT_CORE_LIB QT_GUI_LIB QT_NETWORK_LIB QT_QT3SUPPORT_LIB
+VBOX_INCS_QT4 = $(VBOX_PATH_QT4)/share/qt4/mkspecs/linux-g++ $(foreach mod, $(VBOX_MODULE_QT4), $(join $(VBOX_PATH_QT4)/include/qt4/, $(mod))) $(VBOX_PATH_QT4)/include/qt4/Qt $(VBOX_PATH_QT4)/include/qt4
+VBOX_LIBS_QT4 = $(VBOX_MODULE_QT4)
+VBOX_LIBPATH_QT4 =  $(VBOX_MODULE_QT4)/lib
+
+# Moc knows ifdefs now
+VBOX_MOCDEF_QT4 = -DQ_WS_X11
+
+# Warn about all what you know about porting qt3->qt4.
+# Disable this if you like to see something on your screen.
+VBOX_DEFS_QT4 += QT3_SUPPORT_WARNINGS 
+# Some default defs
+VBOX_DEFS_QT4 += QT3_SUPPORT QT_SHARED HAVE_CONFIG_H QT_NO_DEBUG
+
+VBOX_UIC4      := $(VBOX_PATH_QT4)/bin/uic3
+VBOX_MOC4      := $(VBOX_PATH_QT4)/bin/moc
+VBOX_LUPDATE4  := $(VBOX_PATH_QT4)/bin/lupdate
+VBOX_LRELEASE4 := $(VBOX_PATH_QT4)/bin/lrelease
+
+# Template copy from the qt3 stuff. Appended a "4" on the
+# relevant places.
+
+#
+# Template for building Qt GUI executables.
+#
+
+TEMPLATE_VBOXQT4GUIEXE = VBox Qt4 GUI Executable 
+TEMPLATE_VBOXQT4GUIEXE_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT $(ARCH_BITS_DEFS) $(VBOX_DEFS_QT4)
+TEMPLATE_VBOXQT4GUIEXE_INCS = \
+        $(VBOX_PATH_SDK)/include \
+    $(VBOX_INCS_QT4)
+
+ifeq ($(BUILD_TARGET),win)
+ # drag in library configuration (we need QMAKE_PRL_DEFINES)
+ ifneq ($(LIB_QT_PRL),)
+  include $(LIB_QT_PRL)
+ endif
+ TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_VCC_TOOL)
+ TEMPLATE_VBOXQT4GUIEXE_DEFS += \
+    _WIN32_WINNT=0x0500 UNICODE _UNICODE \
+    QT_DLL _CRT_SECURE_NO_DEPRECATE \
+    $(QMAKE_PRL_DEFINES)
+ ## @todo VCC70 flags?
+ ifdef VBOX_USE_VCC80
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -nologo -Zm200 -W3 -MD -Zi -EHsc -Zc:wchar_t-
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -RTCsu
+ else
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -nologo -Zm200 -W3 -MD -Zi -GX
+  TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.debug = -GZ
+ endif
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC)
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS = \
+        /NOD /NOLOGO /INCREMENTAL:NO /MAPINFO:EXPORTS /DEBUG \
+        /DELAYLOAD:oleaut32.dll
+ TEMPLATE_VBOXQT4GUIEXE_SDKS = WINPSDK
+ TEMPLATE_VBOXQT4GUIEXE_LIBS = \
+        $(LIB_QT) \
+        $(LIB_QTMAIN) \
+        $(LIB_RUNTIME) \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcprt.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/msvcrt.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_LIB)/atls.lib
+ TEMPLATE_VBOXQT4GUIEXE_POST_CMDS = $(VBOX_SIGN_IMAGE_CMDS)
+
+else # the gcc guys:
+ TEMPLATE_VBOXQT4GUIEXE_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBOXQT4GUIEXE_DEFS.linux = _REENTRANT
+    
+ TEMPLATE_VBOXQT4GUIEXE_DEFS.solaris = _REENTRANT
+
+ TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(LIB_SDL_INC)
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \
+        -pipe -Wall -W -frtti -fno-exceptions -Wno-non-virtual-dtor \
+        -Wno-long-long -fshort-wchar -fno-strict-aliasing \
+        $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.x86 = -m32
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.amd64 = -m64
+ TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS.linux = -pthread
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.x86 = -m32
+ TEMPLATE_VBOXQT4GUIEXE_LDFLAGS.amd64 = -m64
+ TEMPLATE_VBOXQT4GUIEXE_LIBS = \
+        $(VBOX_LIBS_QT4) \
+        $(LIB_SDL) \
+        $(LIB_RUNTIME) \
+        $(LIB_REM) \
+        $(LIB_VMM)
+
+ ifeq ($(BUILD_TARGET_ARCH),amd64)
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH = \
+        $(VBOX_PATH_QT4)/lib64/qt4 $(VBOX_PATH_QT4)/lib/qt4
+ else
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH = \
+        $(VBOX_PATH_QT4)/lib/qt4
+ endif
+
+ ifeq ($(BUILD_TARGET),linux)
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += $(VBOX_LD_as_needed)
+ else ifeq ($(BUILD_TARGET),darwin)
+  TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -framework Carbon -framework QuickTime -bind_at_load
+  TEMPLATE_VBOXQT4GUIEXE_LIBS +=
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
+ else ifeq ($(BUILD_TARGET),os2)
+  # drag in library configuration (we need QMAKE_PRL_DEFINES)
+  ifneq ($(LIB_QT_PRL),)
+   include $(LIB_QT_PRL)
+  endif
+  TEMPLATE_VBOXQT4GUIEXE_DEFS += $(QMAKE_PRL_DEFINES)
+  TEMPLATE_VBOXQT4GUIEXE_LIBS +=
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH +=
+ else
+  TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        $(VBOX_XCURSOR_INCS)
+  TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+    $(VBOX_XCURSOR_LIBS) \
+        Xext \
+        X11 \
+        m \
+        $(LIB_PTHREAD)
+  TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \
+        $(VBOX_LIBPATH_X11)
+  ifeq ($(BUILD_TARGET),freebsd)
+   TEMPLATE_VBOXQT4GUIEXE_INCS += \
+        /usr/include \
+        /usr/X11R6/include \
+        /usr/local/include
+  endif
+  ifeq ($(BUILD_TARGET),solaris)
+   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += '-R$$(VBOX_ORIGIN):$$(VBOX_ORIGIN)/qtgcc/lib'
+   TEMPLATE_VBOXQT4GUIEXE_LIBS += \
+        rt socket nsl
+  endif
+ endif
+
+endif
+
+# Add COM/XPCOM stuff
+TEMPLATE_VBOXQT4GUIEXE_LIBS            += \
+        $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
+ifdef VBOX_WITH_XPCOM
+ ## @todo may be worth creating the VBOX_XPCOM SDK def
+ TEMPLATE_VBOXQT4GUIEXE_DEFS            += VBOX_WITH_XPCOM
+ TEMPLATE_VBOXQT4GUIEXE_INCS            += \
+        $(VBOX_XPCOM_INCS)
+ TEMPLATE_VBOXQT4GUIEXE_LIBS            += \
+        $(LIB_XPCOM)
+ VBOX_MOCDEF_QT4 += -DVBOX_WITH_XPCOM
+endif
+
+#
+# Template for building Qt GUI components.
+#
+TEMPLATE_VBOXQT4GUI = VBox Qt GUI Components
+TEMPLATE_VBOXQT4GUI_EXTENDS = VBOXQTGUIEXE
+TEMPLATE_VBOXQT4GUI_LIBS = $(filter-out $(QTMAIN),$(TEMPLATE_VBOXQT4GUIEXE_LIBS))
+ifeq ($(BUILD_TARGET),darwin)
+ TEMPLATE_VBOXQT4GUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS))
+endif
+ifeq ($(filter-out solaris.x86 %.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),)
+ ifneq ($(BUILD_TARGET),win)
+  TEMPLATE_VBOXQT4GUI_DEFS     = PIC $(TEMPLATE_VBOXQT4GUIEXE_DEFS)
+  TEMPLATE_VBOXQT4GUI_CFLAGS   = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CFLAGS)
+  TEMPLATE_VBOXQT4GUI_CXXFLAGS = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS)
+  TEMPLATE_VBOXQT4GUI_LDFLAGS  = -fPIC $(TEMPLATE_VBOXQT4GUIEXE_LDFLAGS)
+ endif
+endif
 
 
@@ -120 +299 @@
 # VirtualBox - The GUI program.
 #
-VirtualBox_TEMPLATE = VBOXQTGUIEXE
+VirtualBox_TEMPLATE = VBOXQT4GUIEXE
 VirtualBox_SDKS.win = WINPSDK DXSDK
 #ifeq ($(filter-out freebsd linux netbsd openbsd os2 solaris,$(BUILD_TARGET)),) - later
@@ -199 +378 @@
         $(foreach moc,$(notdir $(basename $(VirtualBox_QT_MOCHDRS))), $(PATH_VirtualBox)/moc/moc_$(moc).cpp) \
         $(foreach ui,$(notdir $(basename $(VirtualBox_QT_UISRCS))), $(PATH_VirtualBox)/ui/$(ui).cpp $(PATH_VirtualBox)/moc/moc_$(ui).cpp) \
-        $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
+#       $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
 
 # All generated headers. Note: this list MUST be in sync with Qt source
@@ -467 +646 @@
         $$(call MSG_TOOL,moc,$(target),$(mochdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC) $(mochdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) $(mochdr) -o $$@
 
 endef
@@ -488 +667 @@
         $$(call MSG_TOOL,moc,$(target),$(mocsrc),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC) -i $(mocsrc) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) -i $(mocsrc) -o $$@
 
 endef
@@ -509 +688 @@
         $$(call MSG_TOOL,moc,$(target),$(mocuihdr),$$@)
         $$(QUIET)$$(MKDIR) -p $$(@D)
-        $$(QUIET)$$(VBOX_MOC) -i $(mocuihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) -i $(mocuihdr) -o $$@
 
 endef
@@ -528 +707 @@
 $(uihdr): $(uifile) | $$(call DIRDEP,$(dir $(uihdr)))
         $$(call MSG_TOOL,uic,$(target),$(uifile),$$@)
-        $$(QUIET)$$(VBOX_UIC) $(uifile) -o $$@
+        $$(QUIET)$$(VBOX_UIC4) $(uifile) -o $$@
 
 $(uisrc): $(uihdr) $(uifile) $(wildcard $(uifile).h) | $$(call DIRDEP,$(dir $(uisrc)))
         $$(call MSG_TOOL,uic,$(target),$(uifile),$$@)
-        $$(QUIET)$$(VBOX_UIC) $(uifile) -i $(uihdr) -o $$@
+        $$(QUIET)$$(VBOX_UIC4) -impl $(uihdr) $(uifile) -o $$@
+
+#$$(QUIET)$$(VBOX_UIC4) $(uifile) -i $(uihdr) -o $$@
 
 $(mocsrc): $(uihdr) | $$(call DIRDEP,$(dir $(mocsrc)))
         $$(call MSG_TOOL,moc,$(target),$(uihdr),$$@)
-        $$(QUIET)$$(VBOX_MOC) $(uihdr) -o $$@
+        $$(QUIET)$$(VBOX_MOC4) $(VBOX_MOCDEF_QT4) $(uihdr) -o $$@
 
 endef
@@ -558 +739 @@
 $(qmfile): $(tsfile) | $$(call DIRDEP,$(dir $(qmfile)))
         $$(call MSG_TOOLS,lrelease,$(target),$(tsfile),$$@)
-        $$(QUIET)$$(VBOX_LRELEASE) -nocompress $(tsfile) -qm $$@
+        $$(QUIET)$$(VBOX_LRELEASE4) -nocompress $(tsfile) -qm $$@
 
 endef
@@ -612 +793 @@
 # static images imported from VBoxUI.pro as VirtualBox_QT_IMAGES
 
-$(PATH_VirtualBox)/ui/vbox_image_collection.txt: VBoxUI.pro $(VirtualBox_QT_IMAGES)
-        $(RM) -f $@
-        $(APPEND) -v $@ VirtualBox_QT_IMAGES
-
-$(PATH_VirtualBox)/ui/vbox_image_collection.cpp: $(PATH_VirtualBox)/ui/vbox_image_collection.txt
-        $(call MSG_TOOL,uic,VirtualBox,$<,$@)
-        $(QUIET)$(VBOX_UIC) -o $@ -embed VBoxGUI -f $<
-
-VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
-OTHER_CLEAN += $(PATH_VirtualBox)/ui/vbox_image_collection.txt
+#$(PATH_VirtualBox)/ui/vbox_image_collection.txt: VBoxUI.pro $(VirtualBox_QT_IMAGES)
+#       $(RM) -f $@
+#       $(APPEND) -v $@ VirtualBox_QT_IMAGES
+#
+#$(PATH_VirtualBox)/ui/vbox_image_collection.cpp: $(PATH_VirtualBox)/ui/vbox_image_collection.txt
+#       $(call MSG_TOOL,uic,VirtualBox,$<,$@)
+#       $(QUIET)$(VBOX_UIC4) -o $@ -embed VBoxGUI -f $<
+#
+#VirtualBox_GENSRCS += $(PATH_VirtualBox)/ui/vbox_image_collection.cpp
+#OTHER_CLEAN += $(PATH_VirtualBox)/ui/vbox_image_collection.txt
 
 
@@ -650 +831 @@
 updatenls: $(VirtualBox_SOURCES) $(VirtualBox_HEADERS)
         $(call MSG_L1,lupdate all languages (nls/*.ts))
-        $(QUIET)$(VBOX_LUPDATE) $^ -ts $(VirtualBox_QT_TRANSLATIONS) nls/VirtualBox_xx_YY.ts
+        $(QUIET)$(VBOX_LUPDATE4) $^ -ts $(VirtualBox_QT_TRANSLATIONS) nls/VirtualBox_xx_YY.ts
 
 

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

@@ -79 +79 @@
 #include <qstring.h>
 #include <quuid.h>
-#include <qvaluevector.h>
+#include <q3valuevector.h>
 
 #include <iprt/memory> // for auto_copy_ptr
@@ -225 +225 @@
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const QValueVector <QT> &aVec, com::SafeArray <CT> &aArr)
+    static void ToSafeArray (const Q3ValueVector <QT> &aVec, com::SafeArray <CT> &aArr)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -231 +231 @@
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT> &aArr, QValueVector <QT> &aVec)
+    static void FromSafeArray (const com::SafeArray <CT> &aArr, Q3ValueVector <QT> &aVec)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -237 +237 @@
 
     template <typename QT, typename CT>
-    static void ToSafeArray (const QValueVector <QT *> &aVec, com::SafeArray <CT *> &aArr)
+    static void ToSafeArray (const Q3ValueVector <QT *> &aVec, com::SafeArray <CT *> &aArr)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -243 +243 @@
 
     template <typename CT, typename QT>
-    static void FromSafeArray (const com::SafeArray <CT *> &aArr, QValueVector <QT *> &aVec)
+    static void FromSafeArray (const com::SafeArray <CT *> &aArr, Q3ValueVector <QT *> &aVec)
     {
         AssertMsgFailedReturnVoid (("No conversion!\n"));
@@ -251 +251 @@
 
     template <typename T>
-    static void ToSafeArray (const QValueVector <T> &aVec, com::SafeArray <T> &aArr)
+    static void ToSafeArray (const Q3ValueVector <T> &aVec, com::SafeArray <T> &aArr)
     {
         aArr.reset (aVec.size());
         size_t i = 0;
-        for (typename QValueVector <T>::const_iterator it = aVec.begin();
+        for (typename Q3ValueVector <T>::const_iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             aArr [i] = *it;
@@ -261 +261 @@
 
     template <typename T>
-    static void FromSafeArray (const com::SafeArray <T> &aArr, QValueVector <T> &aVec)
-    {
-        aVec = QValueVector <T> (aArr.size());
+    static void FromSafeArray (const com::SafeArray <T> &aArr, Q3ValueVector <T> &aVec)
+    {
+        aVec = Q3ValueVector <T> (aArr.size());
         size_t i = 0;
-        for (typename QValueVector <T>::iterator it = aVec.begin();
+        for (typename Q3ValueVector <T>::iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             *it = aArr [i];
@@ -272 +272 @@
     /* Arrays of strings */
 
-    static void ToSafeArray (const QValueVector <QString> &aVec,
+    static void ToSafeArray (const Q3ValueVector <QString> &aVec,
                              com::SafeArray <BSTR> &aArr);
     static void FromSafeArray (const com::SafeArray <BSTR> &aArr,
-                               QValueVector <QString> &aVec);
+                               Q3ValueVector <QString> &aVec);
 
     /* Arrays of interface pointers. Note: we need a separate pair of names
@@ -287 +287 @@
 
     template <class CI, class I>
-    static void ToSafeIfaceArray (const QValueVector <CI> &aVec,
+    static void ToSafeIfaceArray (const Q3ValueVector <CI> &aVec,
                                   com::SafeIfaceArray <I> &aArr)
     {
         aArr.reset (aVec.size());
         size_t i = 0;
-        for (typename QValueVector <CI>::const_iterator it = aVec.begin();
+        for (typename Q3ValueVector <CI>::const_iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
         {
@@ -303 +303 @@
     template <class I, class CI>
     static void FromSafeIfaceArray (const com::SafeIfaceArray <I> &aArr,
-                                    QValueVector <CI> &aVec)
-    {
-        aVec = QValueVector <CI> (aArr.size());
+                                    Q3ValueVector <CI> &aVec)
+    {
+        aVec = Q3ValueVector <CI> (aArr.size());
         size_t i = 0;
-        for (typename QValueVector <CI>::iterator it = aVec.begin();
+        for (typename Q3ValueVector <CI>::iterator it = aVec.begin();
              it != aVec.end(); ++ it, ++ i)
             (*it).attach (aArr [i]);

trunk/src/VBox/Frontends/VirtualBox4/include/COMWrappers.xsl

@@ -234 +234 @@
       (//param[@safearray='yes' and not(../@internal='yes') and @type=current()/@name])
     ">
-      <xsl:text>typedef QValueVector &lt;C</xsl:text>
+      <xsl:text>typedef Q3ValueVector &lt;C</xsl:text>
       <xsl:value-of select="substring(@name,2)"/>
       <xsl:text>&gt; C</xsl:text>
@@ -1150 +1150 @@
     <xsl:otherwise>
       <xsl:if test="../@safearray">
-        <xsl:text>QValueVector &lt;</xsl:text>
+        <xsl:text>Q3ValueVector &lt;</xsl:text>
       </xsl:if>
       <xsl:choose>
@@ -1551 +1551 @@
           <xsl:if test="(name()='attribute' and $isSetter) or
                         (name()='param' and @dir='in')">
-            <!-- convert QValueVector to SafeArray -->
+            <!-- convert Q3ValueVector to SafeArray -->
             <xsl:choose>
               <!-- interface types need special treatment here -->
@@ -1577 +1577 @@
           <xsl:if test="(name()='attribute' and not($isSetter)) or
                         (name()='param' and (@dir='out' or @dir='return'))">
-            <!-- convert SafeArray to QValueVector -->
+            <!-- convert SafeArray to Q3ValueVector -->
             <xsl:choose>
               <!-- interface types need special treatment here -->

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

@@ -21 +21 @@
 
 #include <qlabel.h>
+//Added by qt3to4:
+#include <QPalette>
+#include <QFocusEvent>
 #if defined(Q_WS_X11)
 #include <qmap.h>
@@ -61 +64 @@
 
 #if defined (Q_WS_PM) || defined (Q_WS_X11)
-    static void languageChange();
+    static void languageChange_qt3();
 #endif
     static QString keyName (int aKeyVal);

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

@@ -21 +21 @@
 
 #include <qdialog.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <QLabel>
 
 class QIRichLabel;
@@ -61 +63 @@
                   Icon aIcon, int aButton0, int aButton1 = 0, int aButton2 = 0,
                   QWidget *aParent = 0, const char *aName = 0, bool aModal = TRUE,
-                  WFlags aFlags = WStyle_DialogBorder);
+                  Qt::WFlags aFlags = Qt::WStyle_DialogBorder);
 
     QString buttonText (int aButton) const;
@@ -100 +102 @@
     QIRichLabel *mTextLabel;
     QPushButton *mButton0PB, *mButton1PB, *mButton2PB;
-    QVBox *mMessageVBox;
+    Q3VBox *mMessageVBox;
     QCheckBox *mFlagCB, *mFlagCB_Main, *mFlagCB_Details;
-    QVBox *mDetailsVBox;
-    QTextEdit *mDetailsText;
+    Q3VBox *mDetailsVBox;
+    Q3TextEdit *mDetailsText;
     QSpacerItem *mSpacer;
 };

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

@@ -24 +24 @@
 #define __QIRichLabel_h__
 
-#include "qframe.h"
+#include "q3frame.h"
+//Added by qt3to4:
+#include <Q3Accel>
+#include <Q3Picture>
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QContextMenuEvent>
+#include <QKeyEvent>
+#include <Q3PopupMenu>
+#include <QFocusEvent>
 
-class QSimpleRichText;
+class Q3SimpleRichText;
 class QLabelPrivate;
 class QAction;
-class QPopupMenu;
+class Q3PopupMenu;
 
-class QIRichLabel : public QFrame
+class QIRichLabel : public Q3Frame
 {
    Q_OBJECT
       Q_PROPERTY( QString text READ text WRITE setText )
-      Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
+      Q_PROPERTY( Qt::TextFormat textFormat READ textFormat WRITE setTextFormat )
       Q_PROPERTY( QPixmap pixmap READ pixmap WRITE setPixmap )
       Q_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents )
-      Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment )
+//      Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment )
       Q_PROPERTY( int indent READ indent WRITE setIndent )
-      Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true )
+      Q_OVERRIDE( Qt::BackgroundMode backgroundMode DESIGNABLE true )
 
 public:
-   QIRichLabel (QWidget *parent, const char* name=0, WFlags f=0);
+   QIRichLabel (QWidget *parent, const char* name=0, Qt::WFlags f=0);
    QIRichLabel (const QString &text, QWidget *parent, const char* name=0,
-              WFlags f=0);
+              Qt::WFlags f=0);
    QIRichLabel (QWidget *buddy, const QString &,
-              QWidget *parent, const char* name=0, WFlags f=0 );
+              QWidget *parent, const char* name=0, Qt::WFlags f=0 );
    ~QIRichLabel();
 
    QString      text()    const   { return ltext; }
    QPixmap     *pixmap()  const   { return lpixmap; }
-   QPicture    *picture() const   { return lpicture; }
+   Q3Picture    *picture() const   { return lpicture; }
    QMovie      *movie()   const;
 
-   TextFormat   textFormat() const;
-   void         setTextFormat( TextFormat );
+   Qt::TextFormat   textFormat() const;
+   void         setTextFormat( Qt::TextFormat );
 
    int          alignment() const  { return align; }
@@ -81 +91 @@
    virtual void setText( const QString &);
    virtual void setPixmap( const QPixmap & );
-   virtual void setPicture( const QPicture & );
+   virtual void setPicture( const Q3Picture & );
    virtual void setMovie( const QMovie & );
    virtual void setNum( int );
@@ -120 +130 @@
    bool        mIsMainTip;
    QPixmap    *lpixmap;
-   QPicture   *lpicture;
+   Q3Picture   *lpicture;
    QMovie     *lmovie;
-   QPopupMenu *popupMenu;
+   Q3PopupMenu *popupMenu;
    QString     popupBuffer;
    QWidget    *lbuddy;
@@ -130 +140 @@
    uint        scaledcontents :1;
    uint        baseheight;
-   TextFormat  textformat;
-   QAccel     *accel;
+   Qt::TextFormat  textformat;
+   Q3Accel     *accel;
    QLabelPrivate *d;
-   QSimpleRichText *doc;
+   Q3SimpleRichText *doc;
    bool        mMaxHeightMode;
 

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

@@ -20 +20 @@
 #define __QIStateIndicator_h__
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qpixmap.h>
 
-#include <qintdict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <QMouseEvent>
+#include <QContextMenuEvent>
 
-class QIStateIndicator : public QFrame
+class QIStateIndicator : public Q3Frame
 {
     Q_OBJECT
@@ -33 +36 @@
     QIStateIndicator (int aState,
                       QWidget *aParent, const char *aName = 0,
-                      WFlags aFlags = 0);
+                      Qt::WFlags aFlags = 0);
 
     virtual QSize sizeHint() const;
@@ -82 +85 @@
     };
 
-    QIntDict <Icon> mStateIcons;
+    Q3IntDict <Icon> mStateIcons;
 };
 

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

@@ -21 +21 @@
 
 #include <qstatusbar.h>
+//Added by qt3to4:
+#include <QPaintEvent>
 
 class QPaintEvent;

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

@@ -24 +24 @@
 #include <qobject.h>
 #include <qvalidator.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 class QIWidgetValidator : public QObject
@@ -74 +74 @@
     };
 
-    QValueList <Watched> mWatched;
+    Q3ValueList <Watched> mWatched;
     Watched mLastInvalid;
 
@@ -87 +87 @@
 
     QIULongValidator (QObject *aParent, const char *aName = 0)
-        : QValidator (aParent, aName)
+        : QValidator (aParent)
         , mBottom (0), mTop (ULONG_MAX) {}
 
     QIULongValidator (ulong aMinimum, ulong aMaximum,
                       QObject *aParent, const char *aName = 0)
-        : QValidator (aParent, aName)
+        : QValidator (aParent)
         , mBottom (aMinimum), mTop (aMaximum) {}
 

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

@@ -21 +21 @@
 
 #include <qstyle.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <Q3PopupMenu>
 
 /**
@@ -46 +49 @@
     virtual void unPolish( QApplication *app );
     virtual void polish( QPalette &p );
-    virtual void polishPopupMenu( QPopupMenu *m );
+    virtual void polishPopupMenu( Q3PopupMenu *m );
     virtual QRect itemRect( QPainter *p, const QRect &r, int flags, bool enabled, const QPixmap *pixmap, 
                             const QString &text, int len = -1 ) const;

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

@@ -26 +26 @@
 
 #include <qdatetime.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qpixmap.h>
 #include <qimage.h>
 
 #include <qkeysequence.h>
+//Added by qt3to4:
+#include <QTimerEvent>
+#include <QPaintEvent>
+#include <QLabel>
+#include <QEvent>
 
 #if defined (Q_WS_PM)
@@ -52 +57 @@
 class QMenuData;
 
-class VBoxConsoleView : public QScrollView
+class VBoxConsoleView : public Q3ScrollView
 {
     Q_OBJECT
@@ -70 +75 @@
                      const CConsole &console,
                      VBoxDefs::RenderMode rm,
-                     QWidget *parent = 0, const char *name = 0, WFlags f = 0);
+                     QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0);
     ~VBoxConsoleView();
 
@@ -144 +149 @@
                    wchar_t *aUniKey = NULL);
     bool mouseEvent (int aType, const QPoint &aPos, const QPoint &aGlobalPos,
-                     ButtonState aButton,
-                     ButtonState aState, ButtonState aStateAfter,
-                     int aWheelDelta, Orientation aWheelDir);
+                     Qt::ButtonState aButton,
+                     Qt::ButtonState aState, Qt::ButtonState aStateAfter,
+                     int aWheelDelta, Qt::Orientation aWheelDir);
 
     void emitKeyboardStateChanged()

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

@@ -22 +22 @@
 #include "COMDefs.h"
 
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 
 #include <qmap.h>
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qcolor.h>
 #include <qdialog.h>
+//Added by qt3to4:
+#include <QContextMenuEvent>
+#include <QLabel>
+#include <Q3PopupMenu>
+#include <QEvent>
+#include <Q3ActionGroup>
+#include <QShowEvent>
+#include <QCloseEvent>
 
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -39 +47 @@
 
 class QAction;
-class QActionGroup;
-class QHBox;
+class Q3ActionGroup;
+class Q3HBox;
 class QLabel;
 class QSpacerItem;
@@ -50 +58 @@
 class VBoxSwitchMenu;
 
-class VBoxConsoleWnd : public QMainWindow
+class VBoxConsoleWnd : public Q3MainWindow
 {
     Q_OBJECT
@@ -58 +66 @@
     VBoxConsoleWnd (VBoxConsoleWnd **aSelf,
                      QWidget* aParent = 0, const char* aName = 0,
-                     WFlags aFlags = WType_TopLevel);
+                     Qt::WFlags aFlags = Qt::WType_TopLevel);
     virtual ~VBoxConsoleWnd();
 
@@ -194 +202 @@
 
     /** Popup version of the main menu */
-    QPopupMenu *mMainMenu;
-
-    QActionGroup *mRunningActions;
-    QActionGroup *mRunningOrPausedActions;
+    Q3PopupMenu *mMainMenu;
+
+    Q3ActionGroup *mRunningActions;
+    Q3ActionGroup *mRunningOrPausedActions;
 
     // Machine actions
@@ -243 +251 @@
 
     // Devices popup menus
-    QPopupMenu *devicesMenu;
-    QPopupMenu *devicesMountFloppyMenu;
-    QPopupMenu *devicesMountDVDMenu;
-    QPopupMenu *devicesSFMenu;
-    QPopupMenu *devicesNetworkMenu;
+    Q3PopupMenu *devicesMenu;
+    Q3PopupMenu *devicesMountFloppyMenu;
+    Q3PopupMenu *devicesMountDVDMenu;
+    Q3PopupMenu *devicesSFMenu;
+    Q3PopupMenu *devicesNetworkMenu;
     VBoxUSBMenu *devicesUSBMenu;
     VBoxSwitchMenu *devicesVRDPMenu;
@@ -266 +274 @@
 #ifdef VBOX_WITH_DEBUGGER_GUI
     // Debugger popup menu
-    QPopupMenu *dbgMenu;
+    Q3PopupMenu *dbgMenu;
 #endif
 
@@ -291 +299 @@
     QIStateIndicator *autoresize_state;
     QIStateIndicator *vrdp_state;
-    QHBox *hostkey_hbox;
+    Q3HBox *hostkey_hbox;
     QLabel *hostkey_name;
 

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

@@ -22 +22 @@
 #include "HappyHttp.h"
 #include "qwidget.h"
-#include "qurl.h"
+#include "q3url.h"
 #include "qmutex.h"
+//Added by qt3to4:
+#include <QEvent>
 class QStatusBar;
 class QAction;
-class QProgressBar;
+class Q3ProgressBar;
 class QToolButton;
 class QThread;
@@ -86 +88 @@
     void abortConnection();
 
-    QUrl mUrl;
+    Q3Url mUrl;
     QString mTarget;
     QStatusBar *mStatusBar;
     QAction *mAction;
-    QProgressBar *mProgressBar;
+    Q3ProgressBar *mProgressBar;
     QToolButton *mCancelButton;
     bool mIsChecking;

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

@@ -21 +21 @@
 
 #include "COMDefs.h"
+//Added by qt3to4:
+#include <QMoveEvent>
+#include <QPaintEvent>
 
 class VBoxConsoleView;

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

@@ -26 +26 @@
 #include <qapplication.h>
 #include <qpixmap.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qcolor.h>
 #include <quuid.h>
 #include <qthread.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qtooltip.h>
 
-#include <qptrvector.h>
-#include <qvaluevector.h>
-#include <qvaluelist.h>
-#include <qdict.h>
-#include <qintdict.h>
+#include <q3ptrvector.h>
+#include <q3valuevector.h>
+#include <q3valuelist.h>
+#include <q3dict.h>
+#include <q3intdict.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QEvent>
 
 class QAction;
@@ -61 +64 @@
 };
 
-typedef QValueList <VBoxMedia> VBoxMediaList;
+typedef Q3ValueList <VBoxMedia> VBoxMediaList;
 
 // VirtualBox callback events
@@ -477 +480 @@
     static void loadLanguage (const QString &aLangId = QString::null);
 
-    static QIconSet iconSet (const char *aNormal,
+    static QIcon iconSet (const char *aNormal,
                              const char *aDisabled = 0,
                              const char *aActive = 0);
-    static QIconSet iconSetEx (const char *aNormal, const char *aSmallNormal,
+    static QIcon iconSetEx (const char *aNormal, const char *aSmallNormal,
                                const char *aDisabled = 0, const char *aSmallDisabled = 0,
                                const char *aActive = 0, const char *aSmallActive = 0);
@@ -615 +618 @@
     CVirtualBoxCallback callback;
 
-    typedef QValueVector <QString> QStringVector;
+    typedef Q3ValueVector <QString> QStringVector;
 
     QString verString;
 
-    QValueVector <CGuestOSType> vm_os_types;
-    QDict <QPixmap> vm_os_type_icons;
-    QPtrVector <QColor> vm_state_color;
-
-    QIntDict <QPixmap> mStateIcons;
+    Q3ValueVector <CGuestOSType> vm_os_types;
+    Q3Dict <QPixmap> vm_os_type_icons;
+    Q3PtrVector <QColor> vm_state_color;
+
+    Q3IntDict <QPixmap> mStateIcons;
     QPixmap mOfflineSnapshotIcon, mOnlineSnapshotIcon;
 
@@ -695 +698 @@
  *  This class provides the list of USB devices attached to the host.
  */
-class VBoxUSBMenu : public QPopupMenu
+class VBoxUSBMenu : public Q3PopupMenu
 {
     Q_OBJECT
@@ -726 +729 @@
  *  This class provides enable/disable menu items.
  */
-class VBoxSwitchMenu : public QPopupMenu
+class VBoxSwitchMenu : public Q3PopupMenu
 {
     Q_OBJECT

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

@@ -23 +23 @@
 
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <QPixmap>
 
-class QListBoxItem;
+class Q3ListBoxItem;
 
 class VBoxMediaComboBox : public QComboBox
@@ -51 +53 @@
     void mediaUpdated (const VBoxMedia &);
     void mediaRemoved (VBoxDefs::DiskType, const QUuid &);
-    void processOnItem (QListBoxItem *);
+    void processOnItem (Q3ListBoxItem *);
     void processActivated (int);
 

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

@@ -23 +23 @@
 #include <qobject.h>
 #include <qthread.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QDataStream>
 typedef happyhttp::Connection HConnect;
 
@@ -36 +39 @@
 
     VBoxNetworkFramework()
-        : mDataStream (mDataArray, IO_ReadWrite)
+        : mDataStream (&mDataArray, QIODevice::ReadWrite)
         , mNetworkThread (0) {}
 

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

@@ -25 +25 @@
 #include <qobject.h>
 
-class QProcess;
+class Q3Process;
 
 class VBoxProblemReporter : public QObject

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

@@ -25 +25 @@
 
 #include <qapplication.h>
-#include <qmainwindow.h>
-#include <qlistbox.h>
-#include <qgroupbox.h>
+#include <q3mainwindow.h>
+#include <q3listbox.h>
+#include <q3groupbox.h>
 #include <qaction.h>
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
+//Added by qt3to4:
+#include <QEvent>
+#include <QLabel>
+#include <Q3PopupMenu>
 
 class VBoxVMListBox;
@@ -39 +43 @@
 
 class QLabel;
-class QTextBrowser;
+class Q3TextBrowser;
 class QTabWidget;
 struct QUuid;
 
-class VBoxSelectorWnd : public QMainWindow
+class VBoxSelectorWnd : public Q3MainWindow
 {
     Q_OBJECT
@@ -51 +55 @@
     VBoxSelectorWnd (VBoxSelectorWnd **aSelf,
                      QWidget* aParent = 0, const char* aName = 0,
-                     WFlags aFlags = WType_TopLevel);
+                     Qt::WFlags aFlags = Qt::WType_TopLevel);
     virtual ~VBoxSelectorWnd();
 
@@ -77 +81 @@
                                           bool aDescription);
 
-    void showContextMenu (QListBoxItem *, const QPoint &);
+    void showContextMenu (Q3ListBoxItem *, const QPoint &);
 
 protected:
@@ -110 +114 @@
 
     /** VM list context menu */
-    QPopupMenu *mVMCtxtMenu;
+    Q3PopupMenu *mVMCtxtMenu;
 
     /* actions */
@@ -137 +141 @@
     VBoxVMDescriptionPage *vmDescriptionPage;
 
-    QValueList <CSession> sessions;
+    Q3ValueList <CSession> sessions;
 
     QPoint normal_pos;

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

@@ -20 +20 @@
 #define __VBoxToolBar_h__
 
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qtoolbutton.h>
-#include <qmainwindow.h>
-#include <qobjectlist.h>
+#include <q3mainwindow.h>
+#include <qobject.h>
+//Added by qt3to4:
+#include <QContextMenuEvent>
 #ifdef Q_WS_MAC
 # include "VBoxAquaStyle.h"
@@ -32 +34 @@
  *  its built-in context menu and add some default behavior we need.
  */
-class VBoxToolBar : public QToolBar
+class VBoxToolBar : public Q3ToolBar
 {
 public:
 
-    VBoxToolBar (QMainWindow *mainWindow, QWidget *parent, const char *name)
-        : QToolBar (QString::null, mainWindow, parent, FALSE, name)
+    VBoxToolBar (Q3MainWindow *mainWindow, QWidget *parent, const char *name)
+        : Q3ToolBar (QString::null, mainWindow, parent, FALSE, name)
     {
         setResizeEnabled (false);
@@ -56 +58 @@
         else
         {
-            QObjectList *list = queryList ("QToolButton");
-            QObjectListIt it (*list);
+            QObjectList list = queryList ("QToolButton");
             QObject *obj;
-            while ((obj = it.current()) != 0)
+            foreach(obj, list)
             {
-                QToolButton *btn = ::qt_cast <QToolButton *> (obj);
+                QToolButton *btn = qobject_cast<QToolButton *> (obj);
                 btn->setUsesBigPixmap (enable);
-                ++ it;
             }
-            delete list;
         }
     }
@@ -75 +74 @@
         else
         {
-            QObjectList *list = queryList ("QToolButton");
-            QObjectListIt it (*list);
+            QObjectList list = queryList ("QToolButton");
             QObject *obj;
-            while ((obj = it.current()) != 0)
+            foreach(obj, list)
             {
-                QToolButton *btn = ::qt_cast <QToolButton *> (obj);
+                QToolButton *btn = qobject_cast<QToolButton *> (obj);
                 btn->setUsesTextLabel (enable);
-                ++ it;
             }
-            delete list;
         }
     }

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

@@ -22 +22 @@
 #include <qobject.h>
 #include <qevent.h>
-#include <qlistview.h>
-#include <qtextedit.h>
+#include <q3listview.h>
+#include <q3textedit.h>
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QResizeEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
 
 /**
@@ -36 +41 @@
 public:
 
-    QIListViewSelectionPreserver (QObject *parent, QListView *alv)
+    QIListViewSelectionPreserver (QObject *parent, Q3ListView *alv)
         : QObject (parent), lv (alv)
     {
@@ -60 +65 @@
 private:
 
-    QListView *lv;
+    Q3ListView *lv;
 };
 
@@ -72 +77 @@
 public:
 
-    QIKeyFilter (QObject *aParent, Key aKey) : QObject (aParent), mKey (aKey) {}
+    QIKeyFilter (QObject *aParent, Qt::Key aKey) : QObject (aParent), mKey (aKey) {}
 
     void watchOn (QObject *o) { o->installEventFilter (this); }
@@ -94 +99 @@
     }
 
-    Key mKey;
+    Qt::Key mKey;
 };
 
@@ -171 +176 @@
  *  for getting more compact layout.
  */
-class QITextEdit : public QTextEdit
+class QITextEdit : public Q3TextEdit
 {
     Q_OBJECT
@@ -178 +183 @@
 
     QITextEdit (QWidget *aParent)
-        : QTextEdit (aParent) {}
+        : Q3TextEdit (aParent) {}
 
     QSize sizeHint() const
@@ -210 +215 @@
                                     0, 0,
                                     sizePolicy().hasHeightForWidth()));
-        setAlignment (int (QLabel::WordBreak | QLabel::AlignTop));
+        setAlignment (int (Qt::AlignTop));
         /* install show-parent-widget watcher */
         aParent->topLevelWidget()->installEventFilter (this);

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

@@ -25 +25 @@
 #include "VBoxGlobal.h"
 
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qfont.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <QFocusEvent>
 
 struct QUuid;
@@ -43 +45 @@
  *  class.
  */
-class VBoxVMListBox : public QListBox
+class VBoxVMListBox : public Q3ListBox
 {
     Q_OBJECT
@@ -50 +52 @@
 
     VBoxVMListBox (QWidget *aParent = 0, const char *aName = NULL,
-                   WFlags aFlags = 0);
+                   Qt::WFlags aFlags = 0);
 
     virtual ~VBoxVMListBox();
@@ -97 +99 @@
  *  get an access to various VM data.
  */
-class VBoxVMListBoxItem : public QListBoxItem
+class VBoxVMListBoxItem : public Q3ListBoxItem
 {
 public:
@@ -118 +120 @@
     QString toolTipText() const;
 
-    int height (const QListBox *) const;
-    int width (const QListBox *) const;
+    int height (const Q3ListBox *) const;
+    int width (const Q3ListBox *) const;
 
     QUuid id() const { return mId; }

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

@@ -183 +183 @@
 
 /* static */
-void COMBase::ToSafeArray (const QValueVector <QString> &aVec,
+void COMBase::ToSafeArray (const Q3ValueVector <QString> &aVec,
                            com::SafeArray <BSTR> &aArr)
 {
     aArr.reset (aVec.size());
     size_t i = 0;
-    for (QValueVector <QString>::const_iterator it = aVec.begin();
+    for (Q3ValueVector <QString>::const_iterator it = aVec.begin();
          it != aVec.end(); ++ it, ++ i)
         aArr [i] = SysAllocString ((const OLECHAR *) (*it).ucs2());
@@ -195 +195 @@
 /* static */
 void COMBase::FromSafeArray (const com::SafeArray <BSTR> &aArr,
-                             QValueVector <QString> &aVec)
-{
-    aVec = QValueVector <QString> (aArr.size());
+                             Q3ValueVector <QString> &aVec)
+{
+    aVec = Q3ValueVector <QString> (aArr.size());
     size_t i = 0;
-    for (QValueVector <QString>::iterator it = aVec.begin();
+    for (Q3ValueVector <QString>::iterator it = aVec.begin();
          it != aVec.end(); ++ it, ++ i)
         *it = QString::fromUcs2 (aArr [i]);

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

@@ -18 +18 @@
 
 #include "QIHotKeyEdit.h"
+//Added by qt3to4:
+#include <QLabel>
+#include <QFocusEvent>
 
 #include "VBoxDefs.h"
@@ -114 +117 @@
     clear();
 
-    setFrameStyle (LineEditPanel | Sunken);
-    setAlignment (AlignHCenter | AlignBottom);
-    setFocusPolicy (StrongFocus);
+    setFrameStyle (QFrame::StyledPanel | Sunken);
+    setAlignment (Qt::AlignHCenter | Qt::AlignBottom);
+    setFocusPolicy (Qt::StrongFocus);
 
     QPalette p = palette();
@@ -203 +206 @@
     int w = fm.width( 'x' ) * 17; // "some"
     int m = frameWidth() * 2;
-    return (style().sizeFromContents (QStyle::CT_LineEdit, this,
-                                      QSize (w + m, h + m)
-                                      .expandedTo(QApplication::globalStrut())));
+#warning port me
+//    return (style()->sizeFromContents (QStyle::CT_LineEdit, this,
+//                                      QSize (w + m, h + m)
+//                                      .expandedTo(QApplication::globalStrut())));
+    QSize(10,10);
 }
 
@@ -278 +283 @@
  */
 /* static */
-void QIHotKeyEdit::languageChange()
+void QIHotKeyEdit::languageChange_qt3()
 {
     /* Note: strings for the same key must match strings in languageChange()
@@ -333 +338 @@
  */
 /* static */
-void QIHotKeyEdit::languageChange()
+void QIHotKeyEdit::languageChange_qt3()
 {
     /* Note: strings for the same key must match strings in languageChange()
@@ -726 +731 @@
 void QIHotKeyEdit::drawContents (QPainter * p)
 {
-    QLabel::drawContents (p);
-    if (hasFocus())
-    {
-        style().drawPrimitive (
-            QStyle::PE_FocusRect, p, contentsRect(), colorGroup(),
-            QStyle::Style_Default,
-            QStyleOption( colorGroup().background()));
-    }
+#warning port me
+//    QLabel::drawContents (p);
+//    if (hasFocus())
+//    {
+//        style().drawPrimitive (
+//            QStyle::PE_FocusRect, p, contentsRect(), colorGroup(),
+//            QStyle::State_None,
+//            QStyleOption( colorGroup().background()));
+//    }
 }
 

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

@@ -18 +18 @@
 
 #include "QIMessageBox.h"
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <q3mimefactory.h>
+#include <Q3VBoxLayout>
 #include "VBoxDefs.h"
 #include "QIRichLabel.h"
@@ -24 +28 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlayout.h>
 
@@ -45 +49 @@
                             Icon aIcon, int aButton0, int aButton1, int aButton2,
                             QWidget *aParent, const char *aName, bool aModal,
-                            WFlags aFlags)
+                            Qt::WFlags aFlags)
     : QDialog (aParent, aName, aModal,
-               aFlags | WStyle_Customize | WStyle_NormalBorder |
-                        WStyle_Title | WStyle_SysMenu)
+               aFlags | Qt::WStyle_Customize | Qt::WStyle_NormalBorder |
+                        Qt::WStyle_Title | Qt::WStyle_SysMenu)
 {
     setCaption (aCaption);
@@ -56 +60 @@
     mButton2 = aButton2;
 
-    QVBoxLayout *layout = new QVBoxLayout (this);
+    Q3VBoxLayout *layout = new Q3VBoxLayout (this);
     /* setAutoAdd() behavior is really poor (it messes up with the order
      * of widgets), never use it: layout->setAutoAdd (true); */
     layout->setMargin (11);
     layout->setSpacing (10);
-    layout->setResizeMode (QLayout::Minimum);
-
-    QHBox *main = new QHBox (this);
+    layout->setResizeMode (QLayout::SetMinimumSize);
+
+    Q3HBox *main = new Q3HBox (this);
     main->setMargin (0);
     main->setSpacing (10);
@@ -72 +76 @@
         mIconLabel->setPixmap (QMessageBox::standardIcon ((QMessageBox::Icon) aIcon));
     else if (aIcon == GuruMeditation)
-        mIconLabel->setPixmap (QPixmap::fromMimeSource ("meditation_32px.png"));
+        mIconLabel->setPixmap (qPixmapFromMimeSource ("meditation_32px.png"));
     mIconLabel->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
-    mIconLabel->setAlignment (AlignHCenter | AlignTop);
-
-    mMessageVBox = new QVBox (main);
+    mIconLabel->setAlignment (Qt::AlignHCenter | Qt::AlignTop);
+
+    mMessageVBox = new Q3VBox (main);
     mMessageVBox->setMargin (0);
     mMessageVBox->setSpacing (10);
 
     mTextLabel = new QIRichLabel (aText, mMessageVBox);
-    mTextLabel->setAlignment (AlignAuto | AlignTop | ExpandTabs | WordBreak);
+    mTextLabel->setAlignment (Qt::AlignLeft | Qt::AlignTop | Qt::TextExpandTabs | Qt::TextWordWrap);
     mTextLabel->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Preferred, true);
     mTextLabel->setMinimumWidth (mTextLabel->sizeHint().width());
@@ -88 +92 @@
     mFlagCB_Main->hide();
 
-    mDetailsVBox = new QVBox (this);
+    mDetailsVBox = new Q3VBox (this);
     mDetailsVBox->setMargin (0);
     mDetailsVBox->setSpacing (10);
     layout->addWidget (mDetailsVBox);
 
-    mDetailsText = new QTextEdit (mDetailsVBox);
+    mDetailsText = new Q3TextEdit (mDetailsVBox);
     {
         /* calculate the minimum size dynamically, approx. for 40 chars and
@@ -101 +105 @@
     }
     mDetailsText->setReadOnly (true);
-    mDetailsText->setWrapPolicy (QTextEdit::AtWordOrDocumentBoundary);
+    mDetailsText->setWrapPolicy (Q3TextEdit::AtWordOrDocumentBoundary);
     mDetailsText->setSizePolicy (QSizePolicy::Expanding,
                                  QSizePolicy::MinimumExpanding);
@@ -111 +115 @@
     layout->addItem (mSpacer);
 
-    QHBoxLayout *buttons = new QHBoxLayout (new QWidget (this));
+    Q3HBoxLayout *buttons = new Q3HBoxLayout (new QWidget (this));
     layout->addWidget (buttons->mainWidget());
     buttons->setAutoAdd (true);
@@ -128 +132 @@
         connect (mButton2PB, SIGNAL (clicked()), SLOT (done2()));
 
-    buttons->setAlignment (AlignHCenter);
+    buttons->setAlignment (Qt::AlignHCenter);
 
     /* this call is a must -- it initializes mFlagCB and mSpacer */

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

@@ -24 +24 @@
 
 #include <qpainter.h>
-#include <qaccel.h>
+#include <q3accel.h>
 #include <qmovie.h>
 #include <qimage.h>
-#include <qpicture.h>
+#include <q3picture.h>
 #include <qapplication.h>
-#include <qsimplerichtext.h>
-#include <qstylesheet.h>
+#include <q3simplerichtext.h>
+#include <q3stylesheet.h>
 #include <qstyle.h>
 #include <qregexp.h>
-#include <qfocusdata.h>
+//#include <qfocusdata.h>
 #include <qtooltip.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qaction.h>
 #include <qclipboard.h>
 #include <qcursor.h>
+//Added by qt3to4:
+#include <QContextMenuEvent>
+#include <QKeyEvent>
+#include <QPixmap>
+#include <QBitmap>
+#include <Q3Frame>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
 
 class QLabelPrivate
@@ -54 +63 @@
 
 
-QIRichLabel::QIRichLabel (QWidget *parent, const char *name, WFlags f)
-: QFrame (parent, name, f | WMouseNoMask)
+QIRichLabel::QIRichLabel (QWidget *parent, const char *name, Qt::WFlags f)
+: Q3Frame (parent, name, f | Qt::WMouseNoMask)
 {
    init();
@@ -62 +71 @@
 
 QIRichLabel::QIRichLabel (const QString &text, QWidget *parent, const char *name,
-                          WFlags f)
-                          : QFrame (parent, name, f | WMouseNoMask)
+                          Qt::WFlags f)
+                          : Q3Frame (parent, name, f | Qt::WMouseNoMask)
 {
    init();
@@ -71 +80 @@
 
 QIRichLabel::QIRichLabel (QWidget *buddy,  const QString &text,
-                          QWidget *parent, const char *name, WFlags f)
-                          : QFrame (parent, name, f | WMouseNoMask)
+                          QWidget *parent, const char *name, Qt::WFlags f)
+                          : Q3Frame (parent, name, f | Qt::WMouseNoMask)
 {
    init();
@@ -98 +107 @@
    lpixmap = 0;
    lpicture = 0;
-   align = AlignAuto | AlignVCenter | ExpandTabs;
+   align = Qt::AlignLeft | Qt::AlignVCenter | Qt::TextExpandTabs;
    extraMargin = -1;
    autoresize = FALSE;
@@ -112 +121 @@
    copyAction->setMenuText (tr ("Copy to clipboard"));
 
-   popupMenu = new QPopupMenu (this, "contextMenu");
+   popupMenu = new Q3PopupMenu (this, "contextMenu");
    copyAction->addTo (popupMenu);
 
@@ -122 +131 @@
 {
     baseheight = aHeight;
-    QFrame::setFixedHeight (baseheight);
+    Q3Frame::setFixedHeight (baseheight);
 }
 
@@ -136 +145 @@
    ltext = text;
 
-   bool useRichText = (textformat == RichText ||
-      ((textformat == AutoText) && QStyleSheet::mightBeRichText (ltext)));
+   bool useRichText = (textformat == Qt::RichText ||
+      ((textformat == Qt::AutoText) && Q3StyleSheet::mightBeRichText (ltext)));
 
    // ### Setting accelerators for rich text labels will not work.
@@ -143 +152 @@
    // not intended.
    if (!useRichText) {
-      int p = QAccel::shortcutKey (ltext);
+      int p = Q3Accel::shortcutKey (ltext);
       if (p) {
          if (!accel)
-            accel = new QAccel (this, "accel label accel");
+            accel = new Q3Accel (this, "accel label accel");
          accel->connectItem (accel->insertItem (p),
             this, SLOT (acceleratorSlot()));
@@ -154 +163 @@
    if (useRichText) {
       if (!hadRichtext)
-         align |= WordBreak;
+         align |= Qt::TextWordWrap;
       QString t = ltext;
-      if (align & AlignRight)
+      if (align & Qt::AlignRight)
          t.prepend ("<div align=\"right\">");
-      else if (align & AlignHCenter)
+      else if (align & Qt::AlignHCenter)
          t.prepend ("<div align=\"center\">");
-      if ((align & WordBreak) == 0)
+      if ((align & Qt::TextWordWrap) == 0)
          t.prepend ("<nobr>");
-      doc = new QSimpleRichText (compressText(0), font());
+      doc = new Q3SimpleRichText (compressText(0), font());
    }
 
@@ -170 +179 @@
    {
        baseheight = heightForWidth (width());
-       QFrame::setFixedHeight (baseheight);
+       Q3Frame::setFixedHeight (baseheight);
    }
 }
@@ -197 +206 @@
 
 
-void QIRichLabel::setPicture (const QPicture &picture)
+void QIRichLabel::setPicture (const Q3Picture &picture)
 {
    QSize osh = sizeHint();
    clearContents();
-   lpicture = new QPicture (picture);
+   lpicture = new Q3Picture (picture);
 
    updateLabel (osh);
@@ -230 +239 @@
 
    if (lbuddy)
-      align = alignment | ShowPrefix;
+      align = alignment | Qt::TextShowMnemonic;
    else
       align = alignment;
@@ -271 +280 @@
    QRect br;
    QPixmap *pix = pixmap();
-   QPicture *pic = picture();
+   Q3Picture *pic = picture();
    QMovie *mov = movie();
 
@@ -283 +292 @@
          m = xw / 2 - margin();
       if (m >= 0) {
-         int horizAlign = QApplication::horizontalAlignment( align );
-         if ((horizAlign & AlignLeft) || (horizAlign & AlignRight))
+          Qt::Alignment horizAlign = QApplication::horizontalAlignment( (Qt::Alignment)align );
+         if ((horizAlign & Qt::AlignLeft) || (horizAlign & Qt::AlignRight))
             hextra += m;
-         if ((align & AlignTop) || (align & AlignBottom))
+         if ((align & Qt::AlignTop) || (align & Qt::AlignBottom))
             vextra += m;
       }
@@ -299 +308 @@
    else if (doc) {
       int oldW = doc->width();
-      if ( align & WordBreak ) {
+      if ( align & Qt::TextWordWrap ) {
          if (w < 0)
             doc->adjustSize();
@@ -309 +318 @@
    }
    else {
-      bool tryWidth = (w < 0) && (align & WordBreak);
+      bool tryWidth = (w < 0) && (align & Qt::TextWordWrap);
       if (tryWidth)
          w = xw * 80;
@@ -332 +341 @@
    if (
       doc ||
-      (align & WordBreak))
+      (align & Qt::TextWordWrap))
       return sizeForWidth (w).height();
    return QWidget::heightForWidth(w);
@@ -358 +367 @@
    if (
       !doc &&
-      (align & WordBreak) == 0) {
+      (align & Qt::TextWordWrap) == 0) {
       sz = d->sh;
    } else {
@@ -385 +394 @@
         if (mIsMainTip)
         {
-            mTipText = QToolTip::textFor (this);
+#warning port me
+//            mTipText = QToolTip::textFor (this);
             QToolTip::remove (this);
             QToolTip::add (this, link);
@@ -411 +421 @@
     QString link = doc->anchorAt (aEvent->pos());
     /* Check for mouse left button clicked on the link */
-    if (!link.isEmpty() && aEvent->button() == LeftButton)
+    if (!link.isEmpty() && aEvent->button() == Qt::LeftButton)
         emit clickedOnLink (link);
 }
@@ -418 +428 @@
 void QIRichLabel::resizeEvent (QResizeEvent *e)
 {
-   QFrame::resizeEvent (e);
+   Q3Frame::resizeEvent (e);
 
    static const bool doc = FALSE;
 
    // optimize for standard labels
-   if (frameShape() == NoFrame && (align & WordBreak) == 0 && !doc &&
-       (e->oldSize().width() >= e->size().width() && (align & AlignLeft) == AlignLeft)
-       && (e->oldSize().height() >= e->size().height() && (align & AlignTop) == AlignTop)) {
-      setWFlags (WResizeNoErase);
+   if (frameShape() == NoFrame && (align & Qt::TextWordWrap) == 0 && !doc &&
+       (e->oldSize().width() >= e->size().width() && (align & Qt::AlignLeft) == Qt::AlignLeft)
+       && (e->oldSize().height() >= e->size().height() && (align & Qt::AlignTop) == Qt::AlignTop)) {
+#warning port me
+//      setWFlags (Qt::WResizeNoErase);
       return;
    }
 
-   clearWFlags (WResizeNoErase);
+#warning port me
+//   clearWFlags (Qt::WResizeNoErase);
    QRect cr = contentsRect();
    if ( !lpixmap ||  !cr.isValid() ||
       // masked pixmaps can only reduce flicker when being top/left
       // aligned and when we do not perform scaled contents
-      (lpixmap->hasAlpha() && (scaledcontents || ((align & (AlignLeft|AlignTop)) != (AlignLeft|AlignTop)))))
+      (lpixmap->hasAlpha() && (scaledcontents || ((align & (Qt::AlignLeft|Qt::AlignTop)) != (Qt::AlignLeft|Qt::AlignTop)))))
       return;
 
-   setWFlags (WResizeNoErase);
+#warning port me
+//   setWFlags (Qt::WResizeNoErase);
 
    if (!scaledcontents) {
@@ -473 +486 @@
 void QIRichLabel::focusInEvent (QFocusEvent *aEvent)
 {
-   QFrame::focusInEvent (aEvent);
+   Q3Frame::focusInEvent (aEvent);
    repaint();
 }
@@ -480 +493 @@
 void QIRichLabel::keyPressEvent (QKeyEvent *aEvent)
 {
-   switch (aEvent->key())
-   {
-   case Qt::Key_Up:
-      focusData()->home();
-      focusData()->prev()->setFocus();
-      break;
-   case Qt::Key_Down:
-      focusData()->home();
-      focusData()->next()->setFocus();
-      break;
-   default:
-      aEvent->ignore();
-   }
+#warning port me
+//   switch (aEvent->key())
+//   {
+//   case Qt::Key_Up:
+//      focusData()->home();
+//      focusData()->prev()->setFocus();
+//      break;
+//   case Qt::Key_Down:
+//      focusData()->home();
+//      focusData()->next()->setFocus();
+//      break;
+//   default:
+//      aEvent->ignore();
+//   }
 }
 
@@ -578 +592 @@
 
    QPixmap *pix = pixmap();
-   QPicture *pic = picture();
+   Q3Picture *pic = picture();
    QMovie *mov = movie();
 
@@ -586 +600 @@
          m = fontMetrics().width ('x') / 2 - margin();
       if (m > 0) {
-         int hAlign = QApplication::horizontalAlignment (align);
-         if (hAlign & AlignLeft)
+         int hAlign = QApplication::horizontalAlignment ((Qt::Alignment)align);
+         if (hAlign & Qt::AlignLeft)
             cr.setLeft (cr.left() + m);
-         if (hAlign & AlignRight)
+         if (hAlign & Qt::AlignRight)
             cr.setRight (cr.right() - m);
-         if (align & AlignTop)
+         if (align & Qt::AlignTop)
             cr.setTop (cr.top() + m);
-         if (align & AlignBottom)
+         if (align & Qt::AlignBottom)
             cr.setBottom (cr.bottom() - m);
       }
@@ -599 +613 @@
 
    if (mov) {
+#warning port me
       // ### should add movie to qDrawItem
-      QRect r = style().itemRect (p, cr, align, isEnabled(), &(mov->framePixmap()),
-         QString::null);
+//      QRect r = style()->itemRect (p, cr, align, isEnabled(), &(mov->framePixmap()),
+//         QString::null);
       // ### could resize movie frame at this point
-      p->drawPixmap (r.x(), r.y(), mov->framePixmap());
+//      p->drawPixmap (r.x(), r.y(), mov->framePixmap());
    }
    else
@@ -610 +625 @@
          QToolTip::remove (this);
          QString filteredText = compressText();
-         doc = new QSimpleRichText (filteredText, font());
+         doc = new Q3SimpleRichText (filteredText, font());
          /* focus indent */
          doc->setWidth (p, cr.width() - 2*3);
          int rh = doc->height();
          int yo = 0;
-         if (align & AlignVCenter)
+         if (align & Qt::AlignVCenter)
             yo = (cr.height()-rh)/2;
-         else if (align & AlignBottom)
+         else if (align & Qt::AlignBottom)
             yo = cr.height()-rh;
-         if (! isEnabled() &&
-            style().styleHint (QStyle::SH_EtchDisabledText, this)) {
-            QColorGroup cg = colorGroup();
-            cg.setColor (QColorGroup::Text, cg.light());
-            doc->draw (p, cr.x()+1, cr.y()+yo+1, cr, cg, 0);
-         }
+#warning port me
+//         if (! isEnabled() &&
+//            style().styleHint (QStyle::SH_EtchDisabledText, this)) {
+//            QColorGroup cg = colorGroup();
+//            cg.setColor (QColorGroup::Text, cg.light());
+//            doc->draw (p, cr.x()+1, cr.y()+yo+1, cr, cg, 0);
+//         }
 
          // QSimpleRichText always draws with QColorGroup::Text as with
@@ -640 +656 @@
                   standartGroup.color (QColorGroup::HighlightedText));
                paper.setColor (standartGroup.color (QColorGroup::Highlight));
-               paper.setStyle (QBrush::SolidPattern);
+               paper.setStyle (Qt::SolidPattern);
             }
             else
@@ -647 +663 @@
 
          doc->draw (p, cr.x()+3, cr.y()+yo, cr, cg, &paper);
-         if (hasFocus())
-            style().drawPrimitive (QStyle::PE_FocusRect, p, cr, cg,
-            QStyle::Style_FocusAtBorder,
-            cg.highlight());
+#warning port me
+//         if (hasFocus())
+//            style().drawPrimitive (QStyle::PE_FocusRect, p, cr, cg,
+//            QStyle::State_FocusAtBorder,
+//            cg.highlight());
 
          if (filteredText != ltext)
@@ -668 +685 @@
                int xo = 0;
                int yo = 0;
-               if (align & AlignVCenter)
+               if (align & Qt::AlignVCenter)
                   yo = (cr.height()-rh)/2;
-               else if (align & AlignBottom)
+               else if (align & Qt::AlignBottom)
                   yo = cr.height()-rh;
-               if (align & AlignRight)
+               if (align & Qt::AlignRight)
                   xo = cr.width()-rw;
-               else if (align & AlignHCenter)
+               else if (align & Qt::AlignHCenter)
                   xo = (cr.width()-rw)/2;
                p->drawPicture (cr.x()+xo-br.x(), cr.y()+yo-br.y(), *pic);
@@ -691 +708 @@
             }
             int alignment = align;
-            if ((align & ShowPrefix) && !style().styleHint(QStyle::SH_UnderlineAccelerator, this))
-               alignment |= NoAccel;
+#warning port me
+//            if ((align & Qt::TextShowMnemonic) && !style().styleHint(QStyle::SH_UnderlineShortcut, this))
+//               alignment |= Qt::TextHideMnemonic;
             // ordinary text or pixmap label
-            style().drawItem ( p, cr, alignment, colorGroup(), isEnabled(),
-               pix, ltext );
+//            style().drawItem ( p, cr, alignment, colorGroup(), isEnabled(),
+//               pix, ltext );
          }
 }
@@ -704 +722 @@
    d->valid_hints = -1;
    QSizePolicy policy = sizePolicy();
-   bool wordBreak = align & WordBreak;
+   bool wordBreak = align & Qt::TextWordWrap;
    policy.setHeightForWidth (wordBreak);
    if (policy != sizePolicy())
@@ -729 +747 @@
        w->isEnabled() &&
        w->isVisible() &&
-       w->focusPolicy() != NoFocus) {
-      QFocusEvent::setReason (QFocusEvent::Shortcut);
+       w->focusPolicy() != Qt::NoFocus) {
+#warning port me
+//      QFocusEvent::setReason (QFocusEvent::Shortcut);
       w->setFocus();
-      QFocusEvent::resetReason();
+#warning port me
+//      QFocusEvent::resetReason();
    }
 }
@@ -746 +766 @@
 {
    if (buddy)
-      setAlignment (alignment() | ShowPrefix);
+      setAlignment (alignment() | Qt::TextShowMnemonic);
    else
-      setAlignment (alignment() & ~ShowPrefix);
+      setAlignment (alignment() & ~Qt::TextShowMnemonic);
 
    if (lbuddy)
@@ -758 +778 @@
       return;
 
-   if (!( textformat == RichText || (textformat == AutoText &&
-      QStyleSheet::mightBeRichText(ltext))))
+   if (!( textformat == Qt::RichText || (textformat == Qt::AutoText &&
+      Q3StyleSheet::mightBeRichText(ltext))))
    {
-      int p = QAccel::shortcutKey (ltext);
+      int p = Q3Accel::shortcutKey (ltext);
       if (p) {
          if (!accel)
-            accel = new QAccel (this, "accel label accel");
+            accel = new Q3Accel (this, "accel label accel");
          accel->connectItem (accel->insertItem (p),
             this, SLOT (acceleratorSlot()));
@@ -785 +805 @@
    if (mov && !mov->isNull()) {
       QRect r = contentsRect();
-      r = style().itemRect (0, r, align, isEnabled(), &(mov->framePixmap()),
-         QString::null);
+#warning port me
+//      r = style().itemRect (0, r, align, isEnabled(), &(mov->framePixmap()),
+//         QString::null);
       r.moveBy (rect.x(), rect.y());
       r.setWidth (QMIN (r.width(), rect.width()));
       r.setHeight (QMIN (r.height(), rect.height()));
-      repaint (r, mov->framePixmap().mask() != 0);
+#warning port me
+//      repaint (r, mov->framePixmap().mask() != 0);
    }
 }
@@ -807 +829 @@
 void QIRichLabel::setMovie (const QMovie &movie)
 {
-   QSize osh = sizeHint();
-   clearContents();
-
-   lmovie = new QMovie (movie);
-   lmovie->connectResize (this, SLOT (movieResized (const QSize&)));
-   lmovie->connectUpdate (this, SLOT (movieUpdated (const QRect&)));
-
-   if (!lmovie->running())   // Assume that if the movie is running,
-      updateLabel (osh); // resize/update signals will come soon enough
+#warning port me
+//   QSize osh = sizeHint();
+//   clearContents();
+//
+//   lmovie = new QMovie (movie);
+//   lmovie->connectResize (this, SLOT (movieResized (const QSize&)));
+//   lmovie->connectUpdate (this, SLOT (movieUpdated (const QRect&)));
+//
+//   if (!lmovie->running())   // Assume that if the movie is running,
+//      updateLabel (osh); // resize/update signals will come soon enough
 }
 
@@ -842 +865 @@
 
    if (lmovie) {
-      lmovie->disconnectResize (this, SLOT (movieResized (const QSize&)));
-      lmovie->disconnectUpdate (this, SLOT (movieUpdated (const QRect&)));
+#warning port me
+//      lmovie->disconnectResize (this, SLOT (movieResized (const QSize&)));
+//      lmovie->disconnectUpdate (this, SLOT (movieUpdated (const QRect&)));
       delete lmovie;
       lmovie = 0;
@@ -908 +932 @@
 void QIRichLabel::setFont (const QFont &f)
 {
-   QFrame::setFont (f);
-}
+   Q3Frame::setFont (f);
+}

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

@@ -20 +20 @@
 
 #include <qpainter.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <Q3Frame>
+#include <QContextMenuEvent>
 
 /** @clas QIStateIndicator
@@ -36 +41 @@
 QIStateIndicator::QIStateIndicator (int aState,
                                     QWidget *aParent, const char *aName,
-                                    WFlags aFlags)
-    : QFrame (aParent, aName, aFlags | WStaticContents | WMouseNoMask)
+                                    Qt::WFlags aFlags)
+    : Q3Frame (aParent, aName, aFlags | Qt::WStaticContents | Qt::WMouseNoMask)
 {
     mState = aState;
@@ -99 +104 @@
     else
     {
-        if (testWFlags (WNoAutoErase))
+//        if (testAttribute (Qt::WNoAutoErase))
+#warning port me
+        if(0)
         {
             QColor bgColor = paletteBackgroundColor();
@@ -130 +137 @@
                 }
                 /* paint the icon on top of the widget background sample */
-                bitBlt (&icon->cached, 0, 0, &icon->pixmap,
-                        0, 0, w, h, CopyROP, false);
+#warning port me
+//                bitBlt (&icon->cached, 0, 0, &icon->pixmap,
+//                        0, 0, w, h, CopyROP, false);
                 /* store the new values */
                 icon->bgColor = bgColor;
@@ -159 +167 @@
         aEv->accept();
     else
-        QFrame::mousePressEvent (aEv);
+        Q3Frame::mousePressEvent (aEv);
 }
 #endif /* Q_WS_MAC */

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

@@ -21 +21 @@
 #include <qpainter.h>
 #include <qsizegrip.h>
+//Added by qt3to4:
+#include <QPaintEvent>
 
 /** @clas QIStatusLine
@@ -57 +59 @@
     if (!message.isEmpty()) {
         p.setPen (colorGroup().foreground());
-        p.drawText (6, 0, psx, height(), AlignVCenter | SingleLine, message);
+        p.drawText (6, 0, psx, height(), Qt::AlignVCenter | Qt::TextSingleLine, message);
     }
 }

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

@@ -19 +19 @@
 #include "QIWidgetValidator.h"
 
-#include <qobjectlist.h>
+#include <qobject.h>
 #include <qlineedit.h>
 #include <qcombobox.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 #include <iprt/assert.h>
@@ -152 +154 @@
     QValidator::State state = QValidator::Acceptable;
 
-    for (QValueList <Watched>::ConstIterator it = mWatched.begin();
+    for (Q3ValueList <Watched>::ConstIterator it = mWatched.begin();
          it != mWatched.end(); ++ it)
     {
@@ -212 +214 @@
     Watched watched;
 
-    QObjectList *list = mWidget->queryList();
+    QObjectList list = mWidget->queryList();
     QObject *obj;
 
     /* detect all widgets that support validation */
-    QObjectListIterator it (*list);
-    while ((obj = it.current()) != 0)
+    QListIterator<QObject*> it (list);
+    while (it.hasNext())
     {
-        ++ it;
+        obj = it.next();
         if (obj->inherits ("QLineEdit"))
         {
@@ -247 +249 @@
         /* try to find a buddy widget in order to determine the title for
          * the watched widget which is used in the warning text */
-        QObjectListIterator it2 (*list);
-        while ((obj = it2.current()) != 0)
-        {
-            ++ it2;
+        QListIterator<QObject*> it2 (list);
+        while (it2.hasNext())
+        {
+            obj = it2.next();
             if (obj->inherits ("QLabel"))
             {
@@ -265 +267 @@
         mWatched << watched;
     }
-
-    /* don't forget to delete the list */
-    delete list;
 }
 

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

@@ -41 +41 @@
 #include <qmenudata.h>
 #include <qmenubar.h>
-#include <qwidgetlist.h>
+#include <qwidget.h>
 #include <qtimer.h>
+//Added by qt3to4:
+#include <QDesktopWidget>
+#include <QTimerEvent>
+#include <QMoveEvent>
+#include <QWheelEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <QPaintEvent>
 
 #ifdef Q_WS_WIN
@@ -54 +63 @@
 
 #ifdef Q_WS_X11
+#include <QX11Info>
 // We need to capture some X11 events directly which
 // requires the XEvent structure to be defined. However,
@@ -594 +604 @@
                                   const CConsole &console,
                                   VBoxDefs::RenderMode rm,
-                                  QWidget *parent, const char *name, WFlags f)
-    : QScrollView (parent, name, f | WStaticContents | WNoAutoErase)
+                                  QWidget *parent, const char *name, Qt::WFlags f)
+    : Q3ScrollView (parent, name, f | Qt::WStaticContents | Qt::WNoAutoErase)
     , mMainWnd (mainWnd)
     , mConsole (console)
@@ -746 +756 @@
     AssertWrapperOk (mConsole);
 
-    viewport()->setEraseColor (black);
+    viewport()->setEraseColor (Qt::black);
 
     setSizePolicy (QSizePolicy (QSizePolicy::Maximum, QSizePolicy::Maximum));
     setMaximumSize (sizeHint());
 
-    setFocusPolicy (WheelFocus);
+    setFocusPolicy (Qt::WheelFocus);
 
 #if defined (VBOX_GUI_DEBUG) && defined (VBOX_GUI_FRAMEBUF_STAT)
@@ -970 +980 @@
      * no the required API. */
     if (enabled)
-        viewport()->setCursor (QCursor (BlankCursor));
+        viewport()->setCursor (QCursor (Qt::BlankCursor));
 
     mMouseIntegration = enabled;
@@ -1079 +1089 @@
                 resizeContents (re->width(), re->height());
                 /* let our toplevel widget calculate its sizeHint properly */
-                QApplication::sendPostedEvents (0, QEvent::LayoutHint);
+                QApplication::sendPostedEvents (0, QEvent::LayoutRequest);
 
                 normalizeGeometry (true /* adjustPosition */);
@@ -1213 +1223 @@
             {
                 ActivateMenuEvent *ame = (ActivateMenuEvent *) e;
-                ame->menuData()->activateItemAt (ame->index());
+#warning port me
+//                ame->menuData()->activateItemAt (ame->index());
 
                 /*
@@ -1221 +1232 @@
                  *  destroyed widgets.
                  */
-                QWidgetList *list = QApplication::topLevelWidgets();
-                bool destroyed = list->find (mMainWnd) < 0;
-                delete list;
+                QWidgetList list = QApplication::topLevelWidgets();
+                bool destroyed = list.indexOf (mMainWnd) < 0;
                 if (!destroyed && mMainWnd->statusBar())
                     mMainWnd->statusBar()->clear();
@@ -1302 +1312 @@
                     const bool kShift = (gs.hostKey() == VK_SHIFT ||
                                         gs.hostKey() == VK_LSHIFT) &&
-                                        (ke->state() & ShiftButton);
+                                        (ke->state() & Qt::ShiftModifier);
                     /* define hot keys according to the Shift state */
-                    const int kAltTab      = kShift ? Key_Exclam     : Key_1;
-                    const int kAltShiftTab = kShift ? Key_At         : Key_2;
-                    const int kCtrlEsc     = kShift ? Key_AsciiTilde : Key_QuoteLeft;
+                    const int kAltTab      = kShift ? Qt::Key_Exclam     : Qt::Key_1;
+                    const int kAltShiftTab = kShift ? Qt::Key_At         : Qt::Key_2;
+                    const int kCtrlEsc     = kShift ? Qt::Key_AsciiTilde : Qt::Key_QuoteLeft;
 
                     /* Simulate Alt+Tab on Host+1 and Alt+Shift+Tab on Host+2 */
@@ -1370 +1380 @@
                 if (mIsHostkeyPressed && e->type() == QEvent::KeyPress)
                 {
-                    if (ke->key() >= Key_F1 && ke->key() <= Key_F12)
+                    if (ke->key() >= Qt::Key_F1 && ke->key() <= Qt::Key_F12)
                     {
                         LONG combo [6];
@@ -1377 +1387 @@
                         combo [4] = 0xb8; /* Alt  up   */
                         combo [5] = 0x9d; /* Ctrl up   */
-                        if (ke->key() >= Key_F1 && ke->key() <= Key_F10)
+                        if (ke->key() >= Qt::Key_F1 && ke->key() <= Qt::Key_F10)
                         {
-                            combo [2] = 0x3b + (ke->key() - Key_F1); /* F1-F10 down */
-                            combo [3] = 0xbb + (ke->key() - Key_F1); /* F1-F10 up   */
+                            combo [2] = 0x3b + (ke->key() - Qt::Key_F1); /* F1-F10 down */
+                            combo [3] = 0xbb + (ke->key() - Qt::Key_F1); /* F1-F10 up   */
                         }
                         /* some scan slice */
-                        else if (ke->key() >= Key_F11 && ke->key() <= Key_F12)
+                        else if (ke->key() >= Qt::Key_F11 && ke->key() <= Qt::Key_F12)
                         {
-                            combo [2] = 0x57 + (ke->key() - Key_F11); /* F11-F12 down */
-                            combo [3] = 0xd7 + (ke->key() - Key_F11); /* F11-F12 up   */
+                            combo [2] = 0x57 + (ke->key() - Qt::Key_F11); /* F11-F12 down */
+                            combo [3] = 0xd7 + (ke->key() - Qt::Key_F11); /* F11-F12 up   */
                         }
                         else
@@ -1394 +1404 @@
                         keyboard.PutScancodes (combo, 6);
                     }
-                    else if (ke->key() == Key_Home)
+                    else if (ke->key() == Qt::Key_Home)
                     {
                         /* activate the main menu */
@@ -1406 +1416 @@
                         /* process hot keys not processed in keyEvent()
                          * (as in case of non-alphanumeric keys) */
-                        processHotKey (QKeySequence (ke->key()),
-                                       mMainWnd->menuBar());
+#warning port me
+//                        processHotKey (QKeySequence (ke->key()),
+//                                       mMainWnd->menuBar());
                     }
                 }
@@ -1452 +1463 @@
     }
 
-    return QScrollView::event (e);
+    return Q3ScrollView::event (e);
 }
 
@@ -1469 +1480 @@
                 if (mouseEvent (me->type(), me->pos(), me->globalPos(),
                                 me->button(), me->state(), me->stateAfter(),
-                                0, Horizontal))
+                                0, Qt::Horizontal))
                     return true; /* stop further event handling */
                 break;
@@ -1477 +1488 @@
                 QWheelEvent *we = (QWheelEvent *) e;
                 if (mouseEvent (we->type(), we->pos(), we->globalPos(),
-                                NoButton, we->state(), we->state(),
+                                Qt::NoButton, we->state(), we->state(),
                                 we->delta(), we->orientation()))
                     return true; /* stop further event handling */
@@ -1573 +1584 @@
             {
                 QKeyEvent *ke = (QKeyEvent *) e;
-                if (ke->key() == Key_Escape && !(ke->state() & KeyButtonMask))
+                if (ke->key() == Qt::Key_Escape && !(ke->state() & Qt::KeyboardModifierMask))
                     if (mMainWnd->menuBar()->hasFocus())
                         setFocus();
@@ -1583 +1594 @@
     }
 
-    return QScrollView::eventFilter (watched, e);
+    return Q3ScrollView::eventFilter (watched, e);
 }
 
@@ -2165 +2176 @@
 
     uKeyMaskCaps          = LockMask;
-    XModifierKeymap* map  = XGetModifierMapping(qt_xdisplay());
-    KeyCode keyCodeNum    = XKeysymToKeycode(qt_xdisplay(), XK_Num_Lock);
-    KeyCode keyCodeScroll = XKeysymToKeycode(qt_xdisplay(), XK_Scroll_Lock);
+    XModifierKeymap* map  = XGetModifierMapping(QX11Info::display());
+    KeyCode keyCodeNum    = XKeysymToKeycode(QX11Info::display(), XK_Num_Lock);
+    KeyCode keyCodeScroll = XKeysymToKeycode(QX11Info::display(), XK_Scroll_Lock);
 
     for (int i = 0; i < 8; i++)
@@ -2178 +2189 @@
             uKeyMaskScroll = 1 << i;
     }
-    XQueryPointer(qt_xdisplay(), DefaultRootWindow(qt_xdisplay()), &wDummy1, &wDummy2,
+    XQueryPointer(QX11Info::display(), DefaultRootWindow(QX11Info::display()), &wDummy1, &wDummy2,
                   &iDummy3, &iDummy4, &iDummy5, &iDummy6, &uMask);
     XFreeModifiermap(map);
@@ -2489 +2500 @@
                 ch = 0;
             if (ch)
-                processed = processHotKey (QKeySequence (UNICODE_ACCEL +
+                processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
                                                 QChar (ch).upper().unicode()),
                                            mMainWnd->menuBar());
@@ -2509 +2520 @@
             {
                 QChar c = QString::fromLocal8Bit (&ch, 1) [0];
-                processed = processHotKey (QKeySequence (UNICODE_ACCEL +
-                                                c.upper().unicode()),
-                                           mMainWnd->menuBar());
+#warning port me
+//                processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
+//                                                c.upper().unicode()),
+//                                           mMainWnd->menuBar());
             }
         }
 #elif defined (Q_WS_MAC)
         if (aUniKey && aUniKey [0] && !aUniKey [1])
-            processed = processHotKey (QKeySequence (UNICODE_ACCEL +
+            processed = processHotKey (QKeySequence (Qt::UNICODE_ACCEL +
                                                      QChar (aUniKey [0]).upper().unicode()),
                                        mMainWnd->menuBar());
@@ -2570 +2582 @@
  */
 bool VBoxConsoleView::mouseEvent (int aType, const QPoint &aPos,
-                                  const QPoint &aGlobalPos, ButtonState aButton,
-                                  ButtonState aState, ButtonState aStateAfter,
-                                  int aWheelDelta, Orientation aWheelDir)
+                                  const QPoint &aGlobalPos, Qt::ButtonState aButton,
+                                  Qt::ButtonState aState, Qt::ButtonState aStateAfter,
+                                  int aWheelDelta, Qt::Orientation aWheelDir)
 {
 #if 0
@@ -2588 +2600 @@
 
     int state = 0;
-    if (aStateAfter & LeftButton)
+    if (aStateAfter & Qt::LeftButton)
         state |= KMouseButtonState_LeftButton;
-    if (aStateAfter & RightButton)
+    if (aStateAfter & Qt::RightButton)
         state |= KMouseButtonState_RightButton;
-    if (aStateAfter & MidButton)
+    if (aStateAfter & Qt::MidButton)
         state |= KMouseButtonState_MiddleButton;
 
     int wheel = 0;
-    if (aWheelDir == Vertical)
+    if (aWheelDir == Qt::Vertical)
     {
         /* the absolute value of wheel delta is 120 units per every wheel
@@ -2887 +2899 @@
                 setMaximumSize (sizeHint());
                 /* let our toplevel widget calculate its sizeHint properly */
-                QApplication::sendPostedEvents (0, QEvent::LayoutHint);
+                QApplication::sendPostedEvents (0, QEvent::LayoutRequest);
                 normalizeGeometry();
             }
@@ -2915 +2927 @@
             /* draw a part of vbuf */
             const QRect &r = pe->rect();
-            ::bitBlt (viewport(), r.x(), r.y(),
-                      &pm, r.x() + contentsX(), r.y() + contentsY(),
-                      r.width(), r.height(),
-                      CopyROP, TRUE);
+#warning port me
+//            ::bitBlt (viewport(), r.x(), r.y(),
+//                      &pm, r.x() + contentsX(), r.y() + contentsY(),
+//                      r.width(), r.height(),
+//                      CopyROP, TRUE);
         }
         else
@@ -3050 +3063 @@
         mCapturedPos = QCursor::pos();
 #ifdef Q_WS_WIN32
-        viewport()->setCursor (QCursor (BlankCursor));
+        viewport()->setCursor (QCursor (Qt::BlankCursor));
         /* move the mouse to the center of the visible area */
         QCursor::setPos (mapToGlobal (visibleRect().center()));
@@ -3099 +3112 @@
      */
 
-    for (uint i = 0; i < data->count(); i++)
-    {
-        int id = data->idAt (i);
-        QMenuItem *item = data->findItem (id);
-        if (item->popup())
-        {
-            if (processHotKey (key, item->popup()))
-                return true;
-        }
-        else
-        {
-            QStringList list = QStringList::split ("\tHost+", data->text (id));
-            if (list.count() == 2)
-            {
-                if (key.matches (QKeySequence (list[1])) == Identical)
-                {
-                    /*
-                     *  we asynchronously post a special event instead of calling
-                     *  data->activateItemAt (i) directly, to let key presses
-                     *  and releases be processed correctly by Qt first.
-                     *  Note: we assume that nobody will delete the menu item
-                     *  corresponding to the key sequence, so that the pointer to
-                     *  menu data posted along with the event will remain valid in
-                     *  the event handler, at least until the main window is closed.
-                     */
-
-                    QApplication::postEvent (this,
-                                             new ActivateMenuEvent (data, i));
-                    return true;
-                }
-            }
-        }
-    }
+#warning port me
+//    for (uint i = 0; i < data->count(); i++)
+//    {
+//        int id = data->idAt (i);
+//        QMenuItem *item = data->findItem (id);
+//        if (item->popup())
+//        {
+//            if (processHotKey (key, item->popup()))
+//                return true;
+//        }
+//        else
+//        {
+//            QStringList list = QStringList::split ("\tHost+", data->text (id));
+//            if (list.count() == 2)
+//            {
+//                if (key.matches (QKeySequence (list[1])) == Identical)
+//                {
+//                    /*
+//                     *  we asynchronously post a special event instead of calling
+//                     *  data->activateItemAt (i) directly, to let key presses
+//                     *  and releases be processed correctly by Qt first.
+//                     *  Note: we assume that nobody will delete the menu item
+//                     *  corresponding to the key sequence, so that the pointer to
+//                     *  menu data posted along with the event will remain valid in
+//                     *  the event handler, at least until the main window is closed.
+//                     */
+//
+//                    QApplication::postEvent (this,
+//                                             new ActivateMenuEvent (data, i));
+//                    return true;
+//                }
+//            }
+//        }
+//    }
 
     return false;
@@ -3242 +3256 @@
     if (mMouseCaptured)
     {
-        viewport()->setCursor (QCursor (BlankCursor));
+        viewport()->setCursor (QCursor (Qt::BlankCursor));
 #ifdef Q_WS_WIN32
         QRect r = viewport()->rect();
@@ -3509 +3523 @@
         else
         {
-            viewport()->setCursor (QCursor::BlankCursor);
+            viewport()->setCursor (Qt::BlankCursor);
         }
     }

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

@@ -32 +32 @@
 #include <qaction.h>
 #include <qmenubar.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qfile.h>
@@ -41 +41 @@
 #include <qeventloop.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <QDesktopWidget>
+#include <QResizeEvent>
+#include <QContextMenuEvent>
+#include <QLabel>
+#include <QCloseEvent>
+#include <Q3GridLayout>
+#include <QShowEvent>
+#include <q3mimefactory.h>
+#include <Q3HBoxLayout>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <Q3PopupMenu>
+#include <Q3ActionGroup>
 
 #include <VBox/VBoxGuest.h>
@@ -79 +94 @@
 
 #ifdef RT_OS_DARWIN
-class QHttp;
-class QHttpResponseHeader;
+class Q3Http;
+class Q3HttpResponseHeader;
 #endif
 
@@ -102 +117 @@
 VBoxConsoleWnd::
 VBoxConsoleWnd (VBoxConsoleWnd **aSelf, QWidget* aParent, const char* aName,
-                WFlags aFlags)
-    : QMainWindow (aParent, aName, aFlags)
+                Qt::WFlags aFlags)
+    : Q3MainWindow (aParent, aName, aFlags)
     , mMainMenu (0)
 #ifdef VBOX_WITH_DEBUGGER_GUI
@@ -116 +131 @@
     , mIsSeamless (false)
     , mIsSeamlessSupported (false)
-    , normal_wflags (getWFlags())
+#warning port me
+//    , normal_wflags (getWFlags())
     , was_max (false)
     , console_style (0)
@@ -140 +156 @@
     /* default application icon (will change to the VM-specific icon in
      * openView()) */
-    setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
+    setIcon (qPixmapFromMimeSource ("ico40x01.png"));
 
     /* ensure status bar is created */
@@ -150 +166 @@
      * Note that only actions whose enabled state depends exclusively on the
      * execution state of the VM are added to this group. */
-    mRunningActions = new QActionGroup (this);
+    mRunningActions = new Q3ActionGroup (this);
     mRunningActions->setExclusive (false);
 
@@ -156 +172 @@
      * paused. Note that only actions whose enabled state depends exclusively
      * on the execution state of the VM are added to this group. */
-    mRunningOrPausedActions = new QActionGroup (this);
+    mRunningOrPausedActions = new Q3ActionGroup (this);
     mRunningOrPausedActions->setExclusive (false);
 
@@ -281 +297 @@
     ///// Menubar ///////////////////////////////////////////////////////////
 
-    mMainMenu = new QPopupMenu (this, "mMainMenu");
+    mMainMenu = new Q3PopupMenu (this, "mMainMenu");
 
     /* Machine submenu */
 
-    QPopupMenu *vmMenu = new QPopupMenu (this, "vmMenu");
+    Q3PopupMenu *vmMenu = new Q3PopupMenu (this, "vmMenu");
 
     /* dynamic & status line popup menus */
@@ -319 +335 @@
     /* Devices submenu */
 
-    devicesMenu = new QPopupMenu (this, "devicesMenu");
+    devicesMenu = new Q3PopupMenu (this, "devicesMenu");
 
     /* dynamic & statusline popup menus */
-    devicesMountFloppyMenu = new QPopupMenu (devicesMenu, "devicesMountFloppyMenu");
-    devicesMountDVDMenu = new QPopupMenu (devicesMenu, "devicesMountDVDMenu");
-    devicesSFMenu = new QPopupMenu (devicesMenu, "devicesSFMenu");
-    devicesNetworkMenu = new QPopupMenu (devicesMenu, "devicesNetworkMenu");
+    devicesMountFloppyMenu = new Q3PopupMenu (devicesMenu, "devicesMountFloppyMenu");
+    devicesMountDVDMenu = new Q3PopupMenu (devicesMenu, "devicesMountDVDMenu");
+    devicesSFMenu = new Q3PopupMenu (devicesMenu, "devicesSFMenu");
+    devicesNetworkMenu = new Q3PopupMenu (devicesMenu, "devicesNetworkMenu");
     devicesUSBMenu = new VBoxUSBMenu (devicesMenu);
     devicesVRDPMenu = new VBoxSwitchMenu (devicesMenu, devicesSwitchVrdpAction);
@@ -368 +384 @@
     if (vboxGlobal().isDebuggerEnabled())
     {
-        dbgMenu = new QPopupMenu (this, "dbgMenu");
+        dbgMenu = new Q3PopupMenu (this, "dbgMenu");
         dbgStatisticsAction->addTo (dbgMenu);
         dbgCommandLineAction->addTo (dbgMenu);
@@ -380 +396 @@
     /* Help submenu */
 
-    QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
+    Q3PopupMenu *helpMenu = new Q3PopupMenu( this, "helpMenu" );
 
     helpContentsAction->addTo (helpMenu);
@@ -399 +415 @@
     ///// Status bar ////////////////////////////////////////////////////////
 
-    QHBox *indicatorBox = new QHBox (0, "indicatorBox");
+    Q3HBox *indicatorBox = new Q3HBox (0, "indicatorBox");
     indicatorBox->setSpacing (5);
     /* i/o devices */
-    hd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "hd_light", WNoAutoErase);
-    hd_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("hd_16px.png"));
-    hd_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("hd_read_16px.png"));
-    hd_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("hd_write_16px.png"));
-    hd_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("hd_disabled_16px.png"));
-    cd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "cd_light", WNoAutoErase);
-    cd_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("cd_16px.png"));
-    cd_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("cd_read_16px.png"));
-    cd_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("cd_write_16px.png"));
-    cd_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("cd_disabled_16px.png"));
-    fd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "fd_light", WNoAutoErase);
-    fd_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("fd_16px.png"));
-    fd_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("fd_read_16px.png"));
-    fd_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("fd_write_16px.png"));
-    fd_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("fd_disabled_16px.png"));
-    net_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "net_light", WNoAutoErase);
-    net_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("nw_16px.png"));
-    net_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("nw_read_16px.png"));
-    net_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("nw_write_16px.png"));
-    net_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("nw_disabled_16px.png"));
-    usb_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "usb_light", WNoAutoErase);
-    usb_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("usb_16px.png"));
-    usb_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("usb_read_16px.png"));
-    usb_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("usb_write_16px.png"));
-    usb_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("usb_disabled_16px.png"));
-    sf_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "sf_light", WNoAutoErase);
-    sf_light->setStateIcon (KDeviceActivity_Idle, QPixmap::fromMimeSource ("shared_folder_16px.png"));
-    sf_light->setStateIcon (KDeviceActivity_Reading, QPixmap::fromMimeSource ("shared_folder_read_16px.png"));
-    sf_light->setStateIcon (KDeviceActivity_Writing, QPixmap::fromMimeSource ("shared_folder_write_16px.png"));
-    sf_light->setStateIcon (KDeviceActivity_Null, QPixmap::fromMimeSource ("shared_folder_disabled_16px.png"));
-
-    (new QFrame (indicatorBox))->setFrameStyle (QFrame::VLine | QFrame::Sunken);
+    hd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "hd_light", Qt::WNoAutoErase);
+    hd_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("hd_16px.png"));
+    hd_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("hd_read_16px.png"));
+    hd_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("hd_write_16px.png"));
+    hd_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("hd_disabled_16px.png"));
+    cd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "cd_light", Qt::WNoAutoErase);
+    cd_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("cd_16px.png"));
+    cd_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("cd_read_16px.png"));
+    cd_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("cd_write_16px.png"));
+    cd_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("cd_disabled_16px.png"));
+    fd_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "fd_light", Qt::WNoAutoErase);
+    fd_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("fd_16px.png"));
+    fd_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("fd_read_16px.png"));
+    fd_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("fd_write_16px.png"));
+    fd_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("fd_disabled_16px.png"));
+    net_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "net_light", Qt::WNoAutoErase);
+    net_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("nw_16px.png"));
+    net_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("nw_read_16px.png"));
+    net_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("nw_write_16px.png"));
+    net_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("nw_disabled_16px.png"));
+    usb_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "usb_light", Qt::WNoAutoErase);
+    usb_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("usb_16px.png"));
+    usb_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("usb_read_16px.png"));
+    usb_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("usb_write_16px.png"));
+    usb_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("usb_disabled_16px.png"));
+    sf_light = new QIStateIndicator (KDeviceActivity_Idle, indicatorBox, "sf_light", Qt::WNoAutoErase);
+    sf_light->setStateIcon (KDeviceActivity_Idle, qPixmapFromMimeSource ("shared_folder_16px.png"));
+    sf_light->setStateIcon (KDeviceActivity_Reading, qPixmapFromMimeSource ("shared_folder_read_16px.png"));
+    sf_light->setStateIcon (KDeviceActivity_Writing, qPixmapFromMimeSource ("shared_folder_write_16px.png"));
+    sf_light->setStateIcon (KDeviceActivity_Null, qPixmapFromMimeSource ("shared_folder_disabled_16px.png"));
+
+    (new Q3Frame (indicatorBox))->setFrameStyle (Q3Frame::VLine | Q3Frame::Sunken);
 
 #if 0 // do not show these indicators, information overload
     /* vrdp state */
-    vrdp_state = new QIStateIndicator (0, indicatorBox, "vrdp_state", WNoAutoErase);
-    vrdp_state->setStateIcon (0, QPixmap::fromMimeSource ("vrdp_disabled_16px.png"));
-    vrdp_state->setStateIcon (1, QPixmap::fromMimeSource ("vrdp_16px.png"));
+    vrdp_state = new QIStateIndicator (0, indicatorBox, "vrdp_state", Qt::WNoAutoErase);
+    vrdp_state->setStateIcon (0, qPixmapFromMimeSource ("vrdp_disabled_16px.png"));
+    vrdp_state->setStateIcon (1, qPixmapFromMimeSource ("vrdp_16px.png"));
     /* auto resize state */
-    autoresize_state = new QIStateIndicator (1, indicatorBox, "autoresize_state", WNoAutoErase);
-    autoresize_state->setStateIcon (0, QPixmap::fromMimeSource ("auto_resize_off_disabled_16px.png"));
-    autoresize_state->setStateIcon (1, QPixmap::fromMimeSource ("auto_resize_off_16px.png"));
-    autoresize_state->setStateIcon (2, QPixmap::fromMimeSource ("auto_resize_on_disabled_16px.png"));
-    autoresize_state->setStateIcon (3, QPixmap::fromMimeSource ("auto_resize_on_16px.png"));
+    autoresize_state = new QIStateIndicator (1, indicatorBox, "autoresize_state", Qt::WNoAutoErase);
+    autoresize_state->setStateIcon (0, qPixmapFromMimeSource ("auto_resize_off_disabled_16px.png"));
+    autoresize_state->setStateIcon (1, qPixmapFromMimeSource ("auto_resize_off_16px.png"));
+    autoresize_state->setStateIcon (2, qPixmapFromMimeSource ("auto_resize_on_disabled_16px.png"));
+    autoresize_state->setStateIcon (3, qPixmapFromMimeSource ("auto_resize_on_16px.png"));
 #endif
 
     /* mouse */
-    mouse_state = new QIStateIndicator (0, indicatorBox, "mouse_state", WNoAutoErase);
-    mouse_state->setStateIcon (0, QPixmap::fromMimeSource ("mouse_disabled_16px.png"));
-    mouse_state->setStateIcon (1, QPixmap::fromMimeSource ("mouse_16px.png"));
-    mouse_state->setStateIcon (2, QPixmap::fromMimeSource ("mouse_seamless_16px.png"));
-    mouse_state->setStateIcon (3, QPixmap::fromMimeSource ("mouse_can_seamless_16px.png"));
-    mouse_state->setStateIcon (4, QPixmap::fromMimeSource ("mouse_can_seamless_uncaptured_16px.png"));
+    mouse_state = new QIStateIndicator (0, indicatorBox, "mouse_state", Qt::WNoAutoErase);
+    mouse_state->setStateIcon (0, qPixmapFromMimeSource ("mouse_disabled_16px.png"));
+    mouse_state->setStateIcon (1, qPixmapFromMimeSource ("mouse_16px.png"));
+    mouse_state->setStateIcon (2, qPixmapFromMimeSource ("mouse_seamless_16px.png"));
+    mouse_state->setStateIcon (3, qPixmapFromMimeSource ("mouse_can_seamless_16px.png"));
+    mouse_state->setStateIcon (4, qPixmapFromMimeSource ("mouse_can_seamless_uncaptured_16px.png"));
     /* host key */
-    hostkey_hbox = new QHBox (indicatorBox, "hostkey_hbox");
+    hostkey_hbox = new Q3HBox (indicatorBox, "hostkey_hbox");
     hostkey_hbox->setSpacing (3);
     hostkey_state = new QIStateIndicator (0, hostkey_hbox, "hostkey_state");
-    hostkey_state->setStateIcon (0, QPixmap::fromMimeSource ("hostkey_16px.png"));
-    hostkey_state->setStateIcon (1, QPixmap::fromMimeSource ("hostkey_captured_16px.png"));
-    hostkey_state->setStateIcon (2, QPixmap::fromMimeSource ("hostkey_pressed_16px.png"));
-    hostkey_state->setStateIcon (3, QPixmap::fromMimeSource ("hostkey_captured_pressed_16px.png"));
+    hostkey_state->setStateIcon (0, qPixmapFromMimeSource ("hostkey_16px.png"));
+    hostkey_state->setStateIcon (1, qPixmapFromMimeSource ("hostkey_captured_16px.png"));
+    hostkey_state->setStateIcon (2, qPixmapFromMimeSource ("hostkey_pressed_16px.png"));
+    hostkey_state->setStateIcon (3, qPixmapFromMimeSource ("hostkey_captured_pressed_16px.png"));
     hostkey_name = new QLabel (QIHotKeyEdit::keyName (vboxGlobal().settings().hostKey()),
                                hostkey_hbox, "hostkey_name");
@@ -594 +610 @@
     SetApplicationDockTileImage (dockImgOS);
 #endif
-    mMaskShift.scale (0, 0, QSize::ScaleFree);
+    mMaskShift.scale (0, 0, Qt::IgnoreAspectRatio);
 }
 
@@ -639 +655 @@
     {
         setCentralWidget (new QWidget (this, "centralWidget"));
-        QGridLayout *pMainLayout = new QGridLayout(centralWidget(), 3, 3, 0, 0);
+        Q3GridLayout *pMainLayout = new Q3GridLayout(centralWidget(), 3, 3, 0, 0);
         mShiftingSpacerLeft = new QSpacerItem (0, 0,
                                                QSizePolicy::Fixed,
@@ -670 +686 @@
     activateUICustomizations();
 
-    static_cast<QGridLayout*>(centralWidget()->layout())->addWidget(console, 1, 1, AlignVCenter | AlignHCenter);
+    static_cast<Q3GridLayout*>(centralWidget()->layout())->addWidget(console, 1, 1, Qt::AlignVCenter | Qt::AlignHCenter);
 
     CMachine cmachine = csession.GetMachine();
@@ -713 +729 @@
         /* maximize if needed */
         if (max)
-            setWindowState (windowState() | WindowMaximized);
+            setWindowState (windowState() | Qt::WindowMaximized);
         was_max = max;
 
@@ -1164 +1180 @@
     }
 
-    return QMainWindow::event (e);
+    return Q3MainWindow::event (e);
 }
 
@@ -1962 +1978 @@
         ULONG64 usedBits = screen.width() /* display width */
                          * screen.height() /* display height */
-                         * QColor::numBitPlanes(); /* bit per pixel */
+#warning port me: check this
+                         * depth(); /* bit per pixel */
+//                         * QColor::numBitPlanes(); /* bit per pixel */
         if (aOn && (availBits < usedBits))
         {
             vboxProblem().cannotEnterSeamlessMode (screen.width(),
-                screen.height(), QColor::numBitPlanes());
+#warning port me: check this
+                screen.height(), depth());
+//                screen.height(), QColor::numBitPlanes());
             return false;
         }
@@ -2069 +2089 @@
 
         /* Hide all but the central widget containing the console view. */
-        QObjectList *list = queryList (NULL, NULL, false, false);
-        for (QObject *obj = list->first(); obj != NULL; obj = list->next())
+        QObjectList list = queryList (NULL, NULL, false, false);
+        foreach (QObject *obj, list)
         {
             if (obj->isWidgetType() && obj != centralWidget())
@@ -2082 +2102 @@
             }
         }
-        delete list;
 
 #ifdef Q_WS_MAC
@@ -2096 +2115 @@
         /* Adjust colors and appearance. */
         mEraseColor = centralWidget()->eraseColor();
-        centralWidget()->setEraseColor (black);
+        centralWidget()->setEraseColor (Qt::black);
         console_style = console->frameStyle();
-        console->setFrameStyle (QFrame::NoFrame);
+        console->setFrameStyle (Q3Frame::NoFrame);
         console->setMaximumSize (scrGeo.size());
-        console->setVScrollBarMode (QScrollView::AlwaysOff);
-        console->setHScrollBarMode (QScrollView::AlwaysOff);
+        console->setVScrollBarMode (Q3ScrollView::AlwaysOff);
+        console->setHScrollBarMode (Q3ScrollView::AlwaysOff);
 
         /* Going fullscreen */
-        setWindowState (windowState() ^ WindowFullScreen);
+        setWindowState (windowState() ^ Qt::WindowFullScreen);
 #ifdef Q_WS_MAC /* setMask seems to not include the far border pixels. */
 //        QRect maskRect = dtw->screenGeometry (this);
@@ -2186 +2205 @@
         console->setFrameStyle (console_style);
         console->setMaximumSize (console->sizeHint());
-        console->setVScrollBarMode (QScrollView::Auto);
-        console->setHScrollBarMode (QScrollView::Auto);
+        console->setVScrollBarMode (Q3ScrollView::Auto);
+        console->setHScrollBarMode (Q3ScrollView::Auto);
 
         /* Show everything hidden when going fullscreen. */
-        for (QObject *obj = hidden_children.first(); obj != NULL;
-             obj = hidden_children.next())
+        foreach (QObject *obj, hidden_children)
             ((QWidget *) obj)->show();
         hidden_children.clear();
 
         /* Going normal || maximized */
-        setWindowState (windowState() ^ WindowFullScreen);
+        setWindowState (windowState() ^ Qt::WindowFullScreen);
 
         qApp->processEvents();
@@ -2242 +2260 @@
         QRect sRect = dtw->screenGeometry (this);
         QRect aRect (aTargetRect);
-        mMaskShift.scale (aTargetRect.left(), aTargetRect.top(), QSize::ScaleFree);
+        mMaskShift.scale (aTargetRect.left(), aTargetRect.top(), Qt::IgnoreAspectRatio);
 #ifdef Q_WS_MAC
         /* On mac os x this isn't necessary cause the screen starts
@@ -2470 +2488 @@
     if (!console) return;
 
-    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", WType_Dialog | WShowModal);
+    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", Qt::WType_Dialog | Qt::WShowModal);
     QUuid id = csession.GetMachine().GetId();
     dlg.setup (VBoxDefs::FD, true, &id);
@@ -2514 +2532 @@
     if (!console) return;
 
-    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", WType_Dialog | WShowModal);
+    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", Qt::WType_Dialog | Qt::WShowModal);
     QUuid id = csession.GetMachine().GetId();
     dlg.setup (VBoxDefs::CD, true, &id);
@@ -2728 +2746 @@
     }
 #else
-    QMainWindow::setMask (region);
+    Q3MainWindow::setMask (region);
 #endif
 }
@@ -3048 +3066 @@
         devicesSFMenu->exec (e->globalPos());
 #else
-        if (devicesSFDialogAction->isEnabled())
-            devicesSFDialogAction->activate();
+#warning port me
+//        if (devicesSFDialogAction->isEnabled())
+//            devicesSFDialogAction->activate();
 #endif
     }
@@ -3299 +3318 @@
 void VBoxConsoleWnd::tryClose()
 {
-    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
-
-    if (qApp->eventLoop()->loopLevel() > 1)
-    {
-        if (QApplication::activeModalWidget())
-            QApplication::activeModalWidget()->close();
-        else if (QApplication::activePopupWidget())
-            QApplication::activePopupWidget()->close();
-        else
-        {
+#warning port me
+//    LogFlowFunc (("eventLoopLevel=%d\n", qApp->eventLoop()->loopLevel()));
+//
+//    if (qApp->eventLoop()->loopLevel() > 1)
+//    {
+//        if (QApplication::activeModalWidget())
+//            QApplication::activeModalWidget()->close();
+//        else if (QApplication::activePopupWidget())
+//            QApplication::activePopupWidget()->close();
+//        else
+//        {
             /// @todo (r=dmik) in general, the following is not that correct
             //  because some custom modal event loop may not expect to be
@@ -3314 +3334 @@
             //  flags before calling exitLoop()). The alternative is to do
             //  nothing but wait keeping to post singleShot timers.
-            qApp->eventLoop()->exitLoop();
-        }
-
-        QTimer::singleShot (0, this, SLOT (tryClose()));
-    }
-    else
-        close();
+//            qApp->eventLoop()->exitLoop();
+//        }
+//
+//        QTimer::singleShot (0, this, SLOT (tryClose()));
+//    }
+//    else
+//        close();
 }
 
@@ -3403 +3423 @@
 VBoxSFDialog::VBoxSFDialog (QWidget  *aParent, CSession &aSession)
     : QDialog (aParent, "VBoxSFDialog", true /* modal */,
-               WType_Dialog | WShowModal)
+               Qt::WType_Dialog | Qt::WShowModal)
     , mSettings (0), mSession (aSession)
 {
     /* Setup Dialog's options */
     setCaption (tr ("Shared Folders"));
-    setIcon (QPixmap::fromMimeSource ("select_file_16px.png"));
+    setIcon (qPixmapFromMimeSource ("select_file_16px.png"));
     setSizeGripEnabled (true);
 
     /* Setup main dialog's layout */
-    QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
+    Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 10, 10, "mainLayout");
 
     /* Setup settings layout */
@@ -3423 +3443 @@
 
     /* Setup button's layout */
-    QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+    Q3HBoxLayout *buttonLayout = new Q3HBoxLayout (mainLayout, 10, "buttonLayout");
     QPushButton *pbHelp = new QPushButton (tr ("Help"), this, "pbHelp");
     QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);

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

@@ -23 +23 @@
 
 #include "qaction.h"
-#include "qprogressbar.h"
+#include "q3progressbar.h"
 #include "qtoolbutton.h"
 #include "qlayout.h"
@@ -29 +29 @@
 #include "qdir.h"
 #include "qtimer.h"
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QEvent>
 
 /* These notifications are used to notify the GUI thread about different
@@ -129 +132 @@
     , mConn (new HConnect (mUrl.host(), 80))
     , mRequestThread (0)
-    , mDataStream (mDataArray, IO_WriteOnly)
+    , mDataStream (&mDataArray, QIODevice::WriteOnly)
     , mTimeout (new QTimer (this))
 {
@@ -140 +143 @@
     setFixedHeight (16);
 
-    mProgressBar = new QProgressBar (this);
+    mProgressBar = new Q3ProgressBar (this);
     mProgressBar->setFixedWidth (100);
     mProgressBar->setPercentageVisible (true);
@@ -147 +150 @@
     mCancelButton = new QToolButton (this);
     mCancelButton->setAutoRaise (true);
-    mCancelButton->setFocusPolicy (TabFocus);
+    mCancelButton->setFocusPolicy (Qt::TabFocus);
     connect (mCancelButton, SIGNAL (clicked()),
              this, SLOT (processAbort()));
 
-    QHBoxLayout *mainLayout = new QHBoxLayout (this);
+    Q3HBoxLayout *mainLayout = new Q3HBoxLayout (this);
     mainLayout->addWidget (mProgressBar);
     mainLayout->addWidget (mCancelButton);
@@ -241 +244 @@
             {
                 QFile file (mTarget);
-                if (file.open (IO_WriteOnly))
+                if (file.open (QIODevice::WriteOnly))
                 {
                     file.writeBlock (mDataArray);

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

@@ -24 +24 @@
 
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QMoveEvent>
+#include <QPaintEvent>
 
 #include <iprt/param.h>

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

@@ -29 +29 @@
 /* Qt includes */
 #include <qapplication.h>
-#include <qmainwindow.h>
+#include <q3mainwindow.h>
 #include <qstatusbar.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <Q3MemArray>
 
 /** @class VBoxQuartz2DFrameBuffer
@@ -237 +240 @@
         /* Ok, for more performance we set a clipping path of the
          * regions given by this paint event. */
-        QMemArray <QRect> a = pe->region().rects();
+        Q3MemArray <QRect> a = pe->region().rects();
         if (a.size() > 0)
         {

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

@@ -24 +24 @@
 
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QPaintEvent>
 
 //
@@ -341 +343 @@
                                          r.width(), r.height()));
 
-        ::bitBlt (mView->viewport(), r.x(), r.y(),
-                  &mPM, 0, 0,
-                  r.width(), r.height(),
-                  Qt::CopyROP, TRUE);
+#warning port me
+//        ::bitBlt (mView->viewport(), r.x(), r.y(),
+//                  &mPM, 0, 0,
+//                  r.width(), r.height(),
+//                  Qt::CopyROP, TRUE);
     }
     else
@@ -353 +356 @@
                                       0, 0, QImage::LittleEndian));
 
-        ::bitBlt (mView->viewport(), r.x(), r.y(),
-                  &mPM, r.x() + mView->contentsX(), 0,
-                  r.width(), r.height(),
-                  Qt::CopyROP, TRUE);
+#warning port me
+//        ::bitBlt (mView->viewport(), r.x(), r.y(),
+//                  &mPM, r.x() + mView->contentsX(), 0,
+//                  r.width(), r.height(),
+//                  Qt::CopyROP, TRUE);
     }
 

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

@@ -24 +24 @@
 #include "VBoxProblemReporter.h"
 #include "QIHotKeyEdit.h"
+//Added by qt3to4:
+#include <QDesktopWidget>
+#include <Q3CString>
+#include <q3mimefactory.h>
+#include <QTranslator>
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <QEvent>
+#include <QShowEvent>
+#include <Q3PopupMenu>
+#include <Q3HBoxLayout>
 
 #ifdef VBOX_WITH_REGISTRATION
@@ -32 +43 @@
 #include <qmessagebox.h>
 #include <qpixmap.h>
-#include <qiconset.h>
-#include <qwidgetlist.h>
-#include <qfiledialog.h>
+#include <qicon.h>
+#include <qwidget.h>
+#include <q3filedialog.h>
 #include <qimage.h>
 #include <qlabel.h>
@@ -40 +51 @@
 
 #ifdef Q_WS_X11
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
@@ -50 +61 @@
 #include <qregexp.h>
 #include <qlocale.h>
-#include <qprocess.h>
+#include <q3process.h>
 
 #if defined (Q_WS_MAC)
@@ -415 +426 @@
     {
         winfilters += *it;
-        winfilters += QChar::null;
+        winfilters += QChar::Null;
         winfilters += extractFilter (*it);
-        winfilters += QChar::null;
-    }
-    winfilters += QChar::null;
+        winfilters += QChar::Null;
+    }
+    winfilters += QChar::Null;
     return winfilters;
 }
@@ -557 +568 @@
     {
         setCaption ("VirtualBox License");
-        setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
-
-        mLicenseText = new QTextBrowser (this);
+        setIcon (qPixmapFromMimeSource ("ico40x01.png"));
+
+        mLicenseText = new Q3TextBrowser (this);
         mAgreeButton = new QPushButton (tr ("I &Agree"), this);
         mDisagreeButton = new QPushButton (tr ("I &Disagree"), this);
@@ -570 +581 @@
         connect (mDisagreeButton, SIGNAL (clicked()), SLOT (reject()));
 
-        QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10);
+        Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 10, 10);
         mainLayout->addWidget (mLicenseText);
 
-        QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10);
+        Q3HBoxLayout *buttonLayout = new Q3HBoxLayout (mainLayout, 10);
         buttonLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
                                                       QSizePolicy::Preferred));
@@ -590 +601 @@
         /* read & show the license file */
         QFile file (mFilePath);
-        if (file.open (IO_ReadOnly))
+        if (file.open (QIODevice::ReadOnly))
         {
             mLicenseText->setText (file.readAll());
@@ -622 +633 @@
         QDialog::showEvent (aEvent);
         bool isScrollBarHidden = mLicenseText->verticalScrollBar()->isHidden()
-                                 && !(windowState() & WindowMinimized);
+                                 && !(windowState() & Qt::WindowMinimized);
         mAgreeButton->setEnabled (isScrollBarHidden);
         mDisagreeButton->setEnabled (isScrollBarHidden);
@@ -633 +644 @@
             case QEvent::Hide:
                 if (aObject == mLicenseText->verticalScrollBar() &&
-                    (windowState() & WindowActive))
+                    (windowState() & Qt::WindowActive))
                     unlockButtons();
             default:
@@ -642 +653 @@
 
     QString       mFilePath;
-    QTextBrowser *mLicenseText;
+    Q3TextBrowser *mLicenseText;
     QPushButton  *mAgreeButton;
     QPushButton  *mDisagreeButton;
@@ -1429 +1440 @@
             if (device == KDeviceType_Null)
                 continue;
-            if (bootOrder)
+            if (!bootOrder.isEmpty())
                 bootOrder += ", ";
             bootOrder += toString (device);
         }
-        if (!bootOrder)
+        if (bootOrder.isEmpty())
             bootOrder = toString (KDeviceType_Null);
 
@@ -2305 +2316 @@
      * human readable key names, we keep a table of them, which must be
      * updated when the language is changed. */
-    QIHotKeyEdit::languageChange();
+#warning port me
+    QIHotKeyEdit::languageChange_qt3();
 #endif
 }
@@ -2343 +2355 @@
     AssertReturnVoid (aLabel);
 
-    QPixmap *pix = aLabel->pixmap();
+    const QPixmap *pix = aLabel->pixmap();
     QImage img = pix->convertToImage();
     QRgb rgbBack = img.pixel (img.width() - 1, img.height() - 1);
     QRgb rgbFrame = img.pixel (img.width() - 1, 0);
 
-    aLabel->setAlignment (AlignTop);
+    aLabel->setAlignment (Qt::AlignTop);
 
     aLabel->setPaletteBackgroundColor (QColor (rgbBack));
-    aLabel->setFrameShadow (QFrame::Plain);
-    aLabel->setFrameShape (QFrame::Box);
+    aLabel->setFrameShadow (Q3Frame::Plain);
+    aLabel->setFrameShape (Q3Frame::Box);
     aLabel->setPaletteForegroundColor (QColor (rgbFrame));
 }
@@ -2372 +2384 @@
     {
         QFile file (aFileName);
-        if (!file.open (IO_ReadOnly))
+        if (!file.open (QIODevice::ReadOnly))
             return false;
         mData = file.readAll();
@@ -2535 +2547 @@
 
 /* static */
-QIconSet VBoxGlobal::iconSet (const char *aNormal,
+QIcon VBoxGlobal::iconSet (const char *aNormal,
                               const char *aDisabled /* = 0 */,
                               const char *aActive /* = 0 */)
@@ -2541 +2553 @@
     Assert (aNormal);
 
-    QIconSet iconSet;
-
-    iconSet.setPixmap (QPixmap::fromMimeSource (aNormal),
-                       QIconSet::Automatic, QIconSet::Normal);
+    QIcon iconSet;
+
+    iconSet.setPixmap (qPixmapFromMimeSource (aNormal),
+                       QIcon::Automatic, QIcon::Normal);
     if (aDisabled)
-        iconSet.setPixmap (QPixmap::fromMimeSource (aDisabled),
-                           QIconSet::Automatic, QIconSet::Disabled);
+        iconSet.setPixmap (qPixmapFromMimeSource (aDisabled),
+                           QIcon::Automatic, QIcon::Disabled);
     if (aActive)
-        iconSet.setPixmap (QPixmap::fromMimeSource (aActive),
-                           QIconSet::Automatic, QIconSet::Active);
+        iconSet.setPixmap (qPixmapFromMimeSource (aActive),
+                           QIcon::Automatic, QIcon::Active);
     return iconSet;
 }
 
 /* static */
-QIconSet VBoxGlobal::
+QIcon VBoxGlobal::
 iconSetEx (const char *aNormal, const char *aSmallNormal,
            const char *aDisabled /* = 0 */, const char *aSmallDisabled /* = 0 */,
@@ -2563 +2575 @@
     Assert (aSmallNormal);
 
-    QIconSet iconSet;
-
-    iconSet.setPixmap (QPixmap::fromMimeSource (aNormal),
-                       QIconSet::Large, QIconSet::Normal);
-    iconSet.setPixmap (QPixmap::fromMimeSource (aSmallNormal),
-                       QIconSet::Small, QIconSet::Normal);
+    QIcon iconSet;
+
+    iconSet.setPixmap (qPixmapFromMimeSource (aNormal),
+                       QIcon::Large, QIcon::Normal);
+    iconSet.setPixmap (qPixmapFromMimeSource (aSmallNormal),
+                       QIcon::Small, QIcon::Normal);
     if (aSmallDisabled)
     {
-        iconSet.setPixmap (QPixmap::fromMimeSource (aDisabled),
-                           QIconSet::Large, QIconSet::Disabled);
-        iconSet.setPixmap (QPixmap::fromMimeSource (aSmallDisabled),
-                           QIconSet::Small, QIconSet::Disabled);
+        iconSet.setPixmap (qPixmapFromMimeSource (aDisabled),
+                           QIcon::Large, QIcon::Disabled);
+        iconSet.setPixmap (qPixmapFromMimeSource (aSmallDisabled),
+                           QIcon::Small, QIcon::Disabled);
     }
     if (aSmallActive)
     {
-        iconSet.setPixmap (QPixmap::fromMimeSource (aActive),
-                           QIconSet::Large, QIconSet::Active);
-        iconSet.setPixmap (QPixmap::fromMimeSource (aSmallActive),
-                           QIconSet::Small, QIconSet::Active);
+        iconSet.setPixmap (qPixmapFromMimeSource (aActive),
+                           QIcon::Large, QIcon::Active);
+        iconSet.setPixmap (qPixmapFromMimeSource (aSmallActive),
+                           QIcon::Small, QIcon::Active);
     }
 
@@ -2606 +2618 @@
 
     /* remember the icon set as setText() will kill it */
-    QIconSet iset = aToolButton->iconSet();
+    QIcon iset = aToolButton->iconSet();
     /* re-use the setText() method to detect and set the accelerator */
     aToolButton->setText (aTextLabel);
@@ -2701 +2713 @@
     int extraw = 0, extrah = 0;
 
-    QWidgetList *list = QApplication::topLevelWidgets();
-    QWidgetListIt it (*list);
-    while ((extraw == 0 || extrah == 0) && it.current() != 0)
+    QWidgetList list = QApplication::topLevelWidgets();
+    QListIterator<QWidget*> it (list);
+    while ((extraw == 0 || extrah == 0) && it.hasNext())
     {
         int framew, frameh;
-        QWidget *current = it.current();
-        ++ it;
+        QWidget *current = it.next();
         if (!current->isVisible())
             continue;
@@ -2717 +2728 @@
         extrah = QMAX (extrah, frameh);
     }
-    delete list;
 
     /// @todo (r=dmik) not sure if we really need this
@@ -3140 +3150 @@
 #else
 
-    return QFileDialog::getExistingDirectory (aDir, aParent, aName, aCaption,
+    return Q3FileDialog::getExistingDirectory (aDir, aParent, aName, aCaption,
                                               aDirOnly, aResolveSymlinks);
 
@@ -3282 +3292 @@
 #else
 
-    return QFileDialog::getOpenFileName (aStartWith, aFilters, aParent, aName,
+    return Q3FileDialog::getOpenFileName (aStartWith, aFilters, aParent, aName,
                                          aCaption, aSelectedFilter, aResolveSymlinks);
 
@@ -3496 +3506 @@
     if (aParent == NULL)
     {
-        QWidgetList *list = QApplication::topLevelWidgets();
-        QWidgetListIt it (*list);
-        QWidget *w = NULL;
-        for (; (w = it.current()) != NULL; ++ it)
+        QWidgetList list = QApplication::topLevelWidgets();
+        QWidget* w = NULL;
+        foreach(w, list)
         {
             if ((!aName || strcmp (w->name(), aName) == 0) &&
@@ -3511 +3520 @@
             }
         }
-        delete list;
         return w;
     }
 
-    QObjectList *list = aParent->queryList (aName, aClassName, false, true);
-    QObjectListIt it (*list);
+    QObjectList list = aParent->queryList (aName, aClassName, false, true);
     QObject *obj = NULL;
-    for (; (obj = it.current()) != NULL; ++ it)
+    foreach(obj, list)
     {
         if (obj->isWidgetType())
             break;
     }
-    delete list;
     return (QWidget *) obj;
 }
@@ -3579 +3585 @@
         QStringList args = QStringList::split (':', commands [i]);
         args += aURL;
-        QProcess cmd (args);
+        Q3Process cmd (args);
         if (cmd.start())
             return true;
@@ -3601 +3607 @@
     {
         ConstStr255Param hint (0x0);
-        QCString cs = aURL.local8Bit();
+        Q3CString cs = aURL.local8Bit();
         const char* data = cs.data();
         long length = cs.length();
@@ -3635 +3641 @@
     {
         /* Show the already opened registration dialog */
-        mRegDlg->setWindowState (mRegDlg->windowState() & ~WindowMinimized);
+        mRegDlg->setWindowState (mRegDlg->windowState() & ~Qt::WindowMinimized);
         mRegDlg->raise();
         mRegDlg->setActiveWindow();
@@ -3653 +3659 @@
         {
             /* We've got the "mutex", create a new registration dialog */
-            VBoxRegistrationDlg *dlg =
-                new VBoxRegistrationDlg (0, 0, false, WDestructiveClose);
-            dlg->setup (&mRegDlg);
-            Assert (dlg == mRegDlg);
-            mRegDlg->show();
+#warning port me
+//            VBoxRegistrationDlg *dlg =
+//                new VBoxRegistrationDlg (0, 0, false, Qt::WDestructiveClose);
+//            dlg->setup (&mRegDlg);
+//            Assert (dlg == mRegDlg);
+//            mRegDlg->show();
         }
     }
@@ -3763 +3770 @@
          * order to invalidate cached string resources (like the details view
          * templates) that may be used by other widgets. */
-        QWidgetList *list = QApplication::topLevelWidgets();
-        if (list->first() == aObject)
+        QWidgetList list = QApplication::topLevelWidgets();
+        if (list.first() == aObject)
         {
             /* call this only once per every language change (see
@@ -3770 +3777 @@
             languageChange();
         }
-        delete list;
     }
 
@@ -3847 +3853 @@
     {
         vm_os_type_icons.insert (osTypeIcons [n][0],
-            new QPixmap (QPixmap::fromMimeSource (osTypeIcons [n][1])));
+            new QPixmap (qPixmapFromMimeSource (osTypeIcons [n][1])));
     }
 
@@ -3875 +3881 @@
     {
         mStateIcons.insert (vmStateIcons [n].state,
-            new QPixmap (QPixmap::fromMimeSource (vmStateIcons [n].name)));
+            new QPixmap (qPixmapFromMimeSource (vmStateIcons [n].name)));
     }
 
     // online/offline snapshot icons
-    mOfflineSnapshotIcon = QPixmap::fromMimeSource ("offline_snapshot_16px.png");
-    mOnlineSnapshotIcon = QPixmap::fromMimeSource ("online_snapshot_16px.png");
+    mOfflineSnapshotIcon = qPixmapFromMimeSource ("offline_snapshot_16px.png");
+    mOnlineSnapshotIcon = qPixmapFromMimeSource ("online_snapshot_16px.png");
 
     // initialize state colors vector
     // no ownership of elements, we're passing pointers to existing objects
-    vm_state_color.insert (KMachineState_Null,           &Qt::red);
-    vm_state_color.insert (KMachineState_PoweredOff,     &Qt::gray);
-    vm_state_color.insert (KMachineState_Saved,          &Qt::yellow);
-    vm_state_color.insert (KMachineState_Aborted,        &Qt::darkRed);
-    vm_state_color.insert (KMachineState_Running,        &Qt::green);
-    vm_state_color.insert (KMachineState_Paused,         &Qt::darkGreen);
-    vm_state_color.insert (KMachineState_Stuck,          &Qt::darkMagenta);
-    vm_state_color.insert (KMachineState_Starting,       &Qt::green);
-    vm_state_color.insert (KMachineState_Stopping,       &Qt::green);
-    vm_state_color.insert (KMachineState_Saving,         &Qt::green);
-    vm_state_color.insert (KMachineState_Restoring,      &Qt::green);
-    vm_state_color.insert (KMachineState_Discarding,     &Qt::green);
+    vm_state_color.insert (KMachineState_Null,           new QColor(Qt::red));
+    vm_state_color.insert (KMachineState_PoweredOff,     new QColor(Qt::gray));
+    vm_state_color.insert (KMachineState_Saved,          new QColor(Qt::yellow));
+    vm_state_color.insert (KMachineState_Aborted,        new QColor(Qt::darkRed));
+    vm_state_color.insert (KMachineState_Running,        new QColor(Qt::green));
+    vm_state_color.insert (KMachineState_Paused,         new QColor(Qt::darkGreen));
+    vm_state_color.insert (KMachineState_Stuck,          new QColor(Qt::darkMagenta));
+    vm_state_color.insert (KMachineState_Starting,       new QColor(Qt::green));
+    vm_state_color.insert (KMachineState_Stopping,       new QColor(Qt::green));
+    vm_state_color.insert (KMachineState_Saving,         new QColor(Qt::green));
+    vm_state_color.insert (KMachineState_Restoring,      new QColor(Qt::green));
+    vm_state_color.insert (KMachineState_Discarding,     new QColor(Qt::green));
 
     qApp->installEventFilter (this);
@@ -3988 +3994 @@
      *  QToolButton::sizeHint()).
      */
-    QIconSet::setIconSize (QIconSet::Small, QSize (16, 16));
-    QIconSet::setIconSize (QIconSet::Large, QSize (22, 22));
+#warning port me
+//    QIcon::setIconSize (QIcon::Small, QSize (16, 16));
+//    QIcon::setIconSize (QIcon::Large, QSize (22, 22));
 
     mValid = true;
@@ -4064 +4071 @@
  *  This class provides the list of USB devices attached to the host.
  */
-VBoxUSBMenu::VBoxUSBMenu (QWidget *aParent) : QPopupMenu (aParent)
+VBoxUSBMenu::VBoxUSBMenu (QWidget *aParent) : Q3PopupMenu (aParent)
 {
     connect (this, SIGNAL (aboutToShow()),
@@ -4149 +4156 @@
 VBoxSwitchMenu::VBoxSwitchMenu (QWidget *aParent, QAction *aAction,
                                 bool aInverted)
-    : QPopupMenu (aParent), mAction (aAction), mInverted (aInverted)
+    : Q3PopupMenu (aParent), mAction (aAction), mInverted (aInverted)
 {
     /* this menu works only with toggle action */

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

@@ -25 +25 @@
 #include <qfile.h>
 #include <qtooltip.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 VBoxMediaComboBox::VBoxMediaComboBox (QWidget *aParent, const char *aName,
@@ -51 +53 @@
 
     /* in some qt themes embedded list-box is not used by default, so create it */
-    if (!listBox())
-        setListBox (new QListBox (this));
-    if (listBox())
-        connect (listBox(), SIGNAL (onItem (QListBoxItem*)),
-                 this, SLOT (processOnItem (QListBoxItem*)));
+#warning port me
+//    if (!listBox())
+//        setListBox (new Q3ListBox (this));
+//    if (listBox())
+//        connect (listBox(), SIGNAL (onItem (Q3ListBoxItem*)),
+//                 this, SLOT (processOnItem (Q3ListBoxItem*)));
 
     /* cache pixmaps as class members */
@@ -237 +240 @@
 }
 
-void VBoxMediaComboBox::processOnItem (QListBoxItem* aItem)
+void VBoxMediaComboBox::processOnItem (Q3ListBoxItem* aItem)
 {
     /* combobox item's tooltip attaching */
-    int index = listBox()->index (aItem);
-    QToolTip::remove (listBox()->viewport());
-    QToolTip::add (listBox()->viewport(), mTipList [index]);
+#warning port me
+//    int index = listBox()->index (aItem);
+//    QToolTip::remove (listBox()->viewport());
+//    QToolTip::add (listBox()->viewport(), mTipList [index]);
 }
 

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

@@ -19 +19 @@
 #include <VBoxNetworkFramework.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QEvent>
 
 /* These notifications are used to notify the GUI thread about different

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

@@ -28 +28 @@
 
 #include <qmessagebox.h>
-#include <qprogressdialog.h>
+#include <q3progressdialog.h>
 #include <qcursor.h>
-#include <qprocess.h>
+#include <q3process.h>
 #include <qeventloop.h>
 #include <qregexp.h>
@@ -36 +36 @@
 # include <qpushbutton.h>
 #endif
+//Added by qt3to4:
+#include <QTimerEvent>
+#include <Q3CString>
+#include <QCloseEvent>
 
 #include <iprt/err.h>
@@ -59 +63 @@
  *        is destroyed.
  */
-class VBoxProgressDialog : public QProgressDialog
+class VBoxProgressDialog : public Q3ProgressDialog
 {
 public:
@@ -66 +70 @@
                         int aMinDuration = 2000, QWidget *aCreator = 0,
                         const char *aName = 0)
-        : QProgressDialog (aCreator, aName, true,
-                           WStyle_Customize | WStyle_DialogBorder | WStyle_Title)
+        : Q3ProgressDialog (aCreator, aName, true,
+                           Qt::WStyle_Customize | Qt::WStyle_DialogBorder | Qt::WStyle_Title)
         , mProgress (aProgress)
         , mCalcelEnabled (true)
@@ -100 +104 @@
     virtual void timerEvent (QTimerEvent *e);
 
-    virtual void reject() { if (mCalcelEnabled) QProgressDialog::reject(); };
+    virtual void reject() { if (mCalcelEnabled) Q3ProgressDialog::reject(); };
 
     virtual void closeEvent (QCloseEvent *e)
     {
         if (mCalcelEnabled)
-            QProgressDialog::closeEvent (e);
+            Q3ProgressDialog::closeEvent (e);
         else
             e->ignore();
@@ -129 +133 @@
     if (mProgress.isOk())
     {
+#warning port me
         /* start a refresh timer */
-        startTimer (aRefreshInterval);
-        mLoopLevel = qApp->eventLoop()->loopLevel();
-        /* enter the modal loop */
-        qApp->eventLoop()->enterLoop();
-        killTimers();
-        mLoopLevel = -1;
-        mEnded = false;
+//        startTimer (aRefreshInterval);
+//        mLoopLevel = qApp->eventLoop()->loopLevel();
+//        /* enter the modal loop */
+//        qApp->eventLoop()->enterLoop();
+//        killTimers();
+//        mLoopLevel = -1;
+//        mEnded = false;
         return result();
     }
@@ -165 +170 @@
         if (mLoopLevel != -1)
         {
-            /* we've entered the loop in run() */
-            if (mLoopLevel + 1 == qApp->eventLoop()->loopLevel())
-            {
-                /* it's our loop, exit it */
-                qApp->eventLoop()->exitLoop();
-            }
-            else
-            {
-                Assert (mLoopLevel + 1 < qApp->eventLoop()->loopLevel());
-                /* restart the timer to watch for the loop level to drop */
-                if (justEnded)
-                    startTimer (50);
-            }
+#warning port me
+//            /* we've entered the loop in run() */
+//            if (mLoopLevel + 1 == qApp->eventLoop()->loopLevel())
+//            {
+//                /* it's our loop, exit it */
+//                qApp->eventLoop()->exitLoop();
+//            }
+//            else
+//            {
+//                Assert (mLoopLevel + 1 < qApp->eventLoop()->loopLevel());
+//                /* restart the timer to watch for the loop level to drop */
+//                if (justEnded)
+//                    startTimer (50);
+//            }
         }
         else
@@ -349 +355 @@
         box->setButtonText (2, aText3);
 
-    if (aDetails)
+    if (!aDetails.isEmpty())
     {
         box->setDetailsText (aDetails);
@@ -409 +415 @@
     int aMinDuration)
 {
-    QApplication::setOverrideCursor (QCursor (WaitCursor));
+    QApplication::setOverrideCursor (QCursor (Qt::WaitCursor));
 
     VBoxProgressDialog progressDlg (aProgress, aTitle, aMinDuration,
@@ -1764 +1770 @@
     //  - add common buttons like Retry/Save/PowerOff/whatever
 
-    QCString autoConfimId = "showRuntimeError.";
+    Q3CString autoConfimId = "showRuntimeError.";
 
     CConsole console = aConsole;
@@ -1870 +1876 @@
     QString formatted;
 
-    if (aInfo.text())
+    if (!aInfo.text().isEmpty())
         formatted += QString ("<table bgcolor=#FFFFFF border=0 cellspacing=0 "
                               "cellpadding=0 width=100%>"
@@ -1926 +1932 @@
         {
             QString s = aInfo.interfaceID();
-            if (aInfo.interfaceName())
+            if (!aInfo.interfaceName().isEmpty())
                 s = aInfo.interfaceName() + ' ' + s;
             formatted += QString ("<tr><td>%1</td><td>%2</td></tr>")
@@ -1935 +1941 @@
         {
             QString s = aInfo.calleeIID();
-            if (aInfo.calleeName())
+            if (!aInfo.calleeName().isEmpty())
                 s = aInfo.calleeName() + ' ' + s;
             formatted += QString ("<tr><td>%1</td><td>%2</td></tr>")
@@ -2013 +2019 @@
 
     QString fullProgPath = QString(szDocsPath);
-    QProcess kchmViewer (QString(szViewerPath) + "/kchmviewer");
+    Q3Process kchmViewer (QString(szViewerPath) + "/kchmviewer");
     kchmViewer.addArgument (fullProgPath + "/VirtualBox.chm");
-    kchmViewer.launch ("");
+    kchmViewer.launch (QString(""));
 #elif defined (Q_WS_MAC)
-    QProcess openApp (QString("/usr/bin/open"));
+    Q3Process openApp (QString("/usr/bin/open"));
     openApp.addArgument (qApp->applicationDirPath() + "/UserManual.pdf");
     openApp.launch ("");

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

@@ -31 +31 @@
 
 #include <qlabel.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 #include <qmenubar.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qmessagebox.h>
-#include <qwidgetlist.h>
+#include <qwidget.h>
 #include <qtabwidget.h>
-#include <qwidgetstack.h>
-#include <qbutton.h>
-#include <qprocess.h>
+#include <q3widgetstack.h>
+#include <qpushbutton.h>
+#include <q3process.h>
 
 #include <qlayout.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QDesktopWidget>
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <q3mimefactory.h>
+#include <QResizeEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QMenuItem>
 
 #ifdef Q_WS_X11
@@ -56 +65 @@
  *  and another one for inaccessibility errors.
  */
-class VBoxVMDetailsView : public QWidgetStack
+class VBoxVMDetailsView : public Q3WidgetStack
 {
     Q_OBJECT
@@ -106 +115 @@
     void createErrPage();
 
-    QTextBrowser *mDetailsText;
+    Q3TextBrowser *mDetailsText;
 
     QWidget *mErrBox;
     QLabel *mErrLabel;
-    QTextBrowser *mErrText;
+    Q3TextBrowser *mErrText;
     QToolButton *mRefreshButton;
     QAction *mRefreshAction;
@@ -117 +126 @@
 VBoxVMDetailsView::VBoxVMDetailsView (QWidget *aParent, const char *aName,
                                       QAction *aRefreshAction /* = NULL */)
-    : QWidgetStack (aParent, aName)
+    : Q3WidgetStack (aParent, aName)
     , mErrBox (NULL), mErrLabel (NULL), mErrText (NULL)
     , mRefreshButton (NULL)
@@ -126 +135 @@
     /* create normal details page */
 
-    mDetailsText = new QTextBrowser (mErrBox);
-    mDetailsText->setFocusPolicy (QWidget::StrongFocus);
+    mDetailsText = new Q3TextBrowser (mErrBox);
+    mDetailsText->setFocusPolicy (Qt::StrongFocus);
     mDetailsText->setLinkUnderline (false);
     /* make "transparent" */
-    mDetailsText->setFrameShape (QFrame::NoFrame);
+    mDetailsText->setFrameShape (Q3Frame::NoFrame);
     mDetailsText->setPaper (backgroundBrush());
 
@@ -148 +157 @@
     mErrBox = new QWidget();
 
-    QVBoxLayout *layout = new QVBoxLayout (mErrBox);
+    Q3VBoxLayout *layout = new Q3VBoxLayout (mErrBox);
     layout->setSpacing (10);
 
     mErrLabel = new QLabel (mErrBox);
-    mErrLabel->setAlignment (WordBreak);
+    mErrLabel->setAlignment (Qt::WordBreak);
     mErrLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
     layout->add (mErrLabel);
 
-    mErrText = new QTextBrowser (mErrBox);
-    mErrText->setFocusPolicy (QWidget::StrongFocus);
+    mErrText = new Q3TextBrowser (mErrBox);
+    mErrText->setFocusPolicy (Qt::StrongFocus);
     mErrText->setLinkUnderline (false);
     layout->add (mErrText);
@@ -164 +173 @@
     {
         mRefreshButton = new QToolButton (mErrBox);
-        mRefreshButton->setFocusPolicy (QWidget::StrongFocus);
-
-        QHBoxLayout *hLayout = new QHBoxLayout (layout);
+        mRefreshButton->setFocusPolicy (Qt::StrongFocus);
+
+        Q3HBoxLayout *hLayout = new Q3HBoxLayout (layout);
         hLayout->addItem (new QSpacerItem (0, 0, QSizePolicy::Expanding,
                                                  QSizePolicy::Minimum));
@@ -235 +244 @@
     VBoxSelectorWnd *mParent;
     QToolButton *mBtnEdit;
-    QTextBrowser *mBrowser;
+    Q3TextBrowser *mBrowser;
     QLabel *mLabel;
 };
@@ -246 +255 @@
 {
     /* main layout */
-    QVBoxLayout *mainLayout = new QVBoxLayout (this, 0, 10, "mainLayout");
+    Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 0, 10, "mainLayout");
 
     /* mBrowser */
-    mBrowser = new QTextBrowser (this, "mBrowser");
+    mBrowser = new Q3TextBrowser (this, "mBrowser");
     mBrowser->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
-    mBrowser->setFocusPolicy (QWidget::StrongFocus);
+    mBrowser->setFocusPolicy (Qt::StrongFocus);
     mBrowser->setLinkUnderline (false);
     mainLayout->addWidget (mBrowser);
@@ -260 +269 @@
     mLabel->setFrameStyle (mBrowser->frameStyle());
     mLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Expanding);
-    mLabel->setAlignment (AlignCenter | WordBreak);
+    mLabel->setAlignment (Qt::AlignCenter | Qt::WordBreak);
     mainLayout->addWidget (mLabel);
     /* always disabled */
@@ -266 +275 @@
 
     /* button layout */
-    QHBoxLayout *btnLayout = new QHBoxLayout (mainLayout, 10, "btnLayout");
+    Q3HBoxLayout *btnLayout = new Q3HBoxLayout (mainLayout, 10, "btnLayout");
     btnLayout->addItem (new QSpacerItem (0, 0,
                                          QSizePolicy::Expanding,
@@ -274 +283 @@
     mBtnEdit = new QToolButton (this, "mBtnEdit");
     mBtnEdit->setSizePolicy (QSizePolicy::Preferred, QSizePolicy::Fixed);
-    mBtnEdit->setFocusPolicy (QWidget::StrongFocus);
+    mBtnEdit->setFocusPolicy (Qt::StrongFocus);
     mBtnEdit->setIconSet (VBoxGlobal::iconSet ("edit_description_16px.png",
                                                "edit_description_disabled_16px.png"));
@@ -379 +388 @@
 VBoxSelectorWnd::
 VBoxSelectorWnd (VBoxSelectorWnd **aSelf, QWidget* aParent, const char* aName,
-                 WFlags aFlags)
-    : QMainWindow (aParent, aName, aFlags)
+                 Qt::WFlags aFlags)
+    : Q3MainWindow (aParent, aName, aFlags)
     , doneInaccessibleWarningOnce (false)
 {
@@ -389 +398 @@
 
     /* application icon */
-    setIcon (QPixmap::fromMimeSource ("ico40x01.png"));
+    setIcon (qPixmapFromMimeSource ("ico40x01.png"));
 
     /* actions */
@@ -449 +458 @@
     /* central widget & horizontal layout */
     setCentralWidget (new QWidget (this, "centralWidget"));
-    QHBoxLayout *centralLayout =
-        new QHBoxLayout (centralWidget(), 5, 9, "centralLayout");
+    Q3HBoxLayout *centralLayout =
+        new Q3HBoxLayout (centralWidget(), 5, 9, "centralLayout");
 
     /* left vertical box */
-    QVBox *leftVBox = new QVBox (centralWidget(), "leftWidget");
+    Q3VBox *leftVBox = new Q3VBox (centralWidget(), "leftWidget");
     leftVBox->setSpacing (5);
     /* right vertical box */
-    QVBox *rightVBox = new QVBox (centralWidget(), "rightWidget");
+    Q3VBox *rightVBox = new Q3VBox (centralWidget(), "rightWidget");
     rightVBox->setSpacing (5);
     centralLayout->addWidget (leftVBox, 3);
@@ -511 +520 @@
     /* add actions to menubar */
 
-    QPopupMenu *fileMenu = new QPopupMenu(this, "fileMenu");
+    Q3PopupMenu *fileMenu = new Q3PopupMenu(this, "fileMenu");
     fileDiskMgrAction->addTo( fileMenu );
     fileMenu->insertSeparator();
@@ -520 +529 @@
     menuBar()->insertItem( QString::null, fileMenu, 1);
 
-    QPopupMenu *vmMenu = new QPopupMenu (this, "vmMenu");
+    Q3PopupMenu *vmMenu = new Q3PopupMenu (this, "vmMenu");
     vmNewAction->addTo (vmMenu);
     vmMenu->insertSeparator();
@@ -537 +546 @@
     menuBar()->insertItem (QString::null, vmMenu, 2);
 
-    mVMCtxtMenu = new QPopupMenu (this, "mVMCtxtMenu");
+    mVMCtxtMenu = new Q3PopupMenu (this, "mVMCtxtMenu");
     vmConfigAction->addTo (mVMCtxtMenu);
     vmDeleteAction->addTo (mVMCtxtMenu);
@@ -550 +559 @@
     vmShowLogsAction->addTo (mVMCtxtMenu);
 
-    QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
+    Q3PopupMenu *helpMenu = new Q3PopupMenu( this, "helpMenu" );
     helpContentsAction->addTo (helpMenu);
     helpWebAction->addTo (helpMenu);
@@ -610 +619 @@
     }
 
-    clearWState (WState_Polished);
+#warning port me
+//    clearWState (WState_Polished);
 
     /* signals and slots connections */
@@ -638 +648 @@
              &vboxProblem(), SLOT (resetSuppressedMessages()));
 
-    connect (vmListBox, SIGNAL (currentChanged(QListBoxItem *)),
+    connect (vmListBox, SIGNAL (currentChanged(Q3ListBoxItem *)),
              this, SLOT (vmListBoxCurrentChanged()));
-    connect (vmListBox, SIGNAL (selected (QListBoxItem *)),
+    connect (vmListBox, SIGNAL (selected (Q3ListBoxItem *)),
              this, SLOT (vmStart()));
-    connect (vmListBox, SIGNAL (contextMenuRequested (QListBoxItem *, const QPoint &)),
-             this, SLOT (showContextMenu (QListBoxItem *, const QPoint &)));
+    connect (vmListBox, SIGNAL (contextMenuRequested (Q3ListBoxItem *, const QPoint &)),
+             this, SLOT (showContextMenu (Q3ListBoxItem *, const QPoint &)));
 
     connect (vmDetailsView, SIGNAL (linkClicked (const QString &)),
@@ -687 +697 @@
     /* save vm selector position */
     {
-        QListBoxItem *item = vmListBox->selectedItem();
+        Q3ListBoxItem *item = vmListBox->selectedItem();
         QString curVMId = item ?
             QString (static_cast<VBoxVMListBoxItem*> (item)->id()) :
@@ -1054 +1064 @@
 }
 
-void VBoxSelectorWnd::showContextMenu (QListBoxItem *aItem, const QPoint &aPoint)
+void VBoxSelectorWnd::showContextMenu (Q3ListBoxItem *aItem, const QPoint &aPoint)
 {
     if (aItem)
@@ -1074 +1084 @@
         {
             QResizeEvent *re = (QResizeEvent *) e;
-            if ((windowState() & (WindowMaximized | WindowMinimized |
-                                  WindowFullScreen)) == 0)
+            if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
+                                  Qt::WindowFullScreen)) == 0)
                 normal_size = re->size();
             break;
@@ -1081 +1091 @@
         case QEvent::Move:
         {
-            if ((windowState() & (WindowMaximized | WindowMinimized |
-                                  WindowFullScreen)) == 0)
+            if ((windowState() & (Qt::WindowMaximized | Qt::WindowMinimized |
+                                  Qt::WindowFullScreen)) == 0)
                 normal_pos = pos();
             break;
@@ -1096 +1106 @@
     }
 
-    return QMainWindow::event (e);
+    return Q3MainWindow::event (e);
 }
 

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

@@ -29 +29 @@
 
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <q3mimefactory.h>
+#include <QFocusEvent>
 
 #if defined (Q_WS_MAC)
@@ -140 +144 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-class VBoxVMListBoxTip : public QToolTip
-{
-public:
-
-    VBoxVMListBoxTip (VBoxVMListBox *aLB, QToolTipGroup *aTG = 0)
-        : QToolTip (aLB, aTG)
-    {}
-
-    virtual ~VBoxVMListBoxTip()
-    {
-        remove (parentWidget());
-    }
-
-    void maybeTip (const QPoint &aPnt);
-};
-
-void VBoxVMListBoxTip::maybeTip (const QPoint &aPnt)
-{
-    const VBoxVMListBox *lb = static_cast <VBoxVMListBox *> (parentWidget());
-
-    VBoxVMListBoxItem *vmi = static_cast <VBoxVMListBoxItem *> (lb->itemAt (aPnt));
-    if (!vmi)
-        return;
-
-    if (parentWidget()->topLevelWidget()->inherits ("QMainWindow"))
-    {
-        /*
-         *  Ensure the main window doesn't show the text from the previous
-         *  tooltip in the status bar.
-         */
-        QToolTipGroup *toolTipGroup =
-            (::qt_cast <QMainWindow *> (parentWidget()->topLevelWidget()))->
-                toolTipGroup();
-        if (toolTipGroup)
-        {
-            int index = toolTipGroup->metaObject()->findSignal("removeTip()", false);
-            toolTipGroup->qt_emit (index, 0);
-        }
-    }
-
-    tip (lb->itemRect (vmi), vmi->toolTipText());
-}
+#warning port me
+//class VBoxVMListBoxTip : public QToolTip
+//{
+//public:
+//
+//    VBoxVMListBoxTip (VBoxVMListBox *aLB, QToolTipGroup *aTG = 0)
+//        : QToolTip (aLB, aTG)
+//    {}
+//
+//    virtual ~VBoxVMListBoxTip()
+//    {
+//        remove (parentWidget());
+//    }
+//
+//    void maybeTip (const QPoint &aPnt);
+//};
+//
+//void VBoxVMListBoxTip::maybeTip (const QPoint &aPnt)
+//{
+//    const VBoxVMListBox *lb = static_cast <VBoxVMListBox *> (parentWidget());
+//
+//    VBoxVMListBoxItem *vmi = static_cast <VBoxVMListBoxItem *> (lb->itemAt (aPnt));
+//    if (!vmi)
+//        return;
+//
+//    if (parentWidget()->topLevelWidget()->inherits ("QMainWindow"))
+//    {
+//        /*
+//         *  Ensure the main window doesn't show the text from the previous
+//         *  tooltip in the status bar.
+//         */
+//        QToolTipGroup *toolTipGroup =
+//            (::qt_cast <Q3MainWindow *> (parentWidget()->topLevelWidget()))->
+//                toolTipGroup();
+//        if (toolTipGroup)
+//        {
+//            int index = toolTipGroup->metaObject()->findSignal("removeTip()", false);
+//            toolTipGroup->qt_emit (index, 0);
+//        }
+//    }
+//
+//    tip (lb->itemRect (vmi), vmi->toolTipText());
+//}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -193 +198 @@
 VBoxVMListBox::
 VBoxVMListBox (QWidget *aParent /* = 0 */, const char *aName /* = NULL */,
-               WFlags aFlags /* = 0 */)
-    : QListBox (aParent, aName, aFlags)
+               Qt::WFlags aFlags /* = 0 */)
+    : Q3ListBox (aParent, aName, aFlags)
 {
     mVBox = vboxGlobal().virtualBox();
@@ -205 +210 @@
     mMargin = QMAX (fontMetrics().width (' ') * 2, 8);
 
-    mToolTip = new VBoxVMListBoxTip (this);
+#warning port me
+//    mToolTip = new VBoxVMListBoxTip (this);
 
     mGaveFocusToPopup = false;
@@ -214 +220 @@
 VBoxVMListBox::~VBoxVMListBox()
 {
-    delete mToolTip;
+#warning port me
+//    delete mToolTip;
 }
 
@@ -244 +251 @@
     for (uint i = 0; i < count(); i++)
     {
-        VBoxVMListBoxItem *vmi = (VBoxVMListBoxItem *) QListBox::item (i);
+        VBoxVMListBoxItem *vmi = (VBoxVMListBoxItem *) Q3ListBox::item (i);
         if (vmi->id() == aID)
         {
@@ -263 +270 @@
     for (uint i = 0; i < count(); i++)
     {
-        VBoxVMListBoxItem *vmi = (VBoxVMListBoxItem *) QListBox::item (i);
+        VBoxVMListBoxItem *vmi = (VBoxVMListBoxItem *) Q3ListBox::item (i);
         if (vmi->id() == aID)
             return vmi;
@@ -285 +292 @@
      * Here is a modified extract from qlistbox.cpp: */
 
-    bool drawActiveSelection =
-        !style().styleHint (QStyle::SH_ItemView_ChangeHighlightOnFocus, this) ||
-        hasFocus() ||
-        mGaveFocusToPopup;
-
-    return (drawActiveSelection ? colorGroup() : palette().inactive());
+#warning port me
+//    bool drawActiveSelection =
+//        !style().styleHint (QStyle::SH_ItemView_ChangeHighlightOnFocus, this) ||
+//        hasFocus() ||
+//        mGaveFocusToPopup;
+//
+//    return (drawActiveSelection ? colorGroup() : palette().inactive());
+    return colorGroup();
 }
 
@@ -299 +308 @@
 {
     mGaveFocusToPopup = false;
-    QListBox::focusInEvent (aE);
+    Q3ListBox::focusInEvent (aE);
 }
 
@@ -306 +315 @@
     /* A modified extract from qlistbox.cpp (see #activeColorGroup()): */
     mGaveFocusToPopup =
-        QFocusEvent::reason() == QFocusEvent::Popup ||
+#warning port me: check this
+        aE->reason() == QFocusEvent::Popup ||
+//        QFocusEvent::reason() == QFocusEvent::Popup ||
         (qApp->focusWidget() && qApp->focusWidget()->inherits ("QMenuBar"));
-    QListBox::focusOutEvent (aE);
+    Q3ListBox::focusOutEvent (aE);
 }
 
@@ -319 +330 @@
 
 VBoxVMListBoxItem::VBoxVMListBoxItem (VBoxVMListBox *aLB, const CMachine &aM)
-    : QListBoxItem (aLB), mMachine (aM)
+    : Q3ListBoxItem (aLB), mMachine (aM)
 {
     recache();
@@ -443 +454 @@
 }
 
-int VBoxVMListBoxItem::width (const QListBox *) const
+int VBoxVMListBoxItem::width (const Q3ListBox *) const
 {
     /* see the picture below for dimensions */
@@ -467 +478 @@
     {
         /// @todo (r=dmik) temporary
-        pmOSType = QPixmap::fromMimeSource ("os_other.png");
-        pmState = QPixmap::fromMimeSource ("state_aborted_16px.png");
+        pmOSType = qPixmapFromMimeSource ("os_other.png");
+        pmState = qPixmapFromMimeSource ("state_aborted_16px.png");
         strState = VBoxVMListBox::tr ("Inaccessible");
     }
@@ -482 +493 @@
 }
 
-int VBoxVMListBoxItem::height (const QListBox *) const
+int VBoxVMListBoxItem::height (const Q3ListBox *) const
 {
     /* see the picture below for dimensions */
@@ -503 +514 @@
     {
         /// @todo (r=dmik) temporary
-        pmOSType = QPixmap::fromMimeSource ("os_other.png");
-        pmState = QPixmap::fromMimeSource ("state_aborted_16px.png");
+        pmOSType = qPixmapFromMimeSource ("os_other.png");
+        pmState = qPixmapFromMimeSource ("state_aborted_16px.png");
     }
 
@@ -685 +696 @@
     {
         /// @todo (r=dmik) temporary
-        pmOSType = QPixmap::fromMimeSource ("os_other.png");
-        pmState = QPixmap::fromMimeSource ("state_aborted_16px.png");
+        pmOSType = qPixmapFromMimeSource ("os_other.png");
+        pmState = qPixmapFromMimeSource ("state_aborted_16px.png");
         strState = VBoxVMListBox::tr ("Inaccessible");
     }

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

@@ +1 @@
+//Added by qt3to4:
+#include <QMouseEvent>
 /**
  *

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

@@ -496 +496 @@
     <include location="global" impldecl="in implementation">qapplication.h</include>
     <include location="global" impldecl="in implementation">qprogressdialog.h</include>
-    <include location="global" impldecl="in implementation">qfocusdata.h</include>
     <include location="global" impldecl="in implementation">qobjectlist.h</include>
     <include location="global" impldecl="in implementation">qdragobject.h</include>

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

@@ +1 @@
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <QCloseEvent>
+#include <Q3GridLayout>
+#include <QShowEvent>
+#include <q3mimefactory.h>
+#include <QDragEnterEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <Q3Frame>
+#include <QDropEvent>
+#include <QCustomEvent>
+#include <Q3PopupMenu>
+#include <QMenuBar>
+#include <QMenuItem>
 /**
  *
@@ -27 +45 @@
 
 
-class DiskImageItem : public QListViewItem
+class DiskImageItem : public Q3ListViewItem
 {
 public:
@@ -34 +52 @@
 
     DiskImageItem (DiskImageItem *parent) :
-        QListViewItem (parent), mStatus (VBoxMedia::Unknown) {}
-
-    DiskImageItem (QListView *parent) :
-        QListViewItem (parent), mStatus (VBoxMedia::Unknown) {}
+        Q3ListViewItem (parent), mStatus (VBoxMedia::Unknown) {}
+
+    DiskImageItem (Q3ListView *parent) :
+        Q3ListViewItem (parent), mStatus (VBoxMedia::Unknown) {}
 
     void setMedia (const VBoxMedia &aMedia) { mMedia = aMedia; }
@@ -100 +118 @@
     int rtti() const { return TypeId; }
 
-    int compare (QListViewItem *aItem, int aColumn, bool aAscending) const
+    int compare (Q3ListViewItem *aItem, int aColumn, bool aAscending) const
     {
         ULONG64 thisValue = vboxGlobal().parseSize (       text (aColumn));
@@ -112 +130 @@
         }
         else
-            return QListViewItem::compare (aItem, aColumn, aAscending);
+            return Q3ListViewItem::compare (aItem, aColumn, aAscending);
     }
 
     DiskImageItem* nextSibling() const
     {
-        return (QListViewItem::nextSibling() &&
-                QListViewItem::nextSibling()->rtti() == DiskImageItem::TypeId) ?
-                static_cast<DiskImageItem*> (QListViewItem::nextSibling()) : 0;
+        return (Q3ListViewItem::nextSibling() &&
+                Q3ListViewItem::nextSibling()->rtti() == DiskImageItem::TypeId) ?
+                static_cast<DiskImageItem*> (Q3ListViewItem::nextSibling()) : 0;
     }
 
@@ -128 +146 @@
         if (mStatus == VBoxMedia::Unknown)
             cGroup.setColor (QColorGroup::Text, cGroup.mid());
-        QListViewItem::paintCell (aPainter, cGroup, aColumn, aWidth, aSlign);
+        Q3ListViewItem::paintCell (aPainter, cGroup, aColumn, aWidth, aSlign);
     }
 
@@ -154 +172 @@
 
 
-class DiskImageItemIterator : public QListViewItemIterator
+class DiskImageItemIterator : public Q3ListViewItemIterator
 {
 public:
 
-    DiskImageItemIterator (QListView* aList)
-        : QListViewItemIterator (aList) {}
+    DiskImageItemIterator (Q3ListView* aList)
+        : Q3ListViewItemIterator (aList) {}
 
     DiskImageItem* operator*()
     {
-        QListViewItem *item = QListViewItemIterator::operator*();
+        Q3ListViewItem *item = Q3ListViewItemIterator::operator*();
         return item && item->rtti() == DiskImageItem::TypeId ?
             static_cast<DiskImageItem*> (item) : 0;
@@ -170 +188 @@
     DiskImageItemIterator& operator++()
     {
-        return (DiskImageItemIterator&) QListViewItemIterator::operator++();
+        return (DiskImageItemIterator&) Q3ListViewItemIterator::operator++();
     }
 };
@@ -200 +218 @@
             new VBoxDiskImageManagerDlg (NULL,
                                          "VBoxDiskImageManagerDlg",
-                                         WType_TopLevel | WDestructiveClose);
+                                         Qt::WType_TopLevel | Qt::WDestructiveClose);
         mModelessDialog->setup (VBoxDefs::HD | VBoxDefs::CD | VBoxDefs::FD,
                                 false, NULL, aRefresh);
@@ -218 +236 @@
     mModelessDialog->show();
     mModelessDialog->setWindowState (mModelessDialog->windowState() &
-                                     ~WindowMinimized);
+                                     ~Qt::WindowMinimized);
     mModelessDialog->setActiveWindow();
 }
@@ -234 +252 @@
     Assert (!vbox.isNull());
 
-    setIcon (QPixmap::fromMimeSource ("diskim_16px.png"));
+    setIcon (qPixmapFromMimeSource ("diskim_16px.png"));
 
     type = VBoxDefs::InvalidType;
@@ -278 +296 @@
     cdsView->setShowToolTips (false);
     fdsView->setShowToolTips (false);
-    connect (hdsView, SIGNAL (onItem (QListViewItem*)),
-             this, SLOT (mouseOnItem(QListViewItem*)));
-    connect (cdsView, SIGNAL (onItem (QListViewItem*)),
-             this, SLOT (mouseOnItem(QListViewItem*)));
-    connect (fdsView, SIGNAL (onItem (QListViewItem*)),
-             this, SLOT (mouseOnItem(QListViewItem*)));
+    connect (hdsView, SIGNAL (onItem (Q3ListViewItem*)),
+             this, SLOT (mouseOnItem(Q3ListViewItem*)));
+    connect (cdsView, SIGNAL (onItem (Q3ListViewItem*)),
+             this, SLOT (mouseOnItem(Q3ListViewItem*)));
+    connect (fdsView, SIGNAL (onItem (Q3ListViewItem*)),
+             this, SLOT (mouseOnItem(Q3ListViewItem*)));
 
 
@@ -293 +311 @@
 
     /* context menu composing */
-    itemMenu = new QPopupMenu (this, "itemMenu");
+    itemMenu = new Q3PopupMenu (this, "itemMenu");
 
     imNewAction = new QAction (this, "imNewAction");
@@ -340 +358 @@
     toolBar = new VBoxToolBar (this, centralWidget(), "toolBar");
     toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Minimum);
-    ((QVBoxLayout*)centralWidget()->layout())->insertWidget(0, toolBar);
+    ((Q3VBoxLayout*)centralWidget()->layout())->insertWidget(0, toolBar);
 
     toolBar->setUsesTextLabel (true);
@@ -359 +377 @@
 
     /* menu bar */
-    QPopupMenu *actionMenu = new QPopupMenu (this, "actionMenu");
+    Q3PopupMenu *actionMenu = new Q3PopupMenu (this, "actionMenu");
     imNewAction->addTo    (actionMenu);
     imAddAction->addTo    (actionMenu);
@@ -380 +398 @@
     qApp->installEventFilter (this);
     /* setup information pane layouts */
-    QGridLayout *hdsContainerLayout = new QGridLayout (hdsContainer, 4, 4);
+    Q3GridLayout *hdsContainerLayout = new Q3GridLayout (hdsContainer, 4, 4);
     hdsContainerLayout->setMargin (10);
-    QGridLayout *cdsContainerLayout = new QGridLayout (cdsContainer, 2, 4);
+    Q3GridLayout *cdsContainerLayout = new Q3GridLayout (cdsContainer, 2, 4);
     cdsContainerLayout->setMargin (10);
-    QGridLayout *fdsContainerLayout = new QGridLayout (fdsContainer, 2, 4);
+    Q3GridLayout *fdsContainerLayout = new Q3GridLayout (fdsContainer, 2, 4);
     fdsContainerLayout->setMargin (10);
     /* create info-pane for hd list-view */
@@ -403 +421 @@
     mProgressText = new QLabel (centralWidget());
     mProgressText->setHidden (true);
-    buttonLayout->insertWidget (2, mProgressText);
-    mProgressBar = new QProgressBar (centralWidget());
+#warning port me
+//    buttonLayout->insertWidget (2, mProgressText);
+    mProgressBar = new Q3ProgressBar (centralWidget());
     mProgressBar->setHidden (true);
-    mProgressBar->setFrameShadow (QFrame::Sunken);
-    mProgressBar->setFrameShape  (QFrame::Panel);
+    mProgressBar->setFrameShadow (Q3Frame::Sunken);
+    mProgressBar->setFrameShape  (Q3Frame::Panel);
     mProgressBar->setPercentageVisible (false);
     mProgressBar->setMaximumWidth (100);
-    buttonLayout->insertWidget (3, mProgressBar);
+#warning port me
+//    buttonLayout->insertWidget (3, mProgressBar);
 
 
@@ -476 +496 @@
 
     /* Setup focus policy <strong> default for info pane */
-    aInfo->setFocusPolicy (QWidget::StrongFocus);
+    aInfo->setFocusPolicy (Qt::StrongFocus);
 
     /* prevent the name columns from being expanded */
@@ -483 +503 @@
     if (aColumn == -1)
     {
-        ((QGridLayout *) aRoot->layout())->addWidget (nameLabel, aRow, 0);
-        ((QGridLayout *) aRoot->layout())->
+        ((Q3GridLayout *) aRoot->layout())->addWidget (nameLabel, aRow, 0);
+        ((Q3GridLayout *) aRoot->layout())->
             addMultiCellWidget (aInfo, aRow, aRow,
-                                1, ((QGridLayout *) aRoot->layout())->numCols() - 1);
+                                1, ((Q3GridLayout *) aRoot->layout())->numCols() - 1);
     }
     else
     {
-        ((QGridLayout *) aRoot->layout())->addWidget (nameLabel, aRow, aColumn * 2);
-        ((QGridLayout *) aRoot->layout())->addWidget (aInfo, aRow, aColumn * 2 + 1);
+        ((Q3GridLayout *) aRoot->layout())->addWidget (nameLabel, aRow, aColumn * 2);
+        ((Q3GridLayout *) aRoot->layout())->addWidget (aInfo, aRow, aColumn * 2 + 1);
     }
 }
@@ -498 +518 @@
 void VBoxDiskImageManagerDlg::showEvent (QShowEvent *e)
 {
-    QMainWindow::showEvent (e);
+    Q3MainWindow::showEvent (e);
 
     /* one may think that QWidget::polish() is the right place to do things
@@ -515 +535 @@
 
 
-void VBoxDiskImageManagerDlg::mouseOnItem (QListViewItem *aItem)
-{
-    QListView *currentList = getCurrentListView();
+void VBoxDiskImageManagerDlg::mouseOnItem (Q3ListViewItem *aItem)
+{
+    Q3ListView *currentList = getCurrentListView();
     QString tip;
     switch (aItem->rtti())
@@ -548 +568 @@
 {
     if ( aEvent->state() == 0 ||
-         (aEvent->state() & Keypad && aEvent->key() == Key_Enter) )
+         (aEvent->state() & Qt::KeypadModifier && aEvent->key() == Qt::Key_Enter) )
     {
         switch ( aEvent->key() )
         {
-            case Key_Enter:
-            case Key_Return:
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
             {
                 QPushButton *currentDefault = searchDefaultButton();
@@ -560 +580 @@
                 break;
             }
-            case Key_Escape:
+            case Qt::Key_Escape:
             {
                 reject();
@@ -575 +595 @@
 {
     QPushButton *defButton = 0;
-    QObjectList *list = queryList ("QPushButton");
-    QObjectListIt it (*list);
-    while ( (defButton = (QPushButton*)it.current()) && !defButton->isDefault() )
-    {
-        ++it;
+    QObjectList list = queryList ("QPushButton");
+    QListIterator<QObject*> it (list);
+    foreach(QObject *o, list)
+    {
+        defButton = qobject_cast<QPushButton*> (o);
+        if(defButton->isDefault())
+            break;
     }
     return defButton;
@@ -597 +619 @@
     show();
     mInLoop = true;
-    qApp->eventLoop()->enterLoop();
+#warning port me
+//    qApp->eventLoop()->enterLoop();
     mInLoop = false;
 
@@ -610 +633 @@
     {
         hide();
-        qApp->eventLoop()->exitLoop();
+#warning port me
+//        qApp->eventLoop()->exitLoop();
     }
     else
@@ -619 +643 @@
 
 
-QListView* VBoxDiskImageManagerDlg::getCurrentListView()
-{
-    QListView *clv = static_cast<QListView*>(twImages->currentPage()->
-        queryList("QListView")->getFirst());
+Q3ListView* VBoxDiskImageManagerDlg::getCurrentListView()
+{
+    Q3ListView *clv = static_cast<Q3ListView*>(twImages->currentPage()->
+        queryList("QListView").first());
     Assert(clv);
     return clv;
 }
 
-QListView* VBoxDiskImageManagerDlg::getListView (VBoxDefs::DiskType aType)
+Q3ListView* VBoxDiskImageManagerDlg::getListView (VBoxDefs::DiskType aType)
 {
     switch (aType)
@@ -645 +669 @@
 bool VBoxDiskImageManagerDlg::eventFilter (QObject *aObject, QEvent *aEvent)
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
 
     switch (aEvent->type())
@@ -667 +691 @@
                     static_cast<QDropEvent*>(aEvent);
                 QStringList *droppedList = new QStringList();
-                QUriDrag::decodeLocalFiles (dropEvent, *droppedList);
+                Q3UriDrag::decodeLocalFiles (dropEvent, *droppedList);
                 QCustomEvent *updateEvent = new QCustomEvent (1001);
                 updateEvent->setData (droppedList);
@@ -710 +734 @@
             break;
     }
-    return QMainWindow::eventFilter (aObject, aEvent);
+    return Q3MainWindow::eventFilter (aObject, aEvent);
 }
 
@@ -716 +740 @@
 bool VBoxDiskImageManagerDlg::event (QEvent *aEvent)
 {
-    bool result = QMainWindow::event (aEvent);
+    bool result = Q3MainWindow::event (aEvent);
     switch (aEvent->type())
     {
@@ -733 +757 @@
 void VBoxDiskImageManagerDlg::addDroppedImages (QStringList *aDroppedList)
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
 
     for (QStringList::Iterator it = (*aDroppedList).begin();
@@ -837 +861 @@
 
 
-DiskImageItem* VBoxDiskImageManagerDlg::createImageNode (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::createImageNode (Q3ListView *aList,
                                                          DiskImageItem *aRoot,
                                                          const VBoxMedia &aMedia)
@@ -856 +880 @@
 
 
-void VBoxDiskImageManagerDlg::invokePopup (QListViewItem *aItem, const QPoint & aPos, int)
+void VBoxDiskImageManagerDlg::invokePopup (Q3ListViewItem *aItem, const QPoint & aPos, int)
 {
     if (aItem)
@@ -879 +903 @@
          ++it)
     {
-        if (usage)
+        if (!usage.isEmpty())
             usage += ", ";
         CMachine machine = vbox.GetMachine (QUuid (*it));
@@ -895 +919 @@
         if (!permMachines.contains (*it))
         {
-            if (usage)
+            if (!usage.isEmpty())
                 usage += ", [";
             else
@@ -926 +950 @@
          ++it)
     {
-        if (usage)
+        if (!usage.isEmpty())
             usage += ", ";
         CMachine machine = vbox.GetMachine (QUuid (*it));
@@ -942 +966 @@
         if (!permMachines.contains (*it))
         {
-            if (usage)
+            if (!usage.isEmpty())
                 usage += ", [";
             else
@@ -968 +992 @@
         aSnapshot.GetMachine().GetDVDDrive().GetImage().GetId() == aImageId)
     {
-        if (aUsage)
+        if (!aUsage.isEmpty())
             aUsage += ", ";
         aUsage += aSnapshot.GetName();
@@ -988 +1012 @@
         aSnapshot.GetMachine().GetFloppyDrive().GetImage().GetId() == aImageId)
     {
-        if (aUsage)
+        if (!aUsage.isEmpty())
             aUsage += ", ";
         aUsage += aSnapshot.GetName();
@@ -1328 +1352 @@
 
 
-DiskImageItem* VBoxDiskImageManagerDlg::createHdItem (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::createHdItem (Q3ListView *aList,
                                                       const VBoxMedia &aMedia)
 {
@@ -1339 +1363 @@
 }
 
-DiskImageItem* VBoxDiskImageManagerDlg::createCdItem (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::createCdItem (Q3ListView *aList,
                                                       const VBoxMedia &aMedia)
 {
@@ -1347 +1371 @@
 }
 
-DiskImageItem* VBoxDiskImageManagerDlg::createFdItem (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::createFdItem (Q3ListView *aList,
                                                       const VBoxMedia &aMedia)
 {
@@ -1366 +1390 @@
     {
         aItem->setPixmap (0, pm);
-        QIconSet iconSet (pm);
+        QIcon iconSet (pm);
         QWidget *wt = aType == VBoxDefs::HD ? twImages->page (0) :
                       aType == VBoxDefs::CD ? twImages->page (1) :
@@ -1377 +1401 @@
 
 
-DiskImageItem* VBoxDiskImageManagerDlg::searchItem (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::searchItem (Q3ListView *aList,
                                                     const QUuid &aId)
 {
@@ -1392 +1416 @@
 
 
-DiskImageItem* VBoxDiskImageManagerDlg::searchItem (QListView *aList,
+DiskImageItem* VBoxDiskImageManagerDlg::searchItem (Q3ListView *aList,
                                                     VBoxMedia::Status aStatus)
 {
@@ -1643 +1667 @@
                                             const QUuid &aId)
 {
-    QListView *listView = getListView (aType);
+    Q3ListView *listView = getListView (aType);
     DiskImageItem *item = searchItem (listView, aId);
     delete item;
@@ -1654 +1678 @@
                       aType == VBoxDefs::CD ? twImages->page (1) :
                       aType == VBoxDefs::FD ? twImages->page (2) : 0;
-        const QIconSet &set = aType == VBoxDefs::HD ? pxHD :
+        const QIcon &set = aType == VBoxDefs::HD ? pxHD :
                               aType == VBoxDefs::CD ? pxCD :
-                              aType == VBoxDefs::FD ? pxFD : QIconSet();
+                              aType == VBoxDefs::FD ? pxFD : QIcon();
         Assert (wt && !set.isNull()); /* atype should be the correct one */
         twImages->changeTab (wt, set, twImages->tabLabel (wt));
@@ -1710 +1734 @@
 
     imRefreshAction->setEnabled (false);
-    setCursor (QCursor (BusyCursor));
+    setCursor (QCursor (Qt::BusyCursor));
 
     /* store the current list selections */
 
-    QListViewItem *item;
+    Q3ListViewItem *item;
     DiskImageItem *di;
 
@@ -1754 +1778 @@
     if (itemId.isNull()) return false;
 
-    QListView* parentList = aItem->listView();
+    Q3ListView* parentList = aItem->listView();
     if (parentList == hdsView)
     {
@@ -1808 +1832 @@
 
 
-void VBoxDiskImageManagerDlg::setCurrentItem (QListView *aListView,
-                                              QListViewItem *aItem)
+void VBoxDiskImageManagerDlg::setCurrentItem (Q3ListView *aListView,
+                                              Q3ListViewItem *aItem)
 {
     if (!aItem)
@@ -1821 +1845 @@
 void VBoxDiskImageManagerDlg::processCurrentChanged()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     currentList->setFocus();
 
@@ -1846 +1870 @@
 }
 
-void VBoxDiskImageManagerDlg::processCurrentChanged (QListViewItem *aItem)
+void VBoxDiskImageManagerDlg::processCurrentChanged (Q3ListViewItem *aItem)
 {
     DiskImageItem *item = aItem && aItem->rtti() == DiskImageItem::TypeId ?
@@ -1910 +1934 @@
 
 
-void VBoxDiskImageManagerDlg::processPressed (QListViewItem * aItem)
+void VBoxDiskImageManagerDlg::processPressed (Q3ListViewItem * aItem)
 {
     if (!aItem)
     {
-        QListView *currentList = getCurrentListView();
+        Q3ListView *currentList = getCurrentListView();
         currentList->setSelected (currentList->currentItem(), true);
     }
@@ -1940 +1964 @@
 void VBoxDiskImageManagerDlg::addImage()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     DiskImageItem *item =
         currentList->currentItem() &&
@@ -1950 +1974 @@
         dir = QFileInfo (item->getPath().stripWhiteSpace()).dirPath (true);
 
-    if (!dir)
+    if (dir.isEmpty())
         if (currentList == hdsView)
             dir = vbox.GetSystemProperties().GetDefaultVDIFolder();
 
-    if (!dir || !QFileInfo (dir).exists())
+    if (dir.isEmpty() || !QFileInfo (dir).exists())
         dir = vbox.GetHomeFolder();
 
@@ -2001 +2025 @@
 void VBoxDiskImageManagerDlg::removeImage()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     DiskImageItem *item =
         currentList->currentItem() &&
@@ -2078 +2102 @@
 void VBoxDiskImageManagerDlg::releaseImage()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     DiskImageItem *item =
         currentList->currentItem() &&
@@ -2217 +2241 @@
 QUuid VBoxDiskImageManagerDlg::getSelectedUuid()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     QUuid uuid;
 
@@ -2231 +2255 @@
 QString VBoxDiskImageManagerDlg::getSelectedPath()
 {
-    QListView *currentList = getCurrentListView();
+    Q3ListView *currentList = getCurrentListView();
     QString path;
 
@@ -2243 +2267 @@
 
 
-void VBoxDiskImageManagerDlg::processDoubleClick (QListViewItem*)
-{
-    QListView *currentList = getCurrentListView();
+void VBoxDiskImageManagerDlg::processDoubleClick (Q3ListViewItem*)
+{
+    Q3ListView *currentList = getCurrentListView();
 
     if (doSelect && currentList->selectedItem() && buttonOk->isEnabled())

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

@@ -1294 +1294 @@
     <include location="global" impldecl="in implementation">qobjectlist.h</include>
     <include location="global" impldecl="in implementation">qfiledialog.h</include>
-    <include location="global" impldecl="in implementation">qfocusdata.h</include>
     <include location="global" impldecl="in implementation">qtimer.h</include>
     <include location="global" impldecl="in implementation">qeventloop.h</include>

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

@@ -29 +29 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+//Added by qt3to4:
+#include <QTranslator>
+#include <QLabel>
+#include <q3mimefactory.h>
+#include <QEvent>
+#include <QShowEvent>
+#include <Q3WhatsThis>
 
 /* defined in VBoxGlobal.cpp */
@@ -41 +48 @@
  *  using the text of the first column of every item.
  */
-static QString path (QListViewItem *li)
+static QString path (Q3ListViewItem *li)
 {
     static QString sep = ": ";
     QString p;
-    QListViewItem *cur = li;
+    Q3ListViewItem *cur = li;
     while (cur)
     {
@@ -66 +73 @@
 
 
-class USBListItem : public QCheckListItem
+class USBListItem : public Q3CheckListItem
 {
 public:
 
-    USBListItem (QListView *aParent, QListViewItem *aAfter)
-        : QCheckListItem (aParent, aAfter, QString::null, CheckBox)
+    USBListItem (Q3ListView *aParent, Q3ListViewItem *aAfter)
+        : Q3CheckListItem (aParent, aAfter, QString::null, CheckBox)
         , mId (-1) {}
 
@@ -79 +86 @@
 
 
-class LanguageItem : public QListViewItem
+class LanguageItem : public Q3ListViewItem
 {
 public:
@@ -85 +92 @@
     enum { TypeId = 1001 };
 
-    LanguageItem (QListView *aParent, const QTranslator &aTranslator,
+    LanguageItem (Q3ListView *aParent, const QTranslator &aTranslator,
                   const QString &aId, bool aBuiltIn = false)
-        : QListViewItem (aParent), mBuiltIn (aBuiltIn), mInvalid (false)
+        : Q3ListViewItem (aParent), mBuiltIn (aBuiltIn), mInvalid (false)
     {
         Assert (!aId.isEmpty());
 
-        QTranslatorMessage transMes;
+//        QTranslatorMessage transMes;
 
         /* Note: context/source/comment arguments below must match strings
@@ -141 +148 @@
     /* Constructs an item for an invalid language ID (i.e. when a language
      * file is missing or corrupt). */
-    LanguageItem (QListView *aParent, const QString &aId)
-        : QListViewItem (aParent), mBuiltIn (false), mInvalid (true)
+    LanguageItem (Q3ListView *aParent, const QString &aId)
+        : Q3ListViewItem (aParent), mBuiltIn (false), mInvalid (true)
     {
         Assert (!aId.isEmpty());
@@ -154 +161 @@
     /* Constructs an item for the default language ID (column 1 will be set
      * to QString::null) */
-    LanguageItem (QListView *aParent)
-        : QListViewItem (aParent), mBuiltIn (false), mInvalid (false)
+    LanguageItem (Q3ListView *aParent)
+        : Q3ListViewItem (aParent), mBuiltIn (false), mInvalid (false)
     {
         setText (0, VBoxGlobalSettingsDlg::tr ("Default", "Language"));
@@ -167 +174 @@
     int rtti() const { return TypeId; }
 
-    int compare (QListViewItem *aItem, int aColumn, bool aAscending) const
+    int compare (Q3ListViewItem *aItem, int aColumn, bool aAscending) const
     {
         QString thisId = text (1);
@@ -179 +186 @@
         if (aItem->rtti() == TypeId && ((LanguageItem *) aItem)->mBuiltIn)
             return 1;
-        return QListViewItem::compare (aItem, aColumn, aAscending);
+        return Q3ListViewItem::compare (aItem, aColumn, aAscending);
     }
 
@@ -196 +203 @@
             aPainter->setFont (font);
 
-        QListViewItem::paintCell (aPainter, aGroup, aColumn, aWidth, aAlign);
+        Q3ListViewItem::paintCell (aPainter, aGroup, aColumn, aWidth, aAlign);
 
         if (mBuiltIn)
@@ -206 +213 @@
     }
 
-    int width (const QFontMetrics &aFM, const QListView *aLV, int aC) const
+    int width (const QFontMetrics &aFM, const Q3ListView *aLV, int aC) const
     {
         QFont font = aLV->font();
@@ -220 +227 @@
             fm = QFontMetrics (font);
 
-        return QListViewItem::width (fm, aLV, aC);
+        return Q3ListViewItem::width (fm, aLV, aC);
     }
 
     void setup ()
     {
-        QListViewItem::setup();
+        Q3ListViewItem::setup();
         if (mBuiltIn)
             setHeight (height() + 1);
@@ -235 +242 @@
                        const char *aSrc, const char *aCmnt)
     {
-        QString msg = aTranslator.findMessage (aCtxt, aSrc, aCmnt).translation();
+#warning port me: check this
+        QString msg = aTranslator.translate (aCtxt, aSrc, aCmnt);
+//        QString msg = aTranslator.findMessage (aCtxt, aSrc, aCmnt).translation();
         /* return the source text if no translation is found */
         if (msg.isEmpty())
@@ -251 +260 @@
     polished = false;
 
-    setIcon (QPixmap::fromMimeSource ("global_settings_16px.png"));
+    setIcon (qPixmapFromMimeSource ("global_settings_16px.png"));
 
     /*  all pages are initially valid */
     valid = true;
     buttonOk->setEnabled (true);
-    warningSpacer->changeSize (0, 0, QSizePolicy::Expanding);
+#warning port me
+//    warningSpacer->changeSize (0, 0, QSizePolicy::Expanding);
     warningLabel->setHidden (true);
     warningPixmap->setHidden (true);
@@ -264 +274 @@
     /*  hide the header and internal columns */
     listView->header()->hide();
-    listView->setColumnWidthMode (listView_Id, QListView::Manual);
-    listView->setColumnWidthMode (listView_Link, QListView::Manual);
+    listView->setColumnWidthMode (listView_Id, Q3ListView::Manual);
+    listView->setColumnWidthMode (listView_Link, Q3ListView::Manual);
     listView->hideColumn (listView_Id);
     listView->hideColumn (listView_Link);
@@ -289 +299 @@
 
     whatsThisLabel = new QIRichLabel (this, "whatsThisLabel");
-    VBoxGlobalSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
+#warning port me
+//    VBoxGlobalSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
 
 #ifndef DEBUG
@@ -303 +314 @@
 
     whatsThisLabel->setMaxHeightMode (true);
-    whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
+    whatsThisLabel->setFocusPolicy (Qt::NoFocus);
     whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
-    whatsThisLabel->setBackgroundMode (QLabel::PaletteMidlight);
+    whatsThisLabel->setBackgroundMode (Qt::PaletteMidlight);
     whatsThisLabel->setFrameShape (QLabel::Box);
     whatsThisLabel->setFrameShadow (QLabel::Sunken);
     whatsThisLabel->setMargin (7);
     whatsThisLabel->setScaledContents (FALSE);
-    whatsThisLabel->setAlignment (int (QLabel::WordBreak |
-                                       QLabel::AlignJustify |
-                                       QLabel::AlignTop));
+    whatsThisLabel->setAlignment (int (Qt::TextWordWrap |
+                                       Qt::AlignJustify |
+                                       Qt::AlignTop));
 
     whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
@@ -328 +339 @@
     hkeHostKey = new QIHotKeyEdit (grbKeyboard, "hkeHostKey");
     hkeHostKey->setSizePolicy (QSizePolicy (QSizePolicy::Preferred, QSizePolicy::Fixed));
-    QWhatsThis::add (hkeHostKey,
+    Q3WhatsThis::add (hkeHostKey,
         tr ("Displays the key used as a Host Key in the VM window. Activate the "
             "entry field and press a new Host Key. Note that alphanumeric, "
             "cursor movement and editing keys cannot be used as a Host Key."));
-    layoutHostKey->addWidget (hkeHostKey);
+#warning port me
+//    layoutHostKey->addWidget (hkeHostKey);
     txHostKey->setBuddy (hkeHostKey);
     setTabOrder (listView, hkeHostKey);
@@ -360 +372 @@
     /* disable unselecting items by clicking in the unused area of the list */
     new QIListViewSelectionPreserver (this, lvUSBFilters);
-    wstUSBFilters = new QWidgetStack (grbUSBFilters, "wstUSBFilters");
-    grbUSBFiltersLayout->addWidget (wstUSBFilters);
+    wstUSBFilters = new Q3WidgetStack (grbUSBFilters, "wstUSBFilters");
+#warning port me
+//    grbUSBFiltersLayout->addWidget (wstUSBFilters);
     /* create a default (disabled) filter settings widget at index 0 */
     VBoxUSBFilterSettings *settings = new VBoxUSBFilterSettings (wstUSBFilters);
@@ -441 +454 @@
 QString VBoxGlobalSettingsDlg::pagePath (QWidget *aPage)
 {
-    QListViewItem *li = listView->
+    Q3ListViewItem *li = listView->
         findItem (QString::number (widgetStack->id (aPage)), 1);
     return ::path (li);
@@ -527 +540 @@
 }
 
-void VBoxGlobalSettingsDlg::listView_currentChanged (QListViewItem *item)
+void VBoxGlobalSettingsDlg::listView_currentChanged (Q3ListViewItem *item)
 {
     Assert (item);
@@ -549 +562 @@
     bool newValid = true;
     {
-        QObjectList *l = this->queryList ("QIWidgetValidator");
-        QObjectListIt it (*l);
-        QObject *obj;
-        while ((obj = it.current()) != 0)
+        QObjectList l = this->queryList ("QIWidgetValidator");
+        foreach (QObject *obj, l)
         {
             QIWidgetValidator *wval = (QIWidgetValidator *) obj;
@@ -561 +572 @@
                 break;
             }
-            ++ it;
         }
-        delete l;
     }
 
@@ -637 +646 @@
          * not available (i.e. in VirtualBox OSE) */
 
-        QListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
+        Q3ListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
         Assert (usbItem);
         usbItem->setVisible (false);
@@ -663 +672 @@
 
     QString langId = gs.languageId();
-    QListViewItem *item = lvLanguages->findItem (langId, 1);
+    Q3ListViewItem *item = lvLanguages->findItem (langId, 1);
     if (!item)
     {
@@ -719 +728 @@
 
     /* then add all new filters */
-    for (QListViewItem *item = lvUSBFilters->firstChild(); item;
+    for (Q3ListViewItem *item = lvUSBFilters->firstChild(); item;
          item = item->nextSibling())
     {
@@ -744 +753 @@
     /* language properties */
 
-    QListViewItem *selItem = lvLanguages->selectedItem();
+    Q3ListViewItem *selItem = lvLanguages->selectedItem();
     Assert (selItem);
     if (mLanguageChanged && selItem)
@@ -765 +774 @@
     else
     {
-        widget = focusData()->focusWidget();
+#warning port me
+//        widget = focusData()->focusWidget();
     }
     /* if the given widget lacks the whats'this text, look at its parent */
     while (widget && widget != this)
     {
-        text = QWhatsThis::textFor (widget);
+#warning port me
+//        text = Q3WhatsThis::textFor (widget);
         if (!text.isEmpty())
             break;
@@ -778 +789 @@
     if (text.isEmpty() && !warningString.isEmpty())
         text = warningString;
-    if (text.isEmpty())
-        text = QWhatsThis::textFor (this);
+#warning port me
+//    if (text.isEmpty())
+//        text = Q3WhatsThis::textFor (this);
 
     whatsThisLabel->setText (text);
@@ -798 +810 @@
 void VBoxGlobalSettingsDlg::tbResetFolder_clicked()
 {
-    QToolButton *tb = ::qt_cast <QToolButton *> (sender());
+    QToolButton *tb = qobject_cast <QToolButton *> (sender());
     Assert (tb);
 
@@ -817 +829 @@
 void VBoxGlobalSettingsDlg::tbSelectFolder_clicked()
 {
-    QToolButton *tb = ::qt_cast <QToolButton *> (sender());
+    QToolButton *tb = qobject_cast <QToolButton *> (sender());
     Assert (tb);
 
@@ -855 +867 @@
                                           bool aIsNew)
 {
-    QListViewItem *currentItem = aIsNew
+    Q3ListViewItem *currentItem = aIsNew
         ? lvUSBFilters->currentItem()
         : lvUSBFilters->lastItem();
@@ -894 +906 @@
 }
 
-void VBoxGlobalSettingsDlg::lvUSBFilters_currentChanged (QListViewItem *item)
+void VBoxGlobalSettingsDlg::lvUSBFilters_currentChanged (Q3ListViewItem *item)
 {
     if (item && lvUSBFilters->selectedItem() != item)
@@ -918 +930 @@
 void VBoxGlobalSettingsDlg::lvUSBFilters_setCurrentText (const QString &aText)
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
@@ -930 +942 @@
     QString usbFilterName = tr ("New Filter %1", "usb");
     QRegExp regExp (QString ("^") + usbFilterName.arg ("([0-9]+)") + QString ("$"));
-    QListViewItemIterator iterator (lvUSBFilters);
+    Q3ListViewItemIterator iterator (lvUSBFilters);
     while (*iterator)
     {
@@ -997 +1009 @@
 void VBoxGlobalSettingsDlg::tbRemoveUSBFilter_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
@@ -1014 +1026 @@
 void VBoxGlobalSettingsDlg::tbUSBFilterUp_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
-    QListViewItem *itemAbove = item->itemAbove();
+    Q3ListViewItem *itemAbove = item->itemAbove();
     Assert (itemAbove);
     itemAbove = itemAbove->itemAbove();
@@ -1032 +1044 @@
 void VBoxGlobalSettingsDlg::tbUSBFilterDown_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
-    QListViewItem *itemBelow = item->itemBelow();
+    Q3ListViewItem *itemBelow = item->itemBelow();
     Assert (itemBelow);
 
@@ -1044 +1056 @@
 }
 
-void VBoxGlobalSettingsDlg::lvLanguages_currentChanged (QListViewItem *aItem)
+void VBoxGlobalSettingsDlg::lvLanguages_currentChanged (Q3ListViewItem *aItem)
 {
     Assert (aItem);
@@ -1073 +1085 @@
          * not available (i.e. in VirtualBox OSE) */
 
-        QListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
+        Q3ListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
         Assert (usbItem);
         usbItem->setVisible (false);

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

@@ +1 @@
+//Added by qt3to4:
+#include <QShowEvent>
+#include <QPushButton>
 /**
  *
@@ -197 +200 @@
     leName->setValidator (new QRegExpValidator (QRegExp( ".+" ), this));
 
-    leSize->setValidator (new QRegExpValidator (vboxGlobal().sizeRegexp(), this));
+    leSize->setValidator (new QRegExpValidator (QRegExp(vboxGlobal().sizeRegexp()), this));
     leSize->setAlignment (Qt::AlignRight);
 
@@ -214 +217 @@
     teSummary = new QITextEdit (pageSummary);
     teSummary->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
-    teSummary->setFrameShape (QTextEdit::NoFrame);
+    teSummary->setFrameShape (Q3TextEdit::NoFrame);
     teSummary->setReadOnly (TRUE);
-    summaryLayout->insertWidget (1, teSummary);
+#warning port me
+//    summaryLayout->insertWidget (1, teSummary);
 
     /* filter out Enter keys in order to direct them to the default dlg button */
-    QIKeyFilter *ef = new QIKeyFilter (this, Key_Enter);
+    QIKeyFilter *ef = new QIKeyFilter (this, Qt::Key_Enter);
     ef->watchOn (teSummary);
 
@@ -232 +236 @@
     leName->setText (QString ("NewHardDisk%1.vdi").arg (++ HDNumber));
 
-    slSize->setFocusPolicy (QWidget::StrongFocus);
+    slSize->setFocusPolicy (Qt::StrongFocus);
     slSize->setPageStep (sliderScale);
     slSize->setLineStep (sliderScale / 8);
@@ -261 +265 @@
 
     /* setup minimum width for the sizeHint to be calculated correctly */
-    int wid = widthSpacer->minimumSize().width();
+#warning port me
+    int wid = 1;
+//    int wid = widthSpacer->minimumSize().width();
     txWelcome->setMinimumWidth (wid);
     textLabel1_2->setMinimumWidth (wid);
@@ -413 +419 @@
     }
 
-    QWizard::showPage (page);
+    Q3Wizard::showPage (page);
 
     /* fix focus on the last page. when we go to the last page
@@ -446 +452 @@
      */
     if (createHardDisk())
-        QWizard::accept();
+        Q3Wizard::accept();
 }
 
@@ -566 +572 @@
 //    fd.setDir (d);
 
-    QString selected = QFileDialog::getSaveFileName (
+    QString selected = Q3FileDialog::getSaveFileName (
         fld.absFilePath(),
         tr ("Hard disk images (*.vdi)"),
@@ -575 +581 @@
 //    if ( fd.exec() == QDialog::Accepted ) {
 //        leName->setText (QDir::convertSeparators (fd.selectedFile()));
-    if (selected)
+    if (!selected.isEmpty())
     {
         if (QFileInfo (selected).extension().isEmpty())

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

@@ +1 @@
+//Added by qt3to4:
+#include <QShowEvent>
 /**
  *
@@ -100 +102 @@
     /* HDD Images page */
     mediaCombo = new VBoxMediaComboBox (grbHDA, "mediaCombo", VBoxDefs::HD, true);
-    grbHDALayout->addMultiCellWidget (mediaCombo, 0, 0, 0, 2);
+#warning port me: check this
+    gridLayout->addMultiCellWidget (mediaCombo, 0, 0, 0, 2);
+//    grbHDALayout->addMultiCellWidget (mediaCombo, 0, 0, 0, 2);
     setTabOrder (mediaCombo, pbNewHD);
     setTabOrder (pbNewHD, pbExistingHD);
@@ -121 +125 @@
     teSummary = new QITextEdit (pageSummary);
     teSummary->setSizePolicy (QSizePolicy::Minimum, QSizePolicy::Minimum);
-    teSummary->setFrameShape (QTextEdit::NoFrame);
+    teSummary->setFrameShape (Q3TextEdit::NoFrame);
     teSummary->setReadOnly (TRUE);
-    summaryLayout->insertWidget (1, teSummary);
+#warning port me: check this
+    hboxLayout12->insertWidget (1, teSummary);
+//    summaryLayout->insertWidget (1, teSummary);
 
     /* filter out Enter keys in order to direct them to the default dlg button */
-    QIKeyFilter *ef = new QIKeyFilter (this, Key_Enter);
+    QIKeyFilter *ef = new QIKeyFilter (this, Qt::Key_Enter);
     ef->watchOn (teSummary);
 
@@ -178 +184 @@
 
     /* setup minimum width for the sizeHint to be calculated correctly */
-    int wid = widthSpacer->minimumSize().width();
+#warning port me: check this
+    int wid = spacerItem->minimumSize().width();
+//    int wid = widthSpacer->minimumSize().width();
     txWelcome->setMinimumWidth (wid);
     txNameAndOS->setMinimumWidth (wid);
@@ -270 +278 @@
     }
 
-    QWizard::showPage (page);
+    Q3Wizard::showPage (page);
 
     /*
@@ -300 +308 @@
      */
     if (constructMachine())
-        QWizard::accept();
+        Q3Wizard::accept();
 }
 
@@ -423 +431 @@
 void VBoxNewVMWzd::showVDIManager()
 {
-    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", WType_Dialog | WShowModal);
+    VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg", Qt::WType_Dialog | Qt::WShowModal);
     dlg.setup (VBoxDefs::HD, true);
     QUuid newId = dlg.exec() == VBoxDiskImageManagerDlg::Accepted ?

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

@@ -33 +33 @@
 #include <iprt/param.h>
 #include <iprt/path.h>
+//Added by qt3to4:
+#include <QShowEvent>
 
 /**
@@ -218 +220 @@
 
     /* Adjust text label size */
-    mTextLabel->setMinimumWidth (widthSpacer->minimumSize().width());
+#warning port me
+//    mTextLabel->setMinimumWidth (widthSpacer->minimumSize().width());
 
     /* Setup validations and maximum text-edit text length */
@@ -321 +324 @@
     /* Handshake arguments initializing */
     QString version = vboxGlobal().virtualBox().GetVersion();
-    QUrl::encode (version);
+    Q3Url::encode (version);
 
     /* Handshake */
@@ -375 +378 @@
         QString email = mEmailEdit->text();
         QString prvt = mUseCheckBox->isChecked() ? "1" : "0";
-        QUrl::encode (version);
-        QUrl::encode (platform);
-        QUrl::encode (name);
-        QUrl::encode (email);
+        Q3Url::encode (version);
+        Q3Url::encode (platform);
+        Q3Url::encode (name);
+        Q3Url::encode (email);
 
         /* Registration */
@@ -531 +534 @@
     rc = RTPathAppPrivateNoArch (szAppPrivPath, sizeof (szAppPrivPath));
     Assert (RT_SUCCESS (rc));
-    QProcess infoScript (QString ("./VBoxSysInfo.sh"), this, "infoScript");
+    Q3Process infoScript (QString ("./VBoxSysInfo.sh"), this, "infoScript");
     infoScript.setWorkingDirectory (QString (szAppPrivPath));
     if (infoScript.start())
@@ -537 +540 @@
         while (infoScript.isRunning()) {}
         if (infoScript.normalExit())
-            platform += QString (" [%1]").arg (infoScript.readStdout());
+            platform += QString (" [%1]").arg (QString(infoScript.readStdout()));
     }
 #endif
@@ -565 +568 @@
 {
     validate();
-    QWizard::showEvent (aEvent);
-}
+    Q3Wizard::showEvent (aEvent);
+}

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

@@ +1 @@
+//Added by qt3to4:
+#include <Q3WhatsThis>
+#include <QPushButton>
+#include <Q3HBoxLayout>
+#include <Q3ValueList>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <QMouseEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /**
  *
@@ -31 +42 @@
 
 typedef QPair<QString, VBoxSharedFoldersSettings::SFDialogType> SFolderName;
-typedef QValueList<SFolderName> SFoldersNameList;
-
-
-class VBoxRichListItem : public QListViewItem
+typedef Q3ValueList<SFolderName> SFoldersNameList;
+
+
+class VBoxRichListItem : public Q3ListViewItem
 {
 public:
@@ -49 +60 @@
     };
 
-    VBoxRichListItem (FormatType aFormat, QListView *aParent,
+    VBoxRichListItem (FormatType aFormat, Q3ListView *aParent,
                       const QString& aName, const QString& aNull1,
                       const QString& aNull2, const QString& aKey) :
-        QListViewItem (aParent, aName, aNull1, aNull2, aKey), mFormat (aFormat)
-    {
-    }
-
-    VBoxRichListItem (FormatType aFormat, QListViewItem *aParent,
+        Q3ListViewItem (aParent, aName, aNull1, aNull2, aKey), mFormat (aFormat)
+    {
+    }
+
+    VBoxRichListItem (FormatType aFormat, Q3ListViewItem *aParent,
                       const QString& aName, const QString& aPath,
                       const QString& aAccess, const QString& aEdited) :
-        QListViewItem (aParent, aName, aPath, aAccess, aEdited), mFormat (aFormat)
+        Q3ListViewItem (aParent, aName, aPath, aAccess, aEdited), mFormat (aFormat)
     {
         mTextList << aName << aPath << aAccess << aEdited;
@@ -66 +77 @@
     int rtti() const { return QIRichListItemId; }
 
-    int compare (QListViewItem *aItem, int aColumn, bool aAscending) const
+    int compare (Q3ListViewItem *aItem, int aColumn, bool aAscending) const
     {
         /* Sorting the children always by name: */
         if (parent() && aItem->parent())
-            return QListViewItem::compare (aItem, 0, aAscending);
+            return Q3ListViewItem::compare (aItem, 0, aAscending);
         /* Sorting the root items always by key: */
         else if (!parent() && !aItem->parent())
-            return QListViewItem::compare (aItem, 3, aAscending);
+            return Q3ListViewItem::compare (aItem, 3, aAscending);
         else
-            return QListViewItem::compare (aItem, aColumn, aAscending);
+            return Q3ListViewItem::compare (aItem, aColumn, aAscending);
     }
 
     VBoxRichListItem* nextSibling() const
     {
-        QListViewItem *item = QListViewItem::nextSibling();
+        Q3ListViewItem *item = Q3ListViewItem::nextSibling();
         return item && item->rtti() == QIRichListItemId ?
             static_cast<VBoxRichListItem*> (item) : 0;
@@ -118 +129 @@
                 wnd.moveBy (dx, 0);
                 aPainter->setWindow (wnd);
-                QListViewItem::paintCell (aPainter, aColorGroup, 0, aWidth, aAlign);
+                Q3ListViewItem::paintCell (aPainter, aColorGroup, 0, aWidth, aAlign);
                 aPainter->restore();
                 return;
             }
 
-            QListViewItem::paintCell (aPainter, aColorGroup, aColumn, aWidth, aAlign);
+            Q3ListViewItem::paintCell (aPainter, aColorGroup, aColumn, aWidth, aAlign);
         }
         else
         {
             processColumn (aColumn, aWidth);
-            QListViewItem::paintCell (aPainter, aColorGroup, aColumn, aWidth, aAlign);
-        }
-    }
-
-    int width (const QFontMetrics &aFontMetrics, const QListView *, int aColumn) const
+            Q3ListViewItem::paintCell (aPainter, aColorGroup, aColumn, aWidth, aAlign);
+        }
+    }
+
+    int width (const QFontMetrics &aFontMetrics, const Q3ListView *, int aColumn) const
     {
         return parent() ?
@@ -228 +239 @@
                 AssertMsgFailed (("Incorrect SF Dialog type\n"));
         }
-        QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
+        Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 10, 10, "mainLayout");
 
         /* Setup Input layout */
-        QGridLayout *inputLayout = new QGridLayout (mainLayout, 3, 3, 10, "inputLayout");
+        Q3GridLayout *inputLayout = new Q3GridLayout (mainLayout, 3, 3, 10, "inputLayout");
         QLabel *lbPath = new QLabel (tr ("Folder Path"), this);
         mLePath = new QLineEdit (this);
@@ -239 +250 @@
         tbPath->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
                                                  "select_file_dis_16px.png"));
-        tbPath->setFocusPolicy (QWidget::TabFocus);
+        tbPath->setFocusPolicy (Qt::TabFocus);
         connect (mLePath, SIGNAL (textChanged (const QString &)),
                  this, SLOT (validate()));
@@ -245 +256 @@
                  this, SLOT (validate()));
         connect (tbPath, SIGNAL (clicked()), this, SLOT (showFileDialog()));
-        QWhatsThis::add (mLePath, tr ("Displays the path to an existing folder on the host PC."));
-        QWhatsThis::add (mLeName, tr ("Displays the name of the shared folder "
+        Q3WhatsThis::add (mLePath, tr ("Displays the path to an existing folder on the host PC."));
+        Q3WhatsThis::add (mLeName, tr ("Displays the name of the shared folder "
                                       "(as it will be seen by the guest OS)."));
-        QWhatsThis::add (tbPath, tr ("Opens the dialog to select a folder."));
+        Q3WhatsThis::add (tbPath, tr ("Opens the dialog to select a folder."));
 
         inputLayout->addWidget (lbPath,  0, 0);
@@ -257 +268 @@
 
         mCbReadonly = new QCheckBox (tr ("&Read-only"), this);
-        QWhatsThis::add (mCbReadonly,
+        Q3WhatsThis::add (mCbReadonly,
             tr ("When checked, the guest OS will not be able to write to the "
                 "specified shared folder."));
@@ -273 +284 @@
 
         /* Setup Button layout */
-        QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+        Q3HBoxLayout *buttonLayout = new Q3HBoxLayout (mainLayout, 10, "buttonLayout");
         mBtOk = new QPushButton (tr ("&OK"), this, "btOk");
         QSpacerItem *spacer = new QSpacerItem (0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -396 +407 @@
     connect (tbEdit, SIGNAL (clicked()), this, SLOT (tbEditPressed()));
     connect (tbRemove, SIGNAL (clicked()), this, SLOT (tbRemovePressed()));
-    connect (listView, SIGNAL (currentChanged (QListViewItem *)),
-             this, SLOT (processCurrentChanged (QListViewItem *)));
+    connect (listView, SIGNAL (currentChanged (Q3ListViewItem *)),
+             this, SLOT (processCurrentChanged (Q3ListViewItem *)));
 
     /* Make after-paining list update to ensure all columns repainted correctly. */
@@ -454 +465 @@
     {
         QMouseEvent *e = static_cast<QMouseEvent*> (aEvent);
-        QListViewItem *i = listView->itemAt (e->pos());
+        Q3ListViewItem *i = listView->itemAt (e->pos());
         VBoxRichListItem *item = i && i->rtti() == VBoxRichListItem::QIRichListItemId ?
             static_cast<VBoxRichListItem*> (i) : 0;
@@ -468 +479 @@
             }
 
-            QString curText = QToolTip::textFor (listView->viewport());
+#warning port me
+//            QString curText = QToolTip::textFor (listView->viewport());
+            QString curText = "";
             QString newText = item->text (id) != item->getText (id) ?
                               item->getText (id) : QString::null;
@@ -602 +615 @@
 
 void VBoxSharedFoldersSettings::getFrom (const CSharedFolderEnumerator &aEn,
-                                         QListViewItem *aRoot)
+                                         Q3ListViewItem *aRoot)
 {
     aRoot->setSelectable (false);
@@ -644 +657 @@
     Assert (mDialogType & MachineType);
     /* Searching for MachineType item's root */
-    QListViewItem *root = listView->findItem (QString::number (MachineType), 3);
+    Q3ListViewItem *root = listView->findItem (QString::number (MachineType), 3);
     Assert (root);
     CSharedFolderEnumerator en = mMachine.GetSharedFolders().Enumerate();
@@ -658 +671 @@
     Assert (mDialogType & ConsoleType);
     /* Searching for ConsoleType item's root */
-    QListViewItem *root = listView->findItem (QString::number (ConsoleType), 3);
+    Q3ListViewItem *root = listView->findItem (QString::number (ConsoleType), 3);
     Assert (root);
     CSharedFolderEnumerator en = mConsole.GetSharedFolders().Enumerate();
@@ -665 +678 @@
 
 void VBoxSharedFoldersSettings::putBackTo (CSharedFolderEnumerator &aEn,
-                                           QListViewItem *aRoot)
+                                           Q3ListViewItem *aRoot)
 {
     Assert (!aRoot->text (3).isNull());
@@ -676 +689 @@
 
         /* Search for this root's items */
-        QListViewItem *firstItem = aRoot->firstChild();
+        Q3ListViewItem *firstItem = aRoot->firstChild();
         VBoxRichListItem *item = firstItem &&
             firstItem->rtti() == VBoxRichListItem::QIRichListItemId ?
@@ -694 +707 @@
 
     /* saving all machine related list view items */
-    QListViewItem *iterator = aRoot->firstChild();
+    Q3ListViewItem *iterator = aRoot->firstChild();
     while (iterator)
     {
@@ -709 +722 @@
 
 
-QListViewItem* VBoxSharedFoldersSettings::searchRoot (bool aIsPermanent)
+Q3ListViewItem* VBoxSharedFoldersSettings::searchRoot (bool aIsPermanent)
 {
     if (!aIsPermanent)
@@ -723 +736 @@
     /* Make the used names list: */
     SFoldersNameList usedList;
-    QListViewItemIterator it (listView);
+    Q3ListViewItemIterator it (listView);
     while (*it)
     {
@@ -746 +759 @@
     Assert (!name.isEmpty() && !path.isEmpty());
     /* Searching root for the new listview item */
-    QListViewItem *root = searchRoot (isPermanent);
+    Q3ListViewItem *root = searchRoot (isPermanent);
     Assert (root);
     /* Appending a new listview item to the root */
@@ -765 +778 @@
     /* Make the used names list: */
     SFoldersNameList usedList;
-    QListViewItemIterator it (listView);
+    Q3ListViewItemIterator it (listView);
     while (*it)
     {
@@ -779 +792 @@
 
     /* Check selected item */
-    QListViewItem *selectedItem = listView->selectedItem();
+    Q3ListViewItem *selectedItem = listView->selectedItem();
     VBoxRichListItem *item =
         selectedItem->rtti() == VBoxRichListItem::QIRichListItemId ?
@@ -801 +814 @@
     Assert (!name.isEmpty() && !path.isEmpty());
     /* Searching new root for the selected listview item */
-    QListViewItem *root = searchRoot (isPermanent);
+    Q3ListViewItem *root = searchRoot (isPermanent);
     Assert (root);
     /* Updating an edited listview item */
@@ -833 +846 @@
 
 
-void VBoxSharedFoldersSettings::processCurrentChanged (QListViewItem *aItem)
+void VBoxSharedFoldersSettings::processCurrentChanged (Q3ListViewItem *aItem)
 {
     if (aItem && aItem->isSelectable() && listView->selectedItem() != aItem)
@@ -847 +860 @@
 }
 
-void VBoxSharedFoldersSettings::processDoubleClick (QListViewItem *aItem)
+void VBoxSharedFoldersSettings::processDoubleClick (Q3ListViewItem *aItem)
 {
     bool editEnabled = aItem && aItem->parent() &&

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

@@ +1 @@
+//Added by qt3to4:
+#include <q3mimefactory.h>
 /**
  *
@@ -29 +31 @@
 void VBoxSnapshotDetailsDlg::init()
 {
-    setIcon (QPixmap::fromMimeSource ("settings_16px.png"));
+    setIcon (qPixmapFromMimeSource ("settings_16px.png"));
 
     txeSummary->setPaper (this->backgroundBrush());
@@ -35 +37 @@
 
     // filter out Enter keys in order to direct them to the default dlg button
-    QIKeyFilter *ef = new QIKeyFilter (this, Key_Enter);
+    QIKeyFilter *ef = new QIKeyFilter (this, Qt::Key_Enter);
     ef->watchOn (txeSummary);
 

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

@@ +1 @@
+//Added by qt3to4:
+#include <Q3PopupMenu>
 /**
  *
@@ -30 +32 @@
 
 /** QListViewItem subclass for snapshots */
-class VBoxSnapshotsWgt::ListViewItem : public QListViewItem
+class VBoxSnapshotsWgt::ListViewItem : public Q3ListViewItem
 {
 public:
 
     /** Normal snapshot item */
-    ListViewItem (QListView *lv, const CSnapshot &aSnapshot)
-        : QListViewItem (lv)
+    ListViewItem (Q3ListView *lv, const CSnapshot &aSnapshot)
+        : Q3ListViewItem (lv)
         , mBld (false), mItal (false)
         , mSnapshot (aSnapshot)
@@ -44 +46 @@
 
     /** Normal snapshot item */
-    ListViewItem (QListViewItem *lvi, const CSnapshot &aSnapshot)
-        : QListViewItem (lvi)
+    ListViewItem (Q3ListViewItem *lvi, const CSnapshot &aSnapshot)
+        : Q3ListViewItem (lvi)
         , mBld (false), mItal (false)
         , mSnapshot (aSnapshot)
@@ -53 +55 @@
 
     /** Current state item */
-    ListViewItem (QListView *lv, const CMachine &aMachine)
-        : QListViewItem (lv)
+    ListViewItem (Q3ListView *lv, const CMachine &aMachine)
+        : Q3ListViewItem (lv)
         , mBld (false), mItal (true)
         , mMachine (aMachine)
@@ -63 +65 @@
 
     /** Current state item */
-    ListViewItem (QListViewItem *lvi, const CMachine &aMachine)
-        : QListViewItem (lvi)
+    ListViewItem (Q3ListViewItem *lvi, const CMachine &aMachine)
+        : Q3ListViewItem (lvi)
         , mBld (false), mItal (true)
         , mMachine (aMachine)
@@ -95 +97 @@
         if (font != p->font())
             p->setFont (font);
-        QListViewItem::paintCell (p, cg, column, width, align);
-    }
-
-    int width (const QFontMetrics &fm, const QListView *lv, int c) const
+        Q3ListViewItem::paintCell (p, cg, column, width, align);
+    }
+
+    int width (const QFontMetrics &fm, const Q3ListView *lv, int c) const
     {
         QFont font = lv->font();
@@ -106 +108 @@
             font.setItalic (mItal);
         if (font != lv->font())
-            return QListViewItem::width (QFontMetrics (font), lv, c);
-        return QListViewItem::width (fm, lv, c);
+            return Q3ListViewItem::width (QFontMetrics (font), lv, c);
+        return Q3ListViewItem::width (fm, lv, c);
     }
 
@@ -201 +203 @@
     void okRename (int aCol)
     {
-        QListViewItem::okRename (aCol);
+        Q3ListViewItem::okRename (aCol);
         AssertReturn (aCol == 0 && !mSnapshot.isNull(), (void) 0);
         mSnapshot.SetName (text (0));
@@ -226 +228 @@
 
 /** Tooltips for snapshots */
-class VBoxSnapshotsWgt::ToolTip : public QToolTip
-{
-public:
-
-    ToolTip (QListView *aLV, QWidget *aParent, QToolTipGroup *aTG = 0)
-        : QToolTip (aParent, aTG), mLV (aLV)
-    {}
-
-    virtual ~ToolTip()
-    {
-        remove (parentWidget());
-    }
-
-    void maybeTip (const QPoint &aPnt);
-
-private:
-
-    QListView *mLV;
-};
-
-void VBoxSnapshotsWgt::ToolTip::maybeTip (const QPoint &aPnt)
-{
-    ListViewItem *lvi = static_cast <ListViewItem *> (mLV->itemAt (aPnt));
-    if (!lvi)
-        return;
-
-    if (parentWidget()->topLevelWidget()->inherits ("QMainWindow"))
-    {
-        /*
-         *  Ensure the main window doesn't show the text from the previous
-         *  tooltip in the status bar.
-         */
-        QToolTipGroup *toolTipGroup =
-            (::qt_cast <QMainWindow *> (parentWidget()->topLevelWidget()))->
-                toolTipGroup();
-        if (toolTipGroup)
-        {
-            int index = toolTipGroup->metaObject()->findSignal("removeTip()", false);
-            toolTipGroup->qt_emit (index, 0);
-        }
-    }
-
-    tip (mLV->itemRect (lvi), lvi->toolTipText());
-}
+#warning port me
+//class VBoxSnapshotsWgt::ToolTip : public QToolTip
+//{
+//public:
+//
+//    ToolTip (Q3ListView *aLV, QWidget *aParent, QToolTipGroup *aTG = 0)
+//        : QToolTip (aParent, aTG), mLV (aLV)
+//    {}
+//
+//    virtual ~ToolTip()
+//    {
+//        remove (parentWidget());
+//    }
+//
+//    void maybeTip (const QPoint &aPnt);
+//
+//private:
+//
+//    Q3ListView *mLV;
+//};
+
+//void VBoxSnapshotsWgt::ToolTip::maybeTip (const QPoint &aPnt)
+//{
+//    ListViewItem *lvi = static_cast <ListViewItem *> (mLV->itemAt (aPnt));
+//    if (!lvi)
+//        return;
+//
+//    if (parentWidget()->topLevelWidget()->inherits ("QMainWindow"))
+//    {
+//        /*
+//         *  Ensure the main window doesn't show the text from the previous
+//         *  tooltip in the status bar.
+//         */
+//        QToolTipGroup *toolTipGroup =
+//            (::qt_cast <Q3MainWindow *> (parentWidget()->topLevelWidget()))->
+//                toolTipGroup();
+//        if (toolTipGroup)
+//        {
+//          int index = toolTipGroup->metaObject()->findSignal("removeTip()", false);
+//          toolTipGroup->qt_emit (index, 0);
+//        }
+//    }
+//
+//    tip (mLV->itemRect (lvi), lvi->toolTipText());
+//}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -299 +302 @@
     toolBar->setUsesBigPixmaps (true);
     toolBar->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-    VBoxSnapshotsWgtLayout->insertWidget (0, toolBar);
+#warning port me
+//    VBoxSnapshotsWgtLayout->insertWidget (0, toolBar);
 #ifdef Q_WS_MAC
     toolBar->setMacStyle();
@@ -305 +309 @@
 
     /* context menu */
-    mContextMenu = new QPopupMenu (this);
+    mContextMenu = new Q3PopupMenu (this);
     mContextMenuDirty = true;
 
@@ -326 +330 @@
 
     /* tooltip */
-    mToolTip = new ToolTip (listView, listView->viewport());
+#warning port me
+//    mToolTip = new ToolTip (listView, listView->viewport());
 }
 
@@ -354 +359 @@
 VBoxSnapshotsWgt::ListViewItem *VBoxSnapshotsWgt::findItem (const QUuid &aSnapshotId)
 {
-    QListViewItemIterator it (listView);
+    Q3ListViewItemIterator it (listView);
     while (it.current())
     {
@@ -433 +438 @@
 VBoxSnapshotsWgt::ListViewItem *VBoxSnapshotsWgt::curStateItem()
 {
-    QListViewItem *csi = mCurSnapshotItem ? mCurSnapshotItem->firstChild()
+    Q3ListViewItem *csi = mCurSnapshotItem ? mCurSnapshotItem->firstChild()
                                           : listView->firstChild();
     Assert (csi);
@@ -439 +444 @@
 }
 
-void VBoxSnapshotsWgt::populateSnapshots (const CSnapshot &snapshot, QListViewItem *item)
+void VBoxSnapshotsWgt::populateSnapshots (const CSnapshot &snapshot, Q3ListViewItem *item)
 {
     ListViewItem *si = 0;
@@ -464 +469 @@
 }
 
-void VBoxSnapshotsWgt::listView_currentChanged (QListViewItem *item)
+void VBoxSnapshotsWgt::listView_currentChanged (Q3ListViewItem *item)
 {
     /* Make the selected item visible */
@@ -502 +507 @@
 
 void VBoxSnapshotsWgt::
-listView_contextMenuRequested (QListViewItem *item, const QPoint &pnt,
+listView_contextMenuRequested (Q3ListViewItem *item, const QPoint &pnt,
                                int /* col */)
 {
@@ -583 +588 @@
     QString snapShotName = tr ("Snapshot %1");
     QRegExp regExp (QString ("^") + snapShotName.arg ("([0-9]+)") + QString ("$"));
-    QListViewItemIterator iterator (listView);
+    Q3ListViewItemIterator iterator (listView);
     while (*iterator)
     {

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

@@ +1 @@
+//Added by qt3to4:
+#include <Q3CString>
 /**
  *
@@ -65 +67 @@
         case VBoxUSBFilterSettings::MachineType:
         {
-            QCString remote = aFilter.GetRemote().latin1();
+            Q3CString remote = aFilter.GetRemote().latin1();
             if (remote == "yes" || remote == "true" || remote == "1")
                 cbRemote->setCurrentItem (1);

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

@@ +1 @@
+//Added by qt3to4:
+#include <QShowEvent>
 /**
  *
@@ -50 +52 @@
     /* media page */
     cbImage = new VBoxMediaComboBox (bgSource, "cbImage", VBoxDefs::CD);
-    ltVdm->insertWidget (0, cbImage);
+#warning port me
+//    ltVdm->insertWidget (0, cbImage);
     tbVdm->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
                                             "select_file_dis_16px.png"));
@@ -58 +61 @@
     teSummary = new QITextEdit (pageSummary);
     teSummary->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Minimum);
-    teSummary->setFrameShape (QTextEdit::NoFrame);
+    teSummary->setFrameShape (Q3TextEdit::NoFrame);
     teSummary->setReadOnly (TRUE);
     teSummary->setPaper (pageSummary->backgroundBrush());
-    ltSummary->insertWidget (2, teSummary);
+#warning port me
+//    ltSummary->insertWidget (2, teSummary);
 
     /* setup connections and set validation for pages
@@ -74 +78 @@
 
     /* filter out Enter keys in order to direct them to the default dlg button */
-    QIKeyFilter *ef = new QIKeyFilter (this, Key_Enter);
+    QIKeyFilter *ef = new QIKeyFilter (this, Qt::Key_Enter);
     ef->watchOn (teSummary);
 
@@ -84 +88 @@
 
     /* setup minimum width for the sizeHint to be calculated correctly */
-    int wid = widthSpacer->minimumSize().width();
+#warning port me
+    int wid = 1;
+//    int wid = widthSpacer->minimumSize().width();
     txWelcome->setMinimumWidth (wid);
     txType->setMinimumWidth (wid);
@@ -170 +176 @@
     }
 
-    QWizard::showPage (aPage);
+    Q3Wizard::showPage (aPage);
 
     /* fix focus on the last page. when we go to the last page
@@ -227 +233 @@
     }
 
-    QWizard::accept();
+    Q3Wizard::accept();
 }
 
@@ -331 +337 @@
 {
     VBoxDiskImageManagerDlg vdm (this, "VBoxDiskImageManagerDlg",
-                                 WType_Dialog | WShowModal);
+                                 Qt::WType_Dialog | Qt::WShowModal);
     QUuid machineId = machine.GetId();
     VBoxDefs::DiskType type = rbCdType->isChecked() ? VBoxDefs::CD :

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

@@ +1 @@
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3Frame>
+#include <q3mimefactory.h>
+#include <QResizeEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /**
  *
@@ -38 +46 @@
         mSelfArray [machine.GetName()] = new VBoxVMInformationDlg (
             aConsole,
-            "VBoxVMInformationDlg", WType_TopLevel | WDestructiveClose);
+            "VBoxVMInformationDlg", Qt::WType_TopLevel | Qt::WDestructiveClose);
         /* read new machine data for this information dialog */
         mSelfArray [machine.GetName()]->setup (aSession, aConsole);
@@ -46 +54 @@
     info->show();
     info->raise();
-    info->setWindowState (info->windowState() & ~WindowMinimized);
+    info->setWindowState (info->windowState() & ~Qt::WindowMinimized);
     info->setActiveWindow();
 }
@@ -61 +69 @@
 
     /* setup a dialog icon */
-    setIcon (QPixmap::fromMimeSource ("description_16px.png"));
+    setIcon (qPixmapFromMimeSource ("description_16px.png"));
 
     /* statusbar initially disabled */
@@ -74 +82 @@
     mInfoStack = new QTabWidget (mInfoFrame, "mInfoStack");
     mInfoStack->setMargin (10);
-    QVBoxLayout *infoFrameLayout = new QVBoxLayout (mInfoFrame);
+    Q3VBoxLayout *infoFrameLayout = new Q3VBoxLayout (mInfoFrame);
     infoFrameLayout->addWidget (mInfoStack);
 
     /* details view creation */
-    mDetailsText = new QTextBrowser();
-    mDetailsText->setFrameShape (QFrame::NoFrame);
+    mDetailsText = new Q3TextBrowser();
+    mDetailsText->setFrameShape (Q3Frame::NoFrame);
     mDetailsText->setPaper (backgroundBrush());
     mInfoStack->addTab (mDetailsText,
@@ -86 +94 @@
 
     /* statistic view creation */
-    mStatisticText = new QTextBrowser();
-    mStatisticText->setFrameShape (QFrame::NoFrame);
+    mStatisticText = new Q3TextBrowser();
+    mStatisticText->setFrameShape (Q3Frame::NoFrame);
     mStatisticText->setPaper (backgroundBrush());
     mInfoStack->addTab (mStatisticText,
@@ -226 +234 @@
      * and similar the same mechanism in Qt::QDialog inner source */
     QPushButton *button = 0;
-    QObjectList *list = queryList ("QPushButton");
-    QObjectListIt it (*list);
-    while ((button = (QPushButton*)it.current()) && !button->isDefault())
-        ++ it;
+    QObjectList list = queryList ("QPushButton");
+    foreach (QObject* obj, list)
+    {
+        button = qobject_cast<QPushButton*> (obj);
+        if (button->isDefault())
+            break;
+    }
     return button;
 }
@@ -267 +278 @@
             break;
     }
-    return QMainWindow::eventFilter (aObject, aEvent);
+    return Q3MainWindow::eventFilter (aObject, aEvent);
 }
 
@@ -273 +284 @@
 bool VBoxVMInformationDlg::event (QEvent *aEvent)
 {
-    bool result = QMainWindow::event (aEvent);
+    bool result = Q3MainWindow::event (aEvent);
     switch (aEvent->type())
     {
@@ -299 +310 @@
 {
     if (aEvent->state() == 0 ||
-        (aEvent->state() & Keypad && aEvent->key() == Key_Enter))
+        (aEvent->state() & Qt::KeypadModifier && aEvent->key() == Qt::Key_Enter))
     {
         switch (aEvent->key())
         {
             /* processing the return keypress for the auto-default button */
-            case Key_Enter:
-            case Key_Return:
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
             {
                 QPushButton *currentDefault = searchDefaultButton();
@@ -313 +324 @@
             }
             /* processing the escape keypress as the close dialog action */
-            case Key_Escape:
+            case Qt::Key_Escape:
             {
                 close();
@@ -327 +338 @@
 void VBoxVMInformationDlg::showEvent (QShowEvent *aEvent)
 {
-    QMainWindow::showEvent (aEvent);
+    Q3MainWindow::showEvent (aEvent);
 
     /* one may think that QWidget::polish() is the right place to do things

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

@@ -179 +179 @@
     <include location="global" impldecl="in implementation">qtoolbutton.h</include>
     <include location="global" impldecl="in implementation">qmessagebox.h</include>
-    <include location="global" impldecl="in implementation">qfocusdata.h</include>
 </includes>
 <forwards>

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

@@ +1 @@
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QPixmap>
+#include <q3mimefactory.h>
+#include <QHideEvent>
+#include <QResizeEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <QShowEvent>
 /**
  *
@@ -46 +57 @@
         mButtonClose = new QToolButton (this);
         mButtonClose->setAutoRaise (true);
-        mButtonClose->setFocusPolicy (QWidget::TabFocus);
+        mButtonClose->setFocusPolicy (Qt::TabFocus);
         mButtonClose->setAccel (QKeySequence (Qt::Key_Escape));
         connect (mButtonClose, SIGNAL (clicked()), this, SLOT (hide()));
@@ -62 +73 @@
         mButtonNext->setEnabled (false);
         mButtonNext->setAutoRaise (true);
-        mButtonNext->setFocusPolicy (QWidget::TabFocus);
+        mButtonNext->setFocusPolicy (Qt::TabFocus);
         mButtonNext->setUsesTextLabel (true);
         mButtonNext->setTextPosition (QToolButton::BesideIcon);
@@ -72 +83 @@
         mButtonPrev->setEnabled (false);
         mButtonPrev->setAutoRaise (true);
-        mButtonPrev->setFocusPolicy (QWidget::TabFocus);
+        mButtonPrev->setFocusPolicy (Qt::TabFocus);
         mButtonPrev->setUsesTextLabel (true);
         mButtonPrev->setTextPosition (QToolButton::BesideIcon);
@@ -100 +111 @@
                                                      QSizePolicy::Minimum);
 
-        QHBoxLayout *mainLayout = new QHBoxLayout (this, 5, 5);
+        Q3HBoxLayout *mainLayout = new Q3HBoxLayout (this, 5, 5);
         mainLayout->addWidget (mButtonClose);
         mainLayout->addWidget (mSearchName);
@@ -169 +180 @@
     void search (bool aForward, bool aStartCurrent = false)
     {
-        QTextBrowser *browser = mViewer->currentLogPage();
+        Q3TextBrowser *browser = mViewer->currentLogPage();
         if (!browser) return;
 
@@ -226 +237 @@
                  * widget as a search next string action */
                 if (aObject == mSearchString &&
-                    (e->state() == 0 || e->state() & Keypad) &&
-                    (e->key() == Key_Enter || e->key() == Key_Return))
+                    (e->state() == 0 || e->state() & Qt::Keypad) &&
+                    (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return))
                 {
                     findNext();
@@ -233 +244 @@
                 }
                 /* handle other search next/previous shortcuts */
-                else if (e->key() == Key_F3)
+                else if (e->key() == Qt::Key_F3)
                 {
                     if (e->state() == 0)
                         findNext();
-                    else if (e->state() == ShiftButton)
+                    else if (e->state() == Qt::ShiftButton)
                         findBack();
                     return true;
@@ -243 +254 @@
                 /* handle ctrl-f key combination as a shortcut to
                  * move to the search field */
-                else if (e->state() == ControlButton && e->key() == Key_F)
+                else if (e->state() == Qt::ControlButton && e->key() == Qt::Key_F)
                 {
                     if (mViewer->currentLogPage())
@@ -254 +265 @@
                 /* handle alpha-numeric keys to implement the
                  * "find as you type" feature */
-                else if ((e->state() & ~ShiftButton) == 0 &&
+                else if ((e->state() & ~Qt::ShiftButton) == 0 &&
                          e->key() >= Qt::Key_Exclam &&
                          e->key() <= Qt::Key_AsciiTilde)
@@ -284 +295 @@
     void hideEvent (QHideEvent *aEvent)
     {
-        if (focusData()->focusWidget()->parent() == this)
-           focusNextPrevChild (true);
+#warning port me
+//        if (focusData()->focusWidget()->parent() == this)
+//           focusNextPrevChild (true);
         QWidget::hideEvent (aEvent);
     }
@@ -318 +330 @@
         /* creating new log viewer if there is no one existing */
         mSelfArray [aMachine.GetName()] = new VBoxVMLogViewer (0,
-            "VBoxVMLogViewer", WType_TopLevel | WDestructiveClose);
+            "VBoxVMLogViewer", Qt::WType_TopLevel | Qt::WDestructiveClose);
         /* read new machine data for this log viewer */
         mSelfArray [aMachine.GetName()]->setup (aMachine);
@@ -325 +337 @@
     VBoxVMLogViewer *viewer = mSelfArray [aMachine.GetName()];
     viewer->show();
-    viewer->setWindowState (viewer->windowState() & ~WindowMinimized);
+    viewer->setWindowState (viewer->windowState() & ~Qt::WindowMinimized);
     viewer->setActiveWindow();
 }
@@ -343 +355 @@
 
     /* setup a dialog icon */
-    setIcon (QPixmap::fromMimeSource ("show_logs_16px.png"));
+    setIcon (qPixmapFromMimeSource ("show_logs_16px.png"));
 
     /* statusbar initially disabled */
@@ -355 +367 @@
     /* logs list creation */
     mLogList = new QTabWidget (mLogsFrame, "mLogList");
-    QVBoxLayout *logsFrameLayout = new QVBoxLayout (mLogsFrame);
+    Q3VBoxLayout *logsFrameLayout = new Q3VBoxLayout (mLogsFrame);
     logsFrameLayout->addWidget (mLogList);
 
@@ -421 +433 @@
      * and similar the same mechanism in Qt::QDialog inner source */
     QPushButton *button = 0;
-    QObjectList *list = queryList ("QPushButton");
-    QObjectListIt it (*list);
-    while ((button = (QPushButton*)it.current()) && !button->isDefault())
-        ++ it;
+    QObjectList list = queryList ("QPushButton");
+    foreach (QObject *obj, list)
+    {
+        button = qobject_cast<QPushButton*> (obj);
+        if (button->isDefault())
+            break;
+    }
     return button;
 }
@@ -462 +477 @@
             break;
     }
-    return QMainWindow::eventFilter (aObject, aEvent);
+    return Q3MainWindow::eventFilter (aObject, aEvent);
 }
 
@@ -468 +483 @@
 bool VBoxVMLogViewer::event (QEvent *aEvent)
 {
-    bool result = QMainWindow::event (aEvent);
+    bool result = Q3MainWindow::event (aEvent);
     switch (aEvent->type())
     {
@@ -486 +501 @@
 {
     if (aEvent->state() == 0 ||
-        (aEvent->state() & Keypad && aEvent->key() == Key_Enter))
+        (aEvent->state() & Qt::KeypadModifier && aEvent->key() == Qt::Key_Enter))
     {
         switch (aEvent->key())
         {
             /* processing the return keypress for the auto-default button */
-            case Key_Enter:
-            case Key_Return:
+            case Qt::Key_Enter:
+            case Qt::Key_Return:
             {
                 QPushButton *currentDefault = searchDefaultButton();
@@ -500 +515 @@
             }
             /* processing the escape keypress as the close dialog action */
-            case Key_Escape:
+            case Qt::Key_Escape:
             {
                 mCloseButton->animateClick();
@@ -514 +529 @@
 void VBoxVMLogViewer::showEvent (QShowEvent *aEvent)
 {
-    QMainWindow::showEvent (aEvent);
+    Q3MainWindow::showEvent (aEvent);
 
     /* one may think that QWidget::polish() is the right place to do things
@@ -570 +585 @@
     if (!isAnyLogPresent)
     {
-        QTextBrowser *dummyLog = createLogPage ("VBox.log");
+        Q3TextBrowser *dummyLog = createLogPage ("VBox.log");
         dummyLog->setTextFormat (Qt::RichText);
-        dummyLog->setWordWrap (QTextEdit::WidgetWidth);
+        dummyLog->setWordWrap (Q3TextEdit::WidgetWidth);
         dummyLog->setText (tr ("<p>No log files found. Press the <b>Refresh</b> "
             "button to rescan the log folder <nobr><b>%1</b></nobr>.</p>")
@@ -596 +611 @@
         /* resize the whole log-viewer to fit 80 symbols in text-browser for
          * the first time started */
-        QTextBrowser *firstPage = static_cast <QTextBrowser *> (mLogList->page(0));
+        Q3TextBrowser *firstPage = static_cast <Q3TextBrowser *> (mLogList->page(0));
         int fullWidth = firstPage->fontMetrics().width (QChar ('x')) * 80 +
                         firstPage->verticalScrollBar()->width() +
@@ -613 +628 @@
     /* prepare log file */
     QFile logFile (aFileName);
-    if (!logFile.exists() || !logFile.open (IO_ReadOnly))
+    if (!logFile.exists() || !logFile.open (QIODevice::ReadOnly))
         return;
 
     /* read log file and write it into the log page */
-    QTextBrowser *logViewer = createLogPage (QFileInfo (aFileName).fileName());
+    Q3TextBrowser *logViewer = createLogPage (QFileInfo (aFileName).fileName());
     logViewer->setText (logFile.readAll());
 
@@ -624 +639 @@
 
 
-QTextBrowser* VBoxVMLogViewer::createLogPage (const QString &aName)
-{
-    QTextBrowser *logViewer = new QTextBrowser();
+Q3TextBrowser* VBoxVMLogViewer::createLogPage (const QString &aName)
+{
+    Q3TextBrowser *logViewer = new Q3TextBrowser();
     logViewer->setTextFormat (Qt::PlainText);
     QFont font = logViewer->currentFont();
     font.setFamily ("Courier New,courier");
     logViewer->setFont (font);
-    logViewer->setWordWrap (QTextEdit::NoWrap);
-    logViewer->setVScrollBarMode (QScrollView::AlwaysOn);
+    logViewer->setWordWrap (Q3TextEdit::NoWrap);
+    logViewer->setVScrollBarMode (Q3ScrollView::AlwaysOn);
     mLogList->addTab (logViewer, aName);
     return logViewer;
@@ -638 +653 @@
 
 
-QTextBrowser* VBoxVMLogViewer::currentLogPage()
+Q3TextBrowser* VBoxVMLogViewer::currentLogPage()
 {
     return mLogList->isEnabled() ?
-        static_cast<QTextBrowser*> (mLogList->currentPage()) : 0;
+        static_cast<Q3TextBrowser*> (mLogList->currentPage()) : 0;
 }
 
@@ -656 +671 @@
                                                        "/" + defaultFileName);
 
-    QString newFileName = QFileDialog::getSaveFileName (defaultFullName,
+    QString newFileName = Q3FileDialog::getSaveFileName (defaultFullName,
         QString::null, this, "SaveLogAsDialog", tr ("Save VirtualBox Log As"));
 
@@ -665 +680 @@
         QFile oldFile (mLogFilesList [mLogList->currentPageIndex()]);
         QFile newFile (newFileName);
-        if (!oldFile.open (IO_ReadOnly) || !newFile.open (IO_WriteOnly))
+        if (!oldFile.open (QIODevice::ReadOnly) || !newFile.open (QIODevice::WriteOnly))
             return;
 

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

@@ -290 +290 @@
 void VBoxVMNetworkSettings::pbTAPSetup_clicked()
 {
-    QString selected = QFileDialog::getOpenFileName (
+    QString selected = Q3FileDialog::getOpenFileName (
         "/",
         QString::null,
@@ -297 +297 @@
         tr ("Select TAP setup application"));
 
-    if (selected)
+    if (!selected.isEmpty())
         leTAPSetup->setText (selected);
 }
@@ -303 +303 @@
 void VBoxVMNetworkSettings::pbTAPTerminate_clicked()
 {
-    QString selected = QFileDialog::getOpenFileName (
+    QString selected = Q3FileDialog::getOpenFileName (
         "/",
         QString::null,
@@ -310 +310 @@
         tr ("Select TAP terminate application"));
 
-    if (selected)
+    if (!selected.isEmpty())
         leTAPTerminate->setText (selected);
 }

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

@@ -46 +46 @@
     <grid>
         <property name="name">
-            <cstring>unnamed</cstring>
+            <cstring>VBoxVMSettingsDlgLayout</cstring>
         </property>
         <property name="spacing">
@@ -3205 +3205 @@
     <include location="global" impldecl="in implementation">qobjectlist.h</include>
     <include location="global" impldecl="in implementation">qlistbox.h</include>
-    <include location="global" impldecl="in implementation">qfocusdata.h</include>
     <include location="global" impldecl="in implementation">qtimer.h</include>
     <include location="global" impldecl="in implementation">qpopupmenu.h</include>

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

@@ +1 @@
+//Added by qt3to4:
+#include <Q3WhatsThis>
+#include <QLabel>
+#include <QShowEvent>
+#include <Q3ValueList>
+#include <q3mimefactory.h>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <QEvent>
+#include <Q3VBoxLayout>
 /**
  *
@@ -43 +53 @@
     {
         setCaption (tr ("Add Host Interface"));
-        QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
+        Q3VBoxLayout *mainLayout = new Q3VBoxLayout (this, 10, 10, "mainLayout");
 
         /* Setup Input layout */
-        QHBoxLayout *inputLayout = new QHBoxLayout (mainLayout, 10, "inputLayout");
+        Q3HBoxLayout *inputLayout = new Q3HBoxLayout (mainLayout, 10, "inputLayout");
         QLabel *lbName = new QLabel (tr ("Interface Name"), this);
         mLeName = new QLineEdit (aIfaceName, this);
-        QWhatsThis::add (mLeName, tr ("Descriptive name of the new network interface"));
+        Q3WhatsThis::add (mLeName, tr ("Descriptive name of the new network interface"));
         inputLayout->addWidget (lbName);
         inputLayout->addWidget (mLeName);
@@ -56 +66 @@
 
         /* Setup Button layout */
-        QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+        Q3HBoxLayout *buttonLayout = new Q3HBoxLayout (mainLayout, 10, "buttonLayout");
         mBtOk = new QPushButton (tr ("&OK"), this, "mBtOk");
         QSpacerItem *spacer = new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -133 +143 @@
  *  boot-items up/down moving.
  */
-class BootItemsTable : public QListView
+class BootItemsTable : public Q3ListView
 {
     Q_OBJECT
@@ -140 +150 @@
 
     BootItemsTable (QWidget *aParent, const char *aName)
-        : QListView (aParent, aName)
+        : Q3ListView (aParent, aName)
     {
         addColumn (QString::null);
@@ -147 +157 @@
         setColumnWidthMode (0, Maximum);
         setResizeMode (AllColumns);
-        QWhatsThis::add (this, tr ("Defines the boot device order. "
+        Q3WhatsThis::add (this, tr ("Defines the boot device order. "
                                    "Use checkboxes to the left to enable or disable "
                                    "individual boot devices. Move items up and down to "
                                    "change the device order."));
         setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Preferred);
-        connect (this, SIGNAL (pressed (QListViewItem*)),
-                 this, SLOT (processPressed (QListViewItem*)));
+        connect (this, SIGNAL (pressed (Q3ListViewItem*)),
+                 this, SLOT (processPressed (Q3ListViewItem*)));
     }
 
@@ -168 +178 @@
 private slots:
 
-    void processPressed (QListViewItem *aItem)
+    void processPressed (Q3ListViewItem *aItem)
     {
         if (!aItem)
@@ -190 +200 @@
             }
         }
-        QListView::keyPressEvent (aEvent);
+        Q3ListView::keyPressEvent (aEvent);
     }
 };
@@ -206 +216 @@
     Q_OBJECT
 
-    class BootItem : public QCheckListItem
+    class BootItem : public Q3CheckListItem
     {
         public:
 
-            BootItem (BootItemsTable *aParent, QListViewItem *aAfter,
+            BootItem (BootItemsTable *aParent, Q3ListViewItem *aAfter,
                       const QString &aName, Type aType)
-                : QCheckListItem (aParent, aAfter, aName, aType) {}
+                : Q3CheckListItem (aParent, aAfter, aName, aType) {}
 
         private:
@@ -229 +239 @@
     {
         /* Setup main widget layout */
-        QHBoxLayout *mainLayout = new QHBoxLayout (this, 0, 6, "mainLayout");
+        Q3HBoxLayout *mainLayout = new Q3HBoxLayout (this, 0, 6, "mainLayout");
 
         /* Setup settings layout */
         mBootTable = new BootItemsTable (this, "mBootTable");
-        connect (mBootTable, SIGNAL (currentChanged (QListViewItem*)),
-                 this, SLOT (processCurrentChanged (QListViewItem*)));
+        connect (mBootTable, SIGNAL (currentChanged (Q3ListViewItem*)),
+                 this, SLOT (processCurrentChanged (Q3ListViewItem*)));
         mainLayout->addWidget (mBootTable);
 
         /* Setup button's layout */
-        QVBoxLayout *buttonLayout = new QVBoxLayout (mainLayout, 0, "buttonLayout");
+        Q3VBoxLayout *buttonLayout = new Q3VBoxLayout (mainLayout, 0, "buttonLayout");
         mBtnUp = new QToolButton (this, "mBtnUp");
         mBtnDown = new QToolButton (this, "mBtnDown");
         mBtnUp->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
         mBtnDown->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-        QWhatsThis::add (mBtnUp, tr ("Moves the selected boot device up."));
-        QWhatsThis::add (mBtnDown, tr ("Moves the selected boot device down."));
+        Q3WhatsThis::add (mBtnUp, tr ("Moves the selected boot device up."));
+        Q3WhatsThis::add (mBtnDown, tr ("Moves the selected boot device down."));
         QToolTip::add (mBtnUp, tr ("Move Up (Ctrl-Up)"));
         QToolTip::add (mBtnDown, tr ("Move Down (Ctrl-Down)"));
         mBtnUp->setAutoRaise (true);
         mBtnDown->setAutoRaise (true);
-        mBtnUp->setFocusPolicy (QWidget::StrongFocus);
-        mBtnDown->setFocusPolicy (QWidget::StrongFocus);
+        mBtnUp->setFocusPolicy (Qt::StrongFocus);
+        mBtnDown->setFocusPolicy (Qt::StrongFocus);
         mBtnUp->setIconSet (VBoxGlobal::iconSet ("list_moveup_16px.png",
                                                  "list_moveup_disabled_16px.png"));
@@ -290 +300 @@
             {
                 QString name = vboxGlobal().toString (type);
-                QCheckListItem *item = new BootItem (mBootTable,
-                    mBootTable->lastItem(), name, QCheckListItem::CheckBox);
+                Q3CheckListItem *item = new BootItem (mBootTable,
+                    mBootTable->lastItem(), name, Q3CheckListItem::CheckBox);
                 item->setOn (true);
                 uniqueList << name;
@@ -304 +314 @@
             if (!uniqueList.contains (name))
             {
-                QCheckListItem *item = new BootItem (mBootTable,
-                    mBootTable->lastItem(), name, QCheckListItem::CheckBox);
+                Q3CheckListItem *item = new BootItem (mBootTable,
+                    mBootTable->lastItem(), name, Q3CheckListItem::CheckBox);
                 uniqueList << name;
                 int width = item->width (mBootTable->fontMetrics(), mBootTable, 0);
@@ -321 +331 @@
     void putBackToMachine (CMachine &aMachine)
     {
-        QCheckListItem *item = 0;
+        Q3CheckListItem *item = 0;
         /* Search for checked items */
         int index = 1;
-        item = static_cast<QCheckListItem*> (mBootTable->firstChild());
+        item = static_cast<Q3CheckListItem*> (mBootTable->firstChild());
         while (item)
         {
@@ -333 +343 @@
                 aMachine.SetBootOrder (index++, type);
             }
-            item = static_cast<QCheckListItem*> (item->nextSibling());
+            item = static_cast<Q3CheckListItem*> (item->nextSibling());
         }
         /* Search for non-checked items */
-        item = static_cast<QCheckListItem*> (mBootTable->firstChild());
+        item = static_cast<Q3CheckListItem*> (mBootTable->firstChild());
         while (item)
         {
             if (!item->isOn())
                 aMachine.SetBootOrder (index++, KDeviceType_Null);
-            item = static_cast<QCheckListItem*> (item->nextSibling());
+            item = static_cast<Q3CheckListItem*> (item->nextSibling());
         }
     }
@@ -367 +377 @@
     void moveItemUp()
     {
-        QListViewItem *item = mBootTable->currentItem();
+        Q3ListViewItem *item = mBootTable->currentItem();
         Assert (item);
-        QListViewItem *itemAbove = item->itemAbove();
+        Q3ListViewItem *itemAbove = item->itemAbove();
         if (!itemAbove) return;
         itemAbove->moveItem (item);
@@ -378 +388 @@
     void moveItemDown()
     {
-        QListViewItem *item = mBootTable->currentItem();
+        Q3ListViewItem *item = mBootTable->currentItem();
         Assert (item);
-        QListViewItem *itemBelow = item->itemBelow();
+        Q3ListViewItem *itemBelow = item->itemBelow();
         if (!itemBelow) return;
         item->moveItem (itemBelow);
@@ -392 +402 @@
     }
 
-    void processCurrentChanged (QListViewItem *aItem)
+    void processCurrentChanged (Q3ListViewItem *aItem)
     {
         bool upEnabled   = aItem && aItem->isSelected() && aItem->itemAbove();
@@ -429 +439 @@
 //}
 
-class USBListItem : public QCheckListItem
+class USBListItem : public Q3CheckListItem
 {
 public:
 
-    USBListItem (QListView *aParent, QListViewItem *aAfter)
-        : QCheckListItem (aParent, aAfter, QString::null, CheckBox)
+    USBListItem (Q3ListView *aParent, Q3ListViewItem *aAfter)
+        : Q3CheckListItem (aParent, aAfter, QString::null, CheckBox)
         , mId (-1) {}
 
@@ -444 +454 @@
  *  using the text of the first column of every item.
  */
-static QString path (QListViewItem *li)
+static QString path (Q3ListViewItem *li)
 {
     static QString sep = ": ";
     QString p;
-    QListViewItem *cur = li;
+    Q3ListViewItem *cur = li;
     while (cur)
     {
@@ -480 +490 @@
              this, SLOT (onMediaEnumerationDone()));
 
-    setIcon (QPixmap::fromMimeSource ("settings_16px.png"));
+    setIcon (qPixmapFromMimeSource ("settings_16px.png"));
 
     /* all pages are initially valid */
@@ -490 +500 @@
     /* hide the header and internal columns */
     listView->header()->hide();
-    listView->setColumnWidthMode (listView_Id, QListView::Manual);
-    listView->setColumnWidthMode (listView_Link, QListView::Manual);
+    listView->setColumnWidthMode (listView_Id, Q3ListView::Manual);
+    listView->setColumnWidthMode (listView_Link, Q3ListView::Manual);
     listView->hideColumn (listView_Id);
     listView->hideColumn (listView_Link);
@@ -520 +530 @@
 
     whatsThisLabel = new QIRichLabel (this, "whatsThisLabel");
-    VBoxVMSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
+#warning port me
+//    VBoxVMSettingsDlgLayout->addWidget (whatsThisLabel, 2, 1);
 
 #ifndef DEBUG
@@ -534 +545 @@
 
     whatsThisLabel->setMaxHeightMode (true);
-    whatsThisLabel->setFocusPolicy (QWidget::NoFocus);
+    whatsThisLabel->setFocusPolicy (Qt::NoFocus);
     whatsThisLabel->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
-    whatsThisLabel->setBackgroundMode (QLabel::PaletteMidlight);
+    whatsThisLabel->setBackgroundMode (Qt::PaletteMidlight);
     whatsThisLabel->setFrameShape (QLabel::Box);
     whatsThisLabel->setFrameShadow (QLabel::Sunken);
     whatsThisLabel->setMargin (7);
     whatsThisLabel->setScaledContents (FALSE);
-    whatsThisLabel->setAlignment (int (QLabel::WordBreak |
-                                       QLabel::AlignJustify |
-                                       QLabel::AlignTop));
+    whatsThisLabel->setAlignment (int (Qt::TextWordWrap |
+                                       Qt::AlignJustify |
+                                       Qt::AlignTop));
 
     whatsThisLabel->setFixedHeight (whatsThisLabel->frameWidth() * 2 +
@@ -584 +595 @@
     /* HDD Images page */
 
-    QWhatsThis::add (static_cast <QWidget *> (grbHDA->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (grbHDA->child ("qt_groupbox_checkbox")),
                      tr ("When checked, attaches the specified virtual hard disk to the "
                          "Master slot of the Primary IDE controller."));
-    QWhatsThis::add (static_cast <QWidget *> (grbHDB->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (grbHDB->child ("qt_groupbox_checkbox")),
                      tr ("When checked, attaches the specified virtual hard disk to the "
                          "Slave slot of the Primary IDE controller."));
-    QWhatsThis::add (static_cast <QWidget *> (grbHDD->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (grbHDD->child ("qt_groupbox_checkbox")),
                      tr ("When checked, attaches the specified virtual hard disk to the "
                          "Slave slot of the Secondary IDE controller."));
@@ -596 +607 @@
     cbHDB = new VBoxMediaComboBox (grbHDB, "cbHDB", VBoxDefs::HD);
     cbHDD = new VBoxMediaComboBox (grbHDD, "cbHDD", VBoxDefs::HD);
-    hdaLayout->insertWidget (0, cbHDA);
-    hdbLayout->insertWidget (0, cbHDB);
-    hddLayout->insertWidget (0, cbHDD);
+#warning port me
+//    hdaLayout->insertWidget (0, cbHDA);
+//    hdbLayout->insertWidget (0, cbHDB);
+//    hddLayout->insertWidget (0, cbHDD);
     /* sometimes the weirdness of Qt just kills... */
     setTabOrder (static_cast <QWidget *> (grbHDA->child ("qt_groupbox_checkbox")),
@@ -607 +619 @@
                  cbHDD);
 
-    QWhatsThis::add (cbHDB, tr ("Displays the virtual hard disk to attach to this IDE slot "
+    Q3WhatsThis::add (cbHDB, tr ("Displays the virtual hard disk to attach to this IDE slot "
                                 "and allows to quickly select a different hard disk."));
-    QWhatsThis::add (cbHDD, tr ("Displays the virtual hard disk to attach to this IDE slot "
+    Q3WhatsThis::add (cbHDD, tr ("Displays the virtual hard disk to attach to this IDE slot "
                                 "and allows to quickly select a different hard disk."));
-    QWhatsThis::add (cbHDA, tr ("Displays the virtual hard disk to attach to this IDE slot "
+    Q3WhatsThis::add (cbHDA, tr ("Displays the virtual hard disk to attach to this IDE slot "
                                 "and allows to quickly select a different hard disk."));
-    QWhatsThis::add (cbHDB, tr ("Displays the virtual hard disk to attach to this IDE slot "
+    Q3WhatsThis::add (cbHDB, tr ("Displays the virtual hard disk to attach to this IDE slot "
                                 "and allows to quickly select a different hard disk."));
-    QWhatsThis::add (cbHDD, tr ("Displays the virtual hard disk to attach to this IDE slot "
+    Q3WhatsThis::add (cbHDD, tr ("Displays the virtual hard disk to attach to this IDE slot "
                                 "and allows to quickly select a different hard disk."));
 
@@ -644 +656 @@
     /* CD/DVD-ROM Drive Page */
 
-    QWhatsThis::add (static_cast <QWidget *> (bgDVD->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (bgDVD->child ("qt_groupbox_checkbox")),
                      tr ("When checked, mounts the specified media to the CD/DVD drive of the "
                          "virtual machine. Note that the CD/DVD drive is always connected to the "
                          "Secondary Master IDE controller of the machine."));
     cbISODVD = new VBoxMediaComboBox (bgDVD, "cbISODVD", VBoxDefs::CD);
-    cdLayout->insertWidget(0, cbISODVD);
-    QWhatsThis::add (cbISODVD, tr ("Displays the image file to mount to the virtual CD/DVD "
+#warning port me
+//    cdLayout->insertWidget(0, cbISODVD);
+    Q3WhatsThis::add (cbISODVD, tr ("Displays the image file to mount to the virtual CD/DVD "
                                    "drive and allows to quickly select a different image."));
 
@@ -671 +684 @@
     /* Floppy Drive Page */
 
-    QWhatsThis::add (static_cast <QWidget *> (bgFloppy->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (bgFloppy->child ("qt_groupbox_checkbox")),
                      tr ("When checked, mounts the specified media to the Floppy drive of the "
                          "virtual machine."));
     cbISOFloppy = new VBoxMediaComboBox (bgFloppy, "cbISOFloppy", VBoxDefs::FD);
-    fdLayout->insertWidget(0, cbISOFloppy);
-    QWhatsThis::add (cbISOFloppy, tr ("Displays the image file to mount to the virtual Floppy "
+#warning port me
+//    fdLayout->insertWidget(0, cbISOFloppy);
+    Q3WhatsThis::add (cbISOFloppy, tr ("Displays the image file to mount to the virtual Floppy "
                                       "drive and allows to quickly select a different image."));
 
@@ -697 +711 @@
     /* Audio Page */
 
-    QWhatsThis::add (static_cast <QWidget *> (grbAudio->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (grbAudio->child ("qt_groupbox_checkbox")),
                      tr ("When checked, the virtual PCI audio card is plugged into the "
                          "virtual machine that uses the specified driver to communicate "
@@ -721 +735 @@
 
     /* Parallel Port Page (currently disabled) */
-    QListViewItem *item = listView->findItem ("#parallelPorts", listView_Link);
+    Q3ListViewItem *item = listView->findItem ("#parallelPorts", listView_Link);
     if (item) item->setVisible (false);
 
@@ -741 +755 @@
     //  If we remove stacking, we will have to create a structure to store
     //  editable data of all USB filters while the dialog is open.
-    wstUSBFilters = new QWidgetStack (grbUSBFilters, "wstUSBFilters");
-    grbUSBFiltersLayout->addWidget (wstUSBFilters);
+    wstUSBFilters = new Q3WidgetStack (grbUSBFilters, "wstUSBFilters");
+#warning port me
+//    grbUSBFiltersLayout->addWidget (wstUSBFilters);
     /* create a default (disabled) filter settings widget at index 0 */
     VBoxUSBFilterSettings *settings = new VBoxUSBFilterSettings (wstUSBFilters);
@@ -766 +781 @@
     /* VRDP Page */
 
-    QWhatsThis::add (static_cast <QWidget *> (grbVRDP->child ("qt_groupbox_checkbox")),
+    Q3WhatsThis::add (static_cast <QWidget *> (grbVRDP->child ("qt_groupbox_checkbox")),
                      tr ("When checked, the VM will act as a Remote Desktop "
                          "Protocol (RDP) server, allowing remote clients to connect "
@@ -786 +801 @@
     /* Shared Folders Page */
 
-    QVBoxLayout* pageFoldersLayout = new QVBoxLayout (pageFolders, 0, 10, "pageFoldersLayout");
+    Q3VBoxLayout* pageFoldersLayout = new Q3VBoxLayout (pageFolders, 0, 10, "pageFoldersLayout");
     mSharedFolders = new VBoxSharedFoldersSettings (pageFolders, "sharedFolders");
     mSharedFolders->setDialogType (VBoxSharedFoldersSettings::MachineType);
@@ -840 +855 @@
     setTabOrder (tbwGeneral, tblBootOrder);
     setTabOrder (tblBootOrder->focusProxy(), chbEnableACPI);
-    groupBox12Layout->addWidget (tblBootOrder);
+#warning port me
+//    groupBox12Layout->addWidget (tblBootOrder);
     tblBootOrder->fixTabStops();
     /* Shared Clipboard mode */
@@ -905 +921 @@
 QString VBoxVMSettingsDlg::pagePath (QWidget *aPage)
 {
-    QListViewItem *li = listView->
+    Q3ListViewItem *li = listView->
         findItem (QString::number (widgetStack->id (aPage)), 1);
     return ::path (li);
@@ -1241 +1257 @@
 
 
-QString VBoxVMSettingsDlg::getHdInfo (QGroupBox *aGroupBox, QUuid aId)
+QString VBoxVMSettingsDlg::getHdInfo (Q3GroupBox *aGroupBox, QUuid aId)
 {
     QString notAttached = tr ("<not attached>", "hard disk");
@@ -1263 +1279 @@
     else
     {
-        widget = focusData()->focusWidget();
+#warning port me
+//        widget = focusData()->focusWidget();
     }
     /* if the given widget lacks the whats'this text, look at its parent */
     while (widget && widget != this)
     {
-        text = QWhatsThis::textFor (widget);
+#warning port me
+//        text = Q3WhatsThis::textFor (widget);
         if (!text.isEmpty())
             break;
@@ -1274 +1292 @@
     }
 
-    if (text.isEmpty() && !warningString.isEmpty())
-        text = warningString;
-    if (text.isEmpty())
-        text = QWhatsThis::textFor (this);
+#warning port me
+//    if (text.isEmpty() && !warningString.isEmpty())
+//        text = warningString;
+//    if (text.isEmpty())
+//        text = Q3WhatsThis::textFor (this);
 
     whatsThisLabel->setText (text);
@@ -1316 +1335 @@
     {
         /* search for a list view item corresponding to the category */
-        QListViewItem *item = listView->findItem (aCategory, listView_Link);
+        Q3ListViewItem *item = listView->findItem (aCategory, listView_Link);
         if (item)
         {
@@ -1328 +1347 @@
                 {
                     QWidget *w = static_cast <QWidget *> (obj);
-                    QWidgetList parents;
+                    Q3PtrList<QWidget> parents;
                     QWidget *p = w;
                     while ((p = p->parentWidget()) != NULL)
@@ -1352 +1371 @@
 }
 
-void VBoxVMSettingsDlg::listView_currentChanged (QListViewItem *item)
+void VBoxVMSettingsDlg::listView_currentChanged (Q3ListViewItem *item)
 {
     Assert (item);
@@ -1375 +1394 @@
     bool newValid = true;
     {
-        QObjectList *l = this->queryList ("QIWidgetValidator");
-        QObjectListIt it (*l);
-        QObject *obj;
-        while ((obj = it.current()) != 0)
+        QObjectList l = this->queryList ("QIWidgetValidator");
+        foreach(QObject *obj, l)
         {
             QIWidgetValidator *wval = (QIWidgetValidator *) obj;
@@ -1387 +1404 @@
                 break;
             }
-            ++ it;
-        }
-        delete l;
+        }
     }
 
@@ -1423 +1438 @@
         valid = true;
 
-        QValueList <QUuid> uuids;
+        Q3ValueList <QUuid> uuids;
 
         if (valid && grbHDA->isChecked())
@@ -1552 +1567 @@
     {
         valid = true;
-        QValueList <QString> ports;
-        QValueList <QString> paths;
+        Q3ValueList <QString> ports;
+        Q3ValueList <QString> paths;
 
         int index = 0;
@@ -1597 +1612 @@
     {
         valid = true;
-        QValueList <QString> ports;
-        QValueList <QString> paths;
+        Q3ValueList <QString> ports;
+        Q3ValueList <QString> paths;
 
         int index = 0;
@@ -1706 +1721 @@
             LONG dev;
             struct {
-                QGroupBox *grb;
+                Q3GroupBox *grb;
                 QComboBox *cbb;
                 QLabel *tx;
@@ -1946 +1961 @@
              * not available (i.e. in VirtualBox OSE) */
 
-            QListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
+            Q3ListViewItem *usbItem = listView->findItem ("#usb", listView_Link);
             Assert (usbItem);
             if (usbItem)
@@ -1980 +1995 @@
              * not available (i.e. in VirtualBox OSE) */
 
-            QListViewItem *vrdpItem = listView->findItem ("#vrdp", listView_Link);
+            Q3ListViewItem *vrdpItem = listView->findItem ("#vrdp", listView_Link);
             Assert (vrdpItem);
             if (vrdpItem)
@@ -2054 +2069 @@
     /* VT-x/AMD-V */
     cmachine.SetHWVirtExEnabled (
-        chbVTX->state() == QButton::Off ? KTSBool_False :
-        chbVTX->state() == QButton::On ? KTSBool_True : KTSBool_Default);
+        chbVTX->state() == QCheckBox::Off ? KTSBool_False :
+        chbVTX->state() == QCheckBox::On ? KTSBool_True : KTSBool_Default);
 
     /* Saved state folder */
@@ -2089 +2104 @@
             LONG dev;
             struct {
-                QGroupBox *grb;
+                Q3GroupBox *grb;
                 QUuid *uuid;
             } data;
@@ -2256 +2271 @@
 
             /* then add all new filters */
-            for (QListViewItem *item = lvUSBFilters->firstChild(); item;
+            for (Q3ListViewItem *item = lvUSBFilters->firstChild(); item;
                  item = item->nextSibling())
             {
@@ -2320 +2335 @@
 
     VBoxDiskImageManagerDlg dlg (this, "VBoxDiskImageManagerDlg",
-                                 WType_Dialog | WShowModal);
+                                 Qt::WType_Dialog | Qt::WShowModal);
     QUuid machineId = cmachine.GetId();
     QUuid hdId = type == VBoxDefs::HD ? cbb->getId() : QUuid();
@@ -2567 +2582 @@
 void VBoxVMSettingsDlg::addUSBFilter (const CUSBDeviceFilter &aFilter, bool isNew)
 {
-    QListViewItem *currentItem = isNew
+    Q3ListViewItem *currentItem = isNew
         ? lvUSBFilters->currentItem()
         : lvUSBFilters->lastItem();
@@ -2606 +2621 @@
 }
 
-void VBoxVMSettingsDlg::lvUSBFilters_currentChanged (QListViewItem *item)
+void VBoxVMSettingsDlg::lvUSBFilters_currentChanged (Q3ListViewItem *item)
 {
     if (item && lvUSBFilters->selectedItem() != item)
@@ -2630 +2645 @@
 void VBoxVMSettingsDlg::lvUSBFilters_setCurrentText (const QString &aText)
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
@@ -2642 +2657 @@
     QString usbFilterName = tr ("New Filter %1", "usb");
     QRegExp regExp (QString ("^") + usbFilterName.arg ("([0-9]+)") + QString ("$"));
-    QListViewItemIterator iterator (lvUSBFilters);
+    Q3ListViewItemIterator iterator (lvUSBFilters);
     while (*iterator)
     {
@@ -2702 +2717 @@
 void VBoxVMSettingsDlg::tbRemoveUSBFilter_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
@@ -2719 +2734 @@
 void VBoxVMSettingsDlg::tbUSBFilterUp_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
-    QListViewItem *itemAbove = item->itemAbove();
+    Q3ListViewItem *itemAbove = item->itemAbove();
     Assert (itemAbove);
     itemAbove = itemAbove->itemAbove();
@@ -2740 +2755 @@
 void VBoxVMSettingsDlg::tbUSBFilterDown_clicked()
 {
-    QListViewItem *item = lvUSBFilters->currentItem();
+    Q3ListViewItem *item = lvUSBFilters->currentItem();
     Assert (item);
 
-    QListViewItem *itemBelow = item->itemBelow();
+    Q3ListViewItem *itemBelow = item->itemBelow();
     Assert (itemBelow);