Qt header usage

Move the nine #undef's common to all qt_*.cpp sources into qt_pre.h.

Make "hack.h" usage consistent; always enclose withing 'extern "C {'
and '}' even though only some of the sources care.

diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp
index acf267eb7a0c74847a2f215596132cd310444f80..56215a6dcdb88f81afa9f99033a7cdd61419ea38 100644 (file)
--- a/win/Qt/qt_bind.cpp
+++ b/win/Qt/qt_bind.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_click.cpp b/win/Qt/qt_click.cpp
index 6b9c7b4da3cc516ece7a2db7b2b537e05cf21674..d8f5030b7df868c0f51e32a089b4bc596d449c31 100644 (file)
--- a/win/Qt/qt_click.cpp
+++ b/win/Qt/qt_click.cpp
@@ -4,16 +4,9 @@
 
 // qt_click.cpp -- a mouse click buffer
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_delay.cpp b/win/Qt/qt_delay.cpp
index 803946aea37b0be89936c82febc882196158bcc2..0fa3003ce644f47826c433b752c11617d910f1ff 100644 (file)
--- a/win/Qt/qt_delay.cpp
+++ b/win/Qt/qt_delay.cpp
@@ -4,16 +4,9 @@
 
 // qt_delay.cpp -- implement a delay
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_glyph.cpp b/win/Qt/qt_glyph.cpp
index b804b939e233edcf515db4c839eb834d02337d5d..26ad9ec037b6d74fb11778e166e4aa9981f957c8 100644 (file)
--- a/win/Qt/qt_glyph.cpp
+++ b/win/Qt/qt_glyph.cpp
@@ -6,17 +6,8 @@
 
 extern "C" {
 #include "hack.h"
-}
 #include "tile2x11.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_icon.cpp b/win/Qt/qt_icon.cpp
index 87dfac10fbc198f7ae52c481d3b5951b174bad10..27b578420754b6d2cb0d24eba8e252f7305fb9e9 100644 (file)
--- a/win/Qt/qt_icon.cpp
+++ b/win/Qt/qt_icon.cpp
@@ -4,16 +4,9 @@
 
 // qt_icon.cpp -- a labelled icon
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_inv.cpp b/win/Qt/qt_inv.cpp
index c900a5e7c6feea4ae5605ca89e4dcb375d5160a1..6a872bdd224609531b773c46a2b363c9fdd0278f 100644 (file)
--- a/win/Qt/qt_inv.cpp
+++ b/win/Qt/qt_inv.cpp
@@ -11,15 +11,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_key.cpp b/win/Qt/qt_key.cpp
index 04d1b3d21bebf88ef12c58eddf344210457ae717..5aa807803348b6e80e84995a4d390e381eb9e4b3 100644 (file)
--- a/win/Qt/qt_key.cpp
+++ b/win/Qt/qt_key.cpp
@@ -4,16 +4,9 @@
 
 // qt_key.cpp -- a key buffer
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_line.cpp b/win/Qt/qt_line.cpp
index 4c1f63eba27293239d5e1d3d75d81e56d8691a38..482122589442732d800b376aa5cc0fbefb2f716d 100644 (file)
--- a/win/Qt/qt_line.cpp
+++ b/win/Qt/qt_line.cpp
@@ -4,16 +4,9 @@
 
 // qt_line.cpp -- a one line input window
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp
index 6fc39047e9ade9c13e6260417796a8be4983d691..3c10f5fcec7c7b577b9b32a3208eea138603861b 100644 (file)
--- a/win/Qt/qt_main.cpp
+++ b/win/Qt/qt_main.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_map.cpp b/win/Qt/qt_map.cpp
index 1508b2213dfac79b7094e1006b159cd393e9473d..51fafda2db3d48c9755c375c5144bda0557876e2 100644 (file)
--- a/win/Qt/qt_map.cpp
+++ b/win/Qt/qt_map.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_menu.cpp b/win/Qt/qt_menu.cpp
index 53b09d6ff3a5e6a7c849250b3de7d8d4e3c75d2c..b3d192eb188b8975bff4241f013e7bcaf2ae360d 100644 (file)
--- a/win/Qt/qt_menu.cpp
+++ b/win/Qt/qt_menu.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_msg.cpp b/win/Qt/qt_msg.cpp
index e3e02d9a1aedd424cd15ccf4be538cb23831adf5..aee2ea135cd9f3b9b5cd4ccef7732456345848af 100644 (file)
--- a/win/Qt/qt_msg.cpp
+++ b/win/Qt/qt_msg.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_plsel.cpp b/win/Qt/qt_plsel.cpp
index 8fbafd5277dd98e55b77fbc2755470240d25a476..d9a2d4337102fb798091837c88d0980874f41d44 100644 (file)
--- a/win/Qt/qt_plsel.cpp
+++ b/win/Qt/qt_plsel.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_post.h b/win/Qt/qt_post.h
index d4eaba25415e814b693afb2f9fbb3cf5c9283e57..a63122f435ddfd93d3f0e713ec3f1e6fb54f3cdc 100644 (file)
--- a/win/Qt/qt_post.h
+++ b/win/Qt/qt_post.h
@@ -1,4 +1,13 @@
+/* NetHack 3.7 qt_post.h       $NHDT-Date: 1597276832 2020/08/13 00:00:32 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */
+
+/*
+ * qt_post.h -- reverse part of qt_pre.h.
+ *
+ * #include after <Qt.../Qt...>.
+ */
+
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif /* __clang__ */
 
+/*qt_post.h*/

diff --git a/win/Qt/qt_pre.h b/win/Qt/qt_pre.h
index ea891fcf46c5d1f9713e8278df4d6de4f6452e1c..e3dcdde0d405fbfe9c2bf2d995a6141d28ed557b 100644 (file)
--- a/win/Qt/qt_pre.h
+++ b/win/Qt/qt_pre.h
@@ -1,5 +1,28 @@
+/* NetHack 3.7 qt_pre.h        $NHDT-Date: 1597276835 2020/08/13 00:00:35 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ */
+
+/*
+ * qt_pre.h -- undefine some nethack macros which conflict with Qt headers.
+ *
+ * #include after "hack.h", before <Qt.../Qt...>.
+ */
+
+#undef Invisible
+#undef Warning
+#undef index
+#undef msleep
+#undef rindex
+#undef wizard
+#undef yn
+#undef min
+#undef max
+
+/* disable warnings for shadowed names; some of the Qt prototypes use
+   placeholder argument names which conflict with nethack variables
+   ('g', 'u', a couple of others) */
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wshadow"
 #endif
 
+/*qt_pre.h*/
+

diff --git a/win/Qt/qt_rip.cpp b/win/Qt/qt_rip.cpp
index 49402c85f1dbe3f86749b8abcc8b3f0957b42aa2..aa7a8ebc42472c90f7f03f2cbda20e84c303d8fe 100644 (file)
--- a/win/Qt/qt_rip.cpp
+++ b/win/Qt/qt_rip.cpp
@@ -4,16 +4,9 @@
 
 // qt_rip.cpp -- tombstone window
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_set.cpp b/win/Qt/qt_set.cpp
index d265acaf2f653008b3521c1d28ea4b6edda327b6..0c35291bc9331e635101f467b21fb4cd9b736999 100644 (file)
--- a/win/Qt/qt_set.cpp
+++ b/win/Qt/qt_set.cpp
@@ -4,16 +4,9 @@
 
 // qt_set.cpp -- the Qt settings
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_stat.cpp b/win/Qt/qt_stat.cpp
index 22fb2f6a52267f12d21fa4c9863d6f927ecb44a9..2a8c262eab1aa8d74a84f40a82ac1d2b19c89ee0 100644 (file)
--- a/win/Qt/qt_stat.cpp
+++ b/win/Qt/qt_stat.cpp
@@ -7,15 +7,6 @@
 extern "C" {
 #include "hack.h"
 }
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_streq.cpp b/win/Qt/qt_streq.cpp
index 9254ad04da211bb2558f900150eac43a657231d0..b37ab305fd1a581611960f9120c22a2145ca8415 100644 (file)
--- a/win/Qt/qt_streq.cpp
+++ b/win/Qt/qt_streq.cpp
@@ -4,16 +4,9 @@
 
 // qt_streq.cpp -- string requestor
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_svsel.cpp b/win/Qt/qt_svsel.cpp
index 66ecd13e81e02df20993219d34bea855ffa90767..f11562c68aa90da5f792bbbcc86859f470632717 100644 (file)
--- a/win/Qt/qt_svsel.cpp
+++ b/win/Qt/qt_svsel.cpp
@@ -4,16 +4,9 @@
 
 // qt_svsel.cpp -- saved game selector
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp
index 7a636ac16e04d5a369e0727eda59176b29378da7..326acb17c754bf6678c4a22cad0b4d0977b2c921 100644 (file)
--- a/win/Qt/qt_win.cpp
+++ b/win/Qt/qt_win.cpp
@@ -46,16 +46,9 @@
 // identifiers.
 
 #define QT_DEPRECATED_WARNINGS
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_xcmd.cpp b/win/Qt/qt_xcmd.cpp
index 3bb3a4f9203ccd2ebfd072e46045ffc34078d2e6..a1a34361004fa30274f7a8bd027512b07f661592 100644 (file)
--- a/win/Qt/qt_xcmd.cpp
+++ b/win/Qt/qt_xcmd.cpp
@@ -4,17 +4,10 @@
 
 // qt_xcmd.cpp -- extended command widget
 
+extern "C" {
 #include "hack.h"
 #include "func_tab.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>

diff --git a/win/Qt/qt_yndlg.cpp b/win/Qt/qt_yndlg.cpp
index cac810394caf32a82620e3115d9744b4b23325ac..389ee4858e4eec4ba0ed67cd489097f0367caf98 100644 (file)
--- a/win/Qt/qt_yndlg.cpp
+++ b/win/Qt/qt_yndlg.cpp
@@ -4,16 +4,9 @@
 
 // qt_yndlg.cpp -- yes/no dialog
 
+extern "C" {
 #include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
+}
 
 #include "qt_pre.h"
 #include <QtGui/QtGui>