diff --git a/include/config.h b/include/config.h index 492ff2bfc..7083a09bf 100644 --- a/include/config.h +++ b/include/config.h @@ -96,7 +96,6 @@ #endif #ifdef QT_GRAPHICS -#include "../win/Qt/qt_redef.h" #ifndef DEFAULT_WC_TILED_MAP #define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say \ wc_ascii_map */ diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src index 35381793f..6b1da0794 100644 --- a/sys/unix/Makefile.src +++ b/sys/unix/Makefile.src @@ -743,11 +743,10 @@ depend: ../sys/unix/depend.awk \ # config.h timestamp $(CONFIG_H): ../include/config.h ../include/config1.h ../include/patchlevel.h \ - ../include/../win/Qt/qt_redef.h ../include/tradstdc.h \ - ../include/global.h ../include/coord.h ../include/vmsconf.h \ - ../include/system.h ../include/nhlua.h ../include/unixconf.h \ - ../include/pcconf.h ../include/micro.h ../include/ntconf.h \ - ../include/fnamesiz.h + ../include/tradstdc.h ../include/global.h ../include/coord.h \ + ../include/vmsconf.h ../include/system.h ../include/nhlua.h \ + ../include/unixconf.h ../include/pcconf.h ../include/micro.h \ + ../include/ntconf.h ../include/fnamesiz.h touch $(CONFIG_H) # hack.h timestamp $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/lint.h ../include/align.h \ @@ -851,8 +850,8 @@ winval.o: ../win/X11/winval.c $(HACK_H) ../include/winX.h tile.o: tile.c $(HACK_H) cppregex.o: ../sys/share/cppregex.cpp $(CXX) $(CXXFLAGS) -c -o $@ ../sys/share/cppregex.cpp -qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ +qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h ../win/Qt/qt_delay.h \ ../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_menu.h \ @@ -861,86 +860,86 @@ qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_undef.h \ ../win/Qt/qt_icon.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ ../win/Qt/qt_yndlg.h ../win/Qt/qt_str.h ../include/dlb.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp -qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_click.h +qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_click.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp qt_clust.o: ../win/Qt/qt_clust.cpp ../win/Qt/qt_clust.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_clust.cpp -qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_delay.h +qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_delay.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_delay.cpp qt_glyph.o: ../win/Qt/qt_glyph.cpp $(HACK_H) ../include/tile2x11.h \ - ../win/Qt/qt_undef.h ../win/Qt/qt_redef.h ../win/Qt/qt_glyph.h \ + ../win/Qt/qt_pre.h ../win/Qt/qt_post.h ../win/Qt/qt_glyph.h \ ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_glyph.cpp -qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_icon.h +qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_icon.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_icon.cpp -qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_inv.h ../win/Qt/qt_glyph.h \ +qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_inv.h ../win/Qt/qt_glyph.h \ ../win/Qt/qt_set.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_inv.cpp -qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_key.h +qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_key.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_key.cpp -qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_line.h +qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_line.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp -qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ +qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ qt_main.moc ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h \ ../win/Qt/qt_inv.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \ ../win/Qt/qt_win.h ../win/Qt/qt_clust.h ../win/Qt/qt_msg.h \ ../win/Qt/qt_set.h ../win/Qt/qt_stat.h ../win/Qt/qt_icon.h \ ../win/Qt/qt_str.h qt_kde0.moc $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp -qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ +qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_map.h ../win/Qt/qt_win.h \ ../win/Qt/qt_clust.h qt_map.moc ../win/Qt/qt_click.h \ ../win/Qt/qt_glyph.h ../win/Qt/qt_xpms.h ../win/Qt/qt_set.h \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp -qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_menu.h ../win/Qt/qt_win.h \ +qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_menu.h ../win/Qt/qt_win.h \ ../win/Qt/qt_rip.h qt_menu.moc ../win/Qt/qt_glyph.h \ ../win/Qt/qt_set.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp -qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ +qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_msg.h ../win/Qt/qt_win.h \ qt_msg.moc ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp -qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_plsel.h qt_plsel.moc \ +qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_plsel.h qt_plsel.moc \ ../win/Qt/qt_bind.h ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h \ ../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp -qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_rip.h ../win/Qt/qt_bind.h \ +qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_rip.h ../win/Qt/qt_bind.h \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp -qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_set.h qt_set.moc \ +qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_set.h qt_set.moc \ ../win/Qt/qt_glyph.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp -qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_stat.h ../win/Qt/qt_win.h \ +qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_stat.h ../win/Qt/qt_win.h \ ../win/Qt/qt_icon.h qt_stat.moc ../win/Qt/qt_set.h \ ../win/Qt/qt_str.h ../win/Qt/qt_xpms.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp -qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ +qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_streq.h ../win/Qt/qt_line.h \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp -qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_svsel.h ../win/Qt/qt_bind.h \ +qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_svsel.h ../win/Qt/qt_bind.h \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp -qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_win.h ../win/Qt/qt_bind.h \ +qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_win.h ../win/Qt/qt_bind.h \ ../win/Qt/qt_main.h ../win/Qt/qt_kde0.h ../win/Qt/qt_click.h \ ../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \ ../win/Qt/qt_icon.h ../win/Qt/qt_map.h ../win/Qt/qt_clust.h \ @@ -948,12 +947,12 @@ qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_undef.h \ ../win/Qt/qt_set.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \ - ../win/Qt/qt_undef.h ../win/Qt/qt_redef.h ../win/Qt/qt_xcmd.h \ + ../win/Qt/qt_pre.h ../win/Qt/qt_post.h ../win/Qt/qt_xcmd.h \ qt_xcmd.moc ../win/Qt/qt_bind.h ../win/Qt/qt_main.h \ ../win/Qt/qt_kde0.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp -qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_undef.h \ - ../win/Qt/qt_redef.h ../win/Qt/qt_yndlg.h qt_yndlg.moc \ +qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_pre.h \ + ../win/Qt/qt_post.h ../win/Qt/qt_yndlg.h qt_yndlg.moc \ ../win/Qt/qt_str.h $(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H) diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp index 3da7089e2..3f0c257fc 100644 --- a/win/Qt/qt_bind.cpp +++ b/win/Qt/qt_bind.cpp @@ -17,7 +17,7 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #include #if QT_VERSION >= 0x050000 @@ -26,7 +26,7 @@ extern "C" { #else #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_bind.h" #include "qt_click.h" #ifdef TIMED_DELAY diff --git a/win/Qt/qt_click.cpp b/win/Qt/qt_click.cpp index 30656264e..6b9c7b4da 100644 --- a/win/Qt/qt_click.cpp +++ b/win/Qt/qt_click.cpp @@ -15,9 +15,9 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include -#include "qt_redef.h" +#include "qt_post.h" #include "qt_click.h" namespace nethack_qt_ { diff --git a/win/Qt/qt_delay.cpp b/win/Qt/qt_delay.cpp index e3dbfbe3d..803946aea 100644 --- a/win/Qt/qt_delay.cpp +++ b/win/Qt/qt_delay.cpp @@ -15,9 +15,9 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include -#include "qt_redef.h" +#include "qt_post.h" #include "qt_delay.h" namespace nethack_qt_ { diff --git a/win/Qt/qt_glyph.cpp b/win/Qt/qt_glyph.cpp index 88349b9ee..1e01adb9d 100644 --- a/win/Qt/qt_glyph.cpp +++ b/win/Qt/qt_glyph.cpp @@ -18,12 +18,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_glyph.h" #include "qt_set.h" #include "qt_str.h" diff --git a/win/Qt/qt_icon.cpp b/win/Qt/qt_icon.cpp index bcbc529ae..87dfac10f 100644 --- a/win/Qt/qt_icon.cpp +++ b/win/Qt/qt_icon.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_icon.h" namespace nethack_qt_ { diff --git a/win/Qt/qt_inv.cpp b/win/Qt/qt_inv.cpp index 3bb6cb55b..bf8cc9add 100644 --- a/win/Qt/qt_inv.cpp +++ b/win/Qt/qt_inv.cpp @@ -18,12 +18,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_inv.h" #include "qt_glyph.h" #include "qt_set.h" diff --git a/win/Qt/qt_key.cpp b/win/Qt/qt_key.cpp index aa48741c1..04d1b3d21 100644 --- a/win/Qt/qt_key.cpp +++ b/win/Qt/qt_key.cpp @@ -15,9 +15,9 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include -#include "qt_redef.h" +#include "qt_post.h" #include "qt_key.h" namespace nethack_qt_ { diff --git a/win/Qt/qt_line.cpp b/win/Qt/qt_line.cpp index f7aab6bb9..4c1f63eba 100644 --- a/win/Qt/qt_line.cpp +++ b/win/Qt/qt_line.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_line.h" namespace nethack_qt_ { diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp index a8beea886..50a28828b 100644 --- a/win/Qt/qt_main.cpp +++ b/win/Qt/qt_main.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_main.h" #include "qt_main.moc" #include "qt_bind.h" diff --git a/win/Qt/qt_map.cpp b/win/Qt/qt_map.cpp index 1ebb3434c..1508b2213 100644 --- a/win/Qt/qt_map.cpp +++ b/win/Qt/qt_map.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_map.h" #include "qt_map.moc" #include "qt_click.h" diff --git a/win/Qt/qt_menu.cpp b/win/Qt/qt_menu.cpp index 8ca4fde11..fb7e391e4 100644 --- a/win/Qt/qt_menu.cpp +++ b/win/Qt/qt_menu.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_menu.h" #include "qt_menu.moc" #include "qt_glyph.h" diff --git a/win/Qt/qt_msg.cpp b/win/Qt/qt_msg.cpp index 934a7be13..e3e02d9a1 100644 --- a/win/Qt/qt_msg.cpp +++ b/win/Qt/qt_msg.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_msg.h" #include "qt_msg.moc" #include "qt_map.h" diff --git a/win/Qt/qt_plsel.cpp b/win/Qt/qt_plsel.cpp index 2eefe96a8..8fbafd527 100644 --- a/win/Qt/qt_plsel.cpp +++ b/win/Qt/qt_plsel.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_plsel.h" #include "qt_plsel.moc" #include "qt_bind.h" diff --git a/win/Qt/qt_post.h b/win/Qt/qt_post.h new file mode 100644 index 000000000..d4eaba254 --- /dev/null +++ b/win/Qt/qt_post.h @@ -0,0 +1,4 @@ +#ifdef __clang__ +#pragma clang diagnostic pop +#endif /* __clang__ */ + diff --git a/win/Qt/qt_pre.h b/win/Qt/qt_pre.h new file mode 100644 index 000000000..ea891fcf4 --- /dev/null +++ b/win/Qt/qt_pre.h @@ -0,0 +1,5 @@ +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wshadow" +#endif + diff --git a/win/Qt/qt_redef.h b/win/Qt/qt_redef.h deleted file mode 100644 index 5e6c15e4a..000000000 --- a/win/Qt/qt_redef.h +++ /dev/null @@ -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 */ - diff --git a/win/Qt/qt_rip.cpp b/win/Qt/qt_rip.cpp index adcb04f9d..49402c85f 100644 --- a/win/Qt/qt_rip.cpp +++ b/win/Qt/qt_rip.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_rip.h" #include "qt_bind.h" #include "qt_str.h" diff --git a/win/Qt/qt_set.cpp b/win/Qt/qt_set.cpp index d44365ab2..d265acaf2 100644 --- a/win/Qt/qt_set.cpp +++ b/win/Qt/qt_set.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_set.h" #include "qt_set.moc" #include "qt_glyph.h" diff --git a/win/Qt/qt_stat.cpp b/win/Qt/qt_stat.cpp index 13cb4a773..2ed28612e 100644 --- a/win/Qt/qt_stat.cpp +++ b/win/Qt/qt_stat.cpp @@ -17,12 +17,12 @@ extern "C" { #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_stat.h" #include "qt_stat.moc" #include "qt_set.h" diff --git a/win/Qt/qt_streq.cpp b/win/Qt/qt_streq.cpp index 419aba8cc..9254ad04d 100644 --- a/win/Qt/qt_streq.cpp +++ b/win/Qt/qt_streq.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_streq.h" #include "qt_str.h" diff --git a/win/Qt/qt_svsel.cpp b/win/Qt/qt_svsel.cpp index 2a3aa5d8e..66ecd13e8 100644 --- a/win/Qt/qt_svsel.cpp +++ b/win/Qt/qt_svsel.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_svsel.h" #include "qt_bind.h" #include "qt_str.h" diff --git a/win/Qt/qt_undef.h b/win/Qt/qt_undef.h deleted file mode 100644 index 9b98e7737..000000000 --- a/win/Qt/qt_undef.h +++ /dev/null @@ -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 */ - diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index 501e91b12..7a636ac16 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -57,12 +57,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_win.h" #include "qt_bind.h" #include "qt_click.h" diff --git a/win/Qt/qt_xcmd.cpp b/win/Qt/qt_xcmd.cpp index 4aeffe98e..4eb9ac4a5 100644 --- a/win/Qt/qt_xcmd.cpp +++ b/win/Qt/qt_xcmd.cpp @@ -16,12 +16,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_xcmd.h" #include "qt_xcmd.moc" #include "qt_bind.h" diff --git a/win/Qt/qt_yndlg.cpp b/win/Qt/qt_yndlg.cpp index 8e49cd673..cac810394 100644 --- a/win/Qt/qt_yndlg.cpp +++ b/win/Qt/qt_yndlg.cpp @@ -15,12 +15,12 @@ #undef min #undef max -#include "qt_undef.h" +#include "qt_pre.h" #include #if QT_VERSION >= 0x050000 #include #endif -#include "qt_redef.h" +#include "qt_post.h" #include "qt_yndlg.h" #include "qt_yndlg.moc" #include "qt_str.h"