From 0645f5483d573f3314f8114f0b5186f64c2f1126 Mon Sep 17 00:00:00 2001 From: PatR Date: Wed, 12 Aug 2020 17:01:03 -0700 Subject: [PATCH] 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. --- win/Qt/qt_bind.cpp | 9 --------- win/Qt/qt_click.cpp | 11 ++--------- win/Qt/qt_delay.cpp | 11 ++--------- win/Qt/qt_glyph.cpp | 11 +---------- win/Qt/qt_icon.cpp | 11 ++--------- win/Qt/qt_inv.cpp | 9 --------- win/Qt/qt_key.cpp | 11 ++--------- win/Qt/qt_line.cpp | 11 ++--------- win/Qt/qt_main.cpp | 9 --------- win/Qt/qt_map.cpp | 9 --------- win/Qt/qt_menu.cpp | 9 --------- win/Qt/qt_msg.cpp | 9 --------- win/Qt/qt_plsel.cpp | 9 --------- win/Qt/qt_post.h | 9 +++++++++ win/Qt/qt_pre.h | 23 +++++++++++++++++++++++ win/Qt/qt_rip.cpp | 11 ++--------- win/Qt/qt_set.cpp | 11 ++--------- win/Qt/qt_stat.cpp | 9 --------- win/Qt/qt_streq.cpp | 11 ++--------- win/Qt/qt_svsel.cpp | 11 ++--------- win/Qt/qt_win.cpp | 11 ++--------- win/Qt/qt_xcmd.cpp | 11 ++--------- win/Qt/qt_yndlg.cpp | 11 ++--------- 23 files changed, 57 insertions(+), 190 deletions(-) diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp index acf267eb7..56215a6dc 100644 --- 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 diff --git a/win/Qt/qt_click.cpp b/win/Qt/qt_click.cpp index 6b9c7b4da..d8f5030b7 100644 --- 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 diff --git a/win/Qt/qt_delay.cpp b/win/Qt/qt_delay.cpp index 803946aea..0fa3003ce 100644 --- 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 diff --git a/win/Qt/qt_glyph.cpp b/win/Qt/qt_glyph.cpp index b804b939e..26ad9ec03 100644 --- 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 diff --git a/win/Qt/qt_icon.cpp b/win/Qt/qt_icon.cpp index 87dfac10f..27b578420 100644 --- 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 diff --git a/win/Qt/qt_inv.cpp b/win/Qt/qt_inv.cpp index c900a5e7c..6a872bdd2 100644 --- 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 diff --git a/win/Qt/qt_key.cpp b/win/Qt/qt_key.cpp index 04d1b3d21..5aa807803 100644 --- 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 diff --git a/win/Qt/qt_line.cpp b/win/Qt/qt_line.cpp index 4c1f63eba..482122589 100644 --- 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 diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp index 6fc39047e..3c10f5fce 100644 --- 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 diff --git a/win/Qt/qt_map.cpp b/win/Qt/qt_map.cpp index 1508b2213..51fafda2d 100644 --- 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 diff --git a/win/Qt/qt_menu.cpp b/win/Qt/qt_menu.cpp index 53b09d6ff..b3d192eb1 100644 --- 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 diff --git a/win/Qt/qt_msg.cpp b/win/Qt/qt_msg.cpp index e3e02d9a1..aee2ea135 100644 --- 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 diff --git a/win/Qt/qt_plsel.cpp b/win/Qt/qt_plsel.cpp index 8fbafd527..d9a2d4337 100644 --- 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 diff --git a/win/Qt/qt_post.h b/win/Qt/qt_post.h index d4eaba254..a63122f43 100644 --- 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 . + */ + #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 ea891fcf4..e3dcdde0d 100644 --- 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 . + */ + +#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 49402c85f..aa7a8ebc4 100644 --- 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 diff --git a/win/Qt/qt_set.cpp b/win/Qt/qt_set.cpp index d265acaf2..0c35291bc 100644 --- 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 diff --git a/win/Qt/qt_stat.cpp b/win/Qt/qt_stat.cpp index 22fb2f6a5..2a8c262ea 100644 --- 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 diff --git a/win/Qt/qt_streq.cpp b/win/Qt/qt_streq.cpp index 9254ad04d..b37ab305f 100644 --- 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 diff --git a/win/Qt/qt_svsel.cpp b/win/Qt/qt_svsel.cpp index 66ecd13e8..f11562c68 100644 --- 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 diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index 7a636ac16..326acb17c 100644 --- 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 diff --git a/win/Qt/qt_xcmd.cpp b/win/Qt/qt_xcmd.cpp index 3bb3a4f92..a1a343610 100644 --- 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 diff --git a/win/Qt/qt_yndlg.cpp b/win/Qt/qt_yndlg.cpp index cac810394..389ee4858 100644 --- 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