diff options
Diffstat (limited to 'src/tools/ntqglobal.h')
| -rw-r--r-- | src/tools/ntqglobal.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 8bc73aed6..040d846ba 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -248,12 +248,12 @@ # define Q_CC_MSVC /* proper support of bool for _MSC_VER >= 1100 */ # define Q_CANNOT_DELETE_CONSTANT -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Visual C++.Net issues for _MSC_VER >= 1300 */ # if _MSC_VER >= 1300 # define Q_CC_MSVC_NET # if _MSC_VER < 1310 || (defined(Q_OS_WIN64) && defined(_M_IA64)) -# define Q_TYPENAME +# define TQ_TYPENAME # endif # endif /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */ @@ -278,7 +278,7 @@ # define Q_CC_WAT # if defined(Q_OS_QNX4) /* compiler flags */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_NO_BOOL_TYPE # define Q_CANNOT_DELETE_CONSTANT # define mutable @@ -357,8 +357,8 @@ # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -# define Q_TYPENAME -# define Q_INLINE_TEMPLATES inline +# define TQ_TYPENAME +# define TQ_INLINE_TEMPLATES inline # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT # endif @@ -386,12 +386,12 @@ /* Apply to all versions prior to Compaq C++ V6.0-000 - observed on DEC C++ V5.5-004. */ # if __DECCXX_VER < 60060000 -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_CANNOT_DELETE_CONSTANT # endif /* avoid undefined symbol problems with out-of-line template members */ -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Compilers with EDG front end are similar. To detect them we test: __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b @@ -448,7 +448,7 @@ # define Q_CC_USLC /* The latest UDK 7.1.1b does not need this, but previous versions do */ # if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010) -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -471,12 +471,12 @@ # elif defined(__sgi) # define Q_CC_MIPS # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # define Q_NO_EXPLICIT_KEYWORD -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_BROKEN_TEMPLATE_SPECIALIZATION # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -488,11 +488,11 @@ /* The older UnixWare 2.X compiler? */ #elif defined(__USLC__) # define Q_CC_USLC -# define Q_TYPENAME +# define TQ_TYPENAME # define Q_NO_BOOL_TYPE # define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD -# define Q_INLINE_TEMPLATES inline +# define TQ_INLINE_TEMPLATES inline /* Never tested! */ #elif defined(__HIGHC__) @@ -925,12 +925,12 @@ Q_EXPORT int qWinVersion(); #define QT_WA_INLINE( uni, ansi ) ( uni ) #endif -#ifndef Q_INLINE_TEMPLATES -# define Q_INLINE_TEMPLATES +#ifndef TQ_INLINE_TEMPLATES +# define TQ_INLINE_TEMPLATES #endif -#ifndef Q_TYPENAME -# define Q_TYPENAME typename +#ifndef TQ_TYPENAME +# define TQ_TYPENAME typename #endif // @@ -1060,13 +1060,13 @@ Q_EXPORT const char *tqInstallPathShare(); mandating a real implementation. */ #ifdef TQ_FULL_TEMPLATE_INSTANTIATION -# define Q_DUMMY_COMPARISON_OPERATOR(C) \ +# define TQ_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ tqWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else -# define Q_DUMMY_COMPARISON_OPERATOR(C) +# define TQ_DUMMY_COMPARISON_OPERATOR(C) #endif #endif /* TQGLOBAL_H */ |