Changeset 23246 in vbox for trunk

Timestamp:

Sep 23, 2009 8:56:22 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix r52704 properly

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

-              r16693
+              r23246
 #if defined (Q_WS_MAC)
 # include <Carbon/Carbon.h>
+/* Carbon.h includes AssertMacros.h which defines the macro "check". In
+ * QItemDelegate a class method is called check also. As we not used the macro
+ * undefine it here. */
+# undef check
 #endif

-              r23243
+              r23246
 // #define ENABLE_GLOBAL_USB
-/* @todo: poetzsch: This includes somehow AssertMacros.h on Mac OS X, which
- * defines a macro "check". This name is also used in a Qt class. Have to look
- * at this in detail later */
-#include "VBoxVMSettingsHD.h"
 #include "VBoxSettingsDialogSpecific.h"
 …
 #include "VBoxVMSettingsSystem.h"
 #include "VBoxVMSettingsDisplay.h"
+#include "VBoxVMSettingsHD.h"
 #include "VBoxVMSettingsAudio.h"
 #include "VBoxVMSettingsNetwork.h"

Note: See TracChangeset for help on using the changeset viewer.