turn off clang -Wshadow when processing some qt headers

removes recently added win/Qt/qt_undef.h and win/Qt/qt_redef.h
adds win/Qt/qt_pre.h win/Qt/qt_post.h

win/Qt/qt_bind.cpp

@@ -17,7 +17,7 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #include <QtCore/QStringList>
 #if QT_VERSION >= 0x050000
@@ -26,7 +26,7 @@ extern "C" {
 #else
 #include <QtGui/QSound>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_bind.h"
 #include "qt_click.h"
 #ifdef TIMED_DELAY

win/Qt/qt_click.cpp

@@ -15,9 +15,9 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_click.h"
 
 namespace nethack_qt_ {

win/Qt/qt_delay.cpp

@@ -15,9 +15,9 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_delay.h"
 
 namespace nethack_qt_ {

win/Qt/qt_glyph.cpp

@@ -18,12 +18,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_glyph.h"
 #include "qt_set.h"
 #include "qt_str.h"

win/Qt/qt_icon.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_icon.h"
 
 namespace nethack_qt_ {

win/Qt/qt_inv.cpp

@@ -18,12 +18,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_inv.h"
 #include "qt_glyph.h"
 #include "qt_set.h"

win/Qt/qt_key.cpp

@@ -15,9 +15,9 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_key.h"
 
 namespace nethack_qt_ {

win/Qt/qt_line.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_line.h"
 
 namespace nethack_qt_ {

win/Qt/qt_main.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_main.h"
 #include "qt_main.moc"
 #include "qt_bind.h"

win/Qt/qt_map.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_map.h"
 #include "qt_map.moc"
 #include "qt_click.h"

win/Qt/qt_menu.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_menu.h"
 #include "qt_menu.moc"
 #include "qt_glyph.h"

win/Qt/qt_msg.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_msg.h"
 #include "qt_msg.moc"
 #include "qt_map.h"

win/Qt/qt_plsel.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_plsel.h"
 #include "qt_plsel.moc"
 #include "qt_bind.h"

win/Qt/qt_post.h

@@ -0,0 +1,4 @@
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif /* __clang__ */
+

win/Qt/qt_pre.h

@@ -0,0 +1,5 @@
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+

win/Qt/qt_redef.h

@@ -1,19 +0,0 @@
-#if defined(QT_GRAPHICS)
-#if defined(MACOSX)
- 
-/* 
- * The following conflict with Qt header files so after
- * undefing them in qt_undef.h, we redefine them back to
- * the non-conflicting names again in here, presumably
- * right after the Qt header files with the conflicts have 
- * been included.
- */
-
-#define u NETHACK_u
-#define flags NETHACK_flags
-#define g NETHACK_g
-#define cg NETHACK_cg
-
-#endif /* MACOSX */
-#endif /* QT_GRAPHICS */
-

win/Qt/qt_rip.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_rip.h"
 #include "qt_bind.h"
 #include "qt_str.h"

win/Qt/qt_set.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_set.h"
 #include "qt_set.moc"
 #include "qt_glyph.h"

win/Qt/qt_stat.cpp

@@ -17,12 +17,12 @@ extern "C" {
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_stat.h"
 #include "qt_stat.moc"
 #include "qt_set.h"

win/Qt/qt_streq.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_streq.h"
 #include "qt_str.h"
 

win/Qt/qt_svsel.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_svsel.h"
 #include "qt_bind.h"
 #include "qt_str.h"

win/Qt/qt_undef.h

@@ -1,17 +0,0 @@
-#if defined(QT_GRAPHICS)
-#if defined(MACOSX)
-
-/* 
- * The following conflict with Qt header files so we
- * undef them in here, then redef them using qt_redef.h
- * after the Qt includes.
- */
-
-#undef u
-#undef flags
-#undef g
-#undef cg
-
-#endif /* MACOSX */
-#endif /* QT_GRAPHICS */
-

win/Qt/qt_win.cpp

@@ -57,12 +57,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_win.h"
 #include "qt_bind.h"
 #include "qt_click.h"

win/Qt/qt_xcmd.cpp

@@ -16,12 +16,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_xcmd.h"
 #include "qt_xcmd.moc"
 #include "qt_bind.h"

win/Qt/qt_yndlg.cpp

@@ -15,12 +15,12 @@
 #undef min
 #undef max
 
-#include "qt_undef.h"
+#include "qt_pre.h"
 #include <QtGui/QtGui>
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt_redef.h"
+#include "qt_post.h"
 #include "qt_yndlg.h"
 #include "qt_yndlg.moc"
 #include "qt_str.h"