diff options
Diffstat (limited to 'qtinterface/tqt4/Qt/qglobal.h')
| -rw-r--r-- | qtinterface/tqt4/Qt/qglobal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qtinterface/tqt4/Qt/qglobal.h b/qtinterface/tqt4/Qt/qglobal.h index d5bf293..2406997 100644 --- a/qtinterface/tqt4/Qt/qglobal.h +++ b/qtinterface/tqt4/Qt/qglobal.h @@ -473,7 +473,7 @@ namespace QT_NAMESPACE {} /* GCC 2.95 knows "using" but does not support it correctly */ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD -# define QT_NO_STL_WCHAR +# define TQT_NO_STL_WCHAR # endif # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) # define Q_ALIGNOF(type) __alignof__(type) @@ -2346,7 +2346,7 @@ template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelpe #define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment} #define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment} -#ifndef QT_NO_TRANSLATION // ### This should enclose the NOOPs above +#ifndef TQT_NO_TRANSLATION // ### This should enclose the NOOPs above // Defined in qcoreapplication.cpp // The better name qTrId() is reserved for an upcoming function which would @@ -2355,7 +2355,7 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1); #define QT_TRID_NOOP(id) id -#endif // QT_NO_TRANSLATION +#endif // TQT_NO_TRANSLATION #define QDOC_PROPERTY(text) |