nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

turn off clang -Wshadow when processing some qt headers

Browse Source 
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
This commit is contained in:
nhmall
2020-07-18 08:31:51 -04:00
parent c9ea607e46
commit 9b58010880
27 changed files with 95 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config.h
View File

@@ -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 */

89
sys/unix/Makefile.src
View File

@@ -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)

4
win/Qt/qt_bind.cpp
View File

@@ -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

4
win/Qt/qt_click.cpp
View File

@@ -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_ {

4
win/Qt/qt_delay.cpp
View File

@@ -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_ {

4
win/Qt/qt_glyph.cpp
View File

@@ -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"

4
win/Qt/qt_icon.cpp
View File

@@ -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_ {

4
win/Qt/qt_inv.cpp
View File

@@ -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"

4
win/Qt/qt_key.cpp
View File

@@ -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_ {

4
win/Qt/qt_line.cpp
View File

@@ -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_ {

4
win/Qt/qt_main.cpp
View File

@@ -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"

4
win/Qt/qt_map.cpp
View File

@@ -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"

4
win/Qt/qt_menu.cpp
View File

@@ -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"

4
win/Qt/qt_msg.cpp
View File

@@ -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"

4
win/Qt/qt_plsel.cpp
View File

@@ -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"

4
win/Qt/qt_post.h Normal file
View File

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

5
win/Qt/qt_pre.h Normal file
View File

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

19
win/Qt/qt_redef.h
View File

@@ -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 */

4
win/Qt/qt_rip.cpp
View File

@@ -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"

4
win/Qt/qt_set.cpp
View File

@@ -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"

4
win/Qt/qt_stat.cpp
View File

@@ -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"

4
win/Qt/qt_streq.cpp
View File

@@ -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"

4
win/Qt/qt_svsel.cpp
View File

@@ -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"

17
win/Qt/qt_undef.h
View File

@@ -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 */

4
win/Qt/qt_win.cpp
View File

@@ -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"

4
win/Qt/qt_xcmd.cpp
View File

@@ -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"

4
win/Qt/qt_yndlg.cpp
View File

@@ -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"