Qt vs C() macro

Our C() macro conflicts with Qt6 usage, so #undef C has added. Move that from nearly every qt_*.cpp into qt_pre.h where other similar fixups are handled.
2021-12-30 11:29:03 -08:00
parent 221e4a760d
commit f7c71b9f83
22 changed files with 2 additions and 22 deletions
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_click.cpp
+++ b/win/Qt/qt_click.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_delay.cpp
+++ b/win/Qt/qt_delay.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_glyph.cpp
+++ b/win/Qt/qt_glyph.cpp
@@ -8,7 +8,6 @@ extern "C" {
 #include "hack.h"
 #include "tile2x11.h" /* x11tiles is potential fallback for nhtiles.bmp */
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_icon.cpp
+++ b/win/Qt/qt_icon.cpp
@@ -27,7 +27,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_inv.cpp
+++ b/win/Qt/qt_inv.cpp
@@ -21,7 +21,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_key.cpp
+++ b/win/Qt/qt_key.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_line.cpp
+++ b/win/Qt/qt_line.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_main.cpp
+++ b/win/Qt/qt_main.cpp
@@ -6,9 +6,8 @@

 extern "C" {
 #include "hack.h"
+#define CTRL(c) (0x1f & (c)) // substitute for C() from global.h, for ^V hack
 }
-#undef C
-#define CTRL(c) (0x1f & (c))

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_map.cpp
+++ b/win/Qt/qt_map.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_menu.cpp
+++ b/win/Qt/qt_menu.cpp
@@ -28,7 +28,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_msg.cpp
+++ b/win/Qt/qt_msg.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_plsel.cpp
+++ b/win/Qt/qt_plsel.cpp
@@ -18,7 +18,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_pre.h
+++ b/win/Qt/qt_pre.h
@@ -6,6 +6,7 @@
 * #include after "hack.h", before <Qt.../Qt...>.
 */

+#undef C            // conflicts with Qt6 header
 #undef Invisible
 #undef Warning
 #undef index
--- a/win/Qt/qt_rip.cpp
+++ b/win/Qt/qt_rip.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_set.cpp
+++ b/win/Qt/qt_set.cpp
@@ -8,7 +8,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_stat.cpp
+++ b/win/Qt/qt_stat.cpp
@@ -78,7 +78,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_streq.cpp
+++ b/win/Qt/qt_streq.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_svsel.cpp
+++ b/win/Qt/qt_svsel.cpp
@@ -41,7 +41,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_win.cpp
+++ b/win/Qt/qt_win.cpp
@@ -49,7 +49,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_xcmd.cpp
+++ b/win/Qt/qt_xcmd.cpp
@@ -77,7 +77,6 @@ extern "C" {
 #include "hack.h"
 #include "func_tab.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>
--- a/win/Qt/qt_yndlg.cpp
+++ b/win/Qt/qt_yndlg.cpp
@@ -7,7 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef C

 #include "qt_pre.h"
 #include <QtGui/QtGui>