Changeset 13908 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Nov 6, 2008 11:53:47 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38915

Message:

Fixed include order, a bunch of GCC 3.3 warnings, OS/2 build.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/QIWidgetValidator.cpp (modified) (2 diffs)
• src/VBoxMediaComboBox.cpp (modified) (1 diff)

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

@@ -64 +64 @@
  # Hack for installing the qt.dll when building for OS/2.
  #
- ifneq ($(strip $(VBOX_DLL_QT)),)
+ ifneq ($(strip $(DLL_SDK_QT3_QT)),)
   INSTALLS.os2 += qt.dll
   qt.dll_INST = $(INST_BIN)
   qt.dll_SOURCES += \
-        $(VBOX_DLL_QT)=>$(not-dir $(VBOX_DLL_QT))
+        $(DLL_SDK_QT3_QT)=>$(not-dir $(DLL_SDK_QT3_QT))
  endif
 endif # OS/2
@@ -339 +339 @@
 
 VirtualBox_INCS           = \
+    . \
         ./include \
         $(PATH_VirtualBox)/include

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

@@ -23 +23 @@
 #include "QIWidgetValidator.h"
 
+#include "VBoxGlobal.h"
+
 #include <qobjectlist.h>
 #include <qlineedit.h>
@@ -29 +31 @@
 
 #include <iprt/assert.h>
-
-#include "VBoxGlobal.h"
 
 /** @class QIWidgetValidator

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

@@ -107 +107 @@
 QUuid VBoxMediaComboBox::id (int aIndex /*= -1*/)
 {
+#if (__GNUC__ * 100 + __GNUC_MINOR__) >= 304
     AssertReturn (aIndex == -1 ||
                   (aIndex >= 0 && (size_t) aIndex < mMedia.size()),
                   QUuid());
+#else
+    static QUuid null;
+    AssertReturn (aIndex == -1 ||
+                  (aIndex >= 0 && (size_t) aIndex < mMedia.size()),
+                  null);
+#endif
 
     return mMedia [aIndex == -1 ? currentItem() : aIndex].id;