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.
2020-08-12 17:01:03 -07:00
parent 0f65db801c
commit 0645f5483d
23 changed files with 57 additions and 190 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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*/
--- 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*/
+
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>