f7c71b9f83
Our C() macro conflicts with Qt6 usage, so #undef C has added. Move that from nearly every qt_*.cpp into qt_pre.h where other similar fixups are handled.
42 lines
1.0 KiB
C
42 lines
1.0 KiB
C
/* 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 C // conflicts with Qt6 header
|
|
#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"
|
|
#elif defined(__GNUC__) && defined(__cplusplus)
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wshadow"
|
|
#endif
|
|
|
|
#include <QtGlobal>
|
|
|
|
/* QFontMetrics::width was deprecated in Qt 5.11 */
|
|
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
|
|
#define QFM_WIDTH(foo) width(foo)
|
|
#else
|
|
#define QFM_WIDTH(foo) horizontalAdvance(foo)
|
|
#endif
|
|
|
|
/*qt_pre.h*/
|
|
|