From ff63338d189a49a16b29a503ba23727cfa7e2e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 24 Sep 2018 17:03:23 +0200 Subject: Always build with a clean namespace QT_CLEAN_NAMESPACE constant is no more needed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may theoretically affect applications created for Qt1 and Qt2, but such applications require further modifications as well. Signed-off-by: Slávek Banko --- doc/html/porting.html | 4 +--- doc/html/qcstring-h.html | 14 -------------- doc/html/qcursor-h.html | 13 ------------- doc/html/qglobal-h.html | 32 -------------------------------- doc/html/qwindowdefs-h.html | 6 ------ doc/porting3.doc | 4 +--- 6 files changed, 2 insertions(+), 71 deletions(-) (limited to 'doc') diff --git a/doc/html/porting.html b/doc/html/porting.html index 8c0a3e10..e5ca3376 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -217,9 +217,7 @@ previously disabled, please check these macro variables:
  • CHECK_NULL becomes QT_CHECK_NULL
  • CHECK_MATH becomes QT_CHECK_MATH -

    The name of some debugging macro functions has been changed as well -but source compatibility should not be affected if the macro variable -QT_CLEAN_NAMESPACE is not defined: +

    The name of some debugging macro functions has been changed:

    • ASSERT becomes Q_ASSERT
    • CHECK_PTR becomes TQ_CHECK_PTR diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html index c38665f6..d7980c3b 100644 --- a/doc/html/qcstring-h.html +++ b/doc/html/qcstring-h.html @@ -117,20 +117,6 @@ Q_EXPORT int tqstricmp( const char *, const char * ); Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); -#ifndef QT_CLEAN_NAMESPACE -Q_EXPORT inline uint cstrlen( const char *str ) -{ return (uint)strlen(str); } - -Q_EXPORT inline char *cstrcpy( char *dst, const char *src ) -{ return strcpy(dst,src); } - -Q_EXPORT inline int cstrcmp( const char *str1, const char *str2 ) -{ return strcmp(str1,str2); } - -Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len ) -{ return strncmp(str1,str2,len); } -#endif - // tqChecksum: Internet checksum diff --git a/doc/html/qcursor-h.html b/doc/html/qcursor-h.html index 0c99af9e..848d624b 100644 --- a/doc/html/qcursor-h.html +++ b/doc/html/qcursor-h.html @@ -158,19 +158,6 @@ private: }; -#if !defined(QT_CLEAN_NAMESPACE) -// CursorShape is defined in X11/X.h -#ifdef CursorShape -#define X_CursorShape CursorShape -#undef CursorShape -#endif -typedef TQt::CursorShape TQCursorShape; -#ifdef X_CursorShape -#define CursorShape X_CursorShape -#endif -#endif - - /***************************************************************************** TQCursor stream functions *****************************************************************************/ diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 8a2d9e5d..f5bdb6be 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -734,16 +734,6 @@ inline int tqRound( double d ) // Size-dependent types (architechture-dependent byte order) // -#if !defined(QT_CLEAN_NAMESPACE) -// source compatibility with TQt 1.x -typedef signed char INT8; // 8 bit signed -typedef unsigned char UINT8; // 8 bit unsigned -typedef short INT16; // 16 bit signed -typedef unsigned short UINT16; // 16 bit unsigned -typedef int INT32; // 32 bit signed -typedef unsigned int UINT32; // 32 bit unsigned -#endif - typedef signed char TQ_INT8; // 8 bit signed typedef unsigned char TQ_UINT8; // 8 bit unsigned typedef short TQ_INT16; // 16 bit signed @@ -1020,28 +1010,6 @@ Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); -#if !defined(QT_CLEAN_NAMESPACE) // compatibility with TQt 1 - -Q_EXPORT void debug( const char *, ... ) // print debug message -#if defined(Q_CC_GNU) && !defined(__INSURE__) - __attribute__ ((format (printf, 1, 2))) -#endif -; - -Q_EXPORT void warning( const char *, ... ) // print warning message -#if defined(Q_CC_GNU) && !defined(__INSURE__) - __attribute__ ((format (printf, 1, 2))) -#endif -; - -Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit -#if defined(Q_CC_GNU) && !defined(__INSURE__) - __attribute__ ((format (printf, 1, 2))) -#endif -; - -#endif // QT_CLEAN_NAMESPACE - #if !defined(Q_ASSERT) # if defined(QT_CHECK_STATE) diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html index 7b3d22c8..4ff4fd5e 100644 --- a/doc/html/qwindowdefs-h.html +++ b/doc/html/qwindowdefs-h.html @@ -224,12 +224,6 @@ typedef void (*TQtCleanUpFunction)(); Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction ); Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction ); -#if !defined(QT_CLEAN_NAMESPACE) -// source compatibility with TQt 2.x -typedef TQtCleanUpFunction Q_CleanUpFunction; -#endif - - #endif // TQWINDOWDEFS_H diff --git a/doc/porting3.doc b/doc/porting3.doc index c3d192b8..dd58db96 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -165,9 +165,7 @@ previously disabled, please check these macro variables: \i \c CHECK_MATH becomes \c QT_CHECK_MATH \endlist -The name of some debugging macro functions has been changed as well -but source compatibility should not be affected if the macro variable -\c QT_CLEAN_NAMESPACE is not defined: +The name of some debugging macro functions has been changed: \list \i \c ASSERT becomes \c Q_ASSERT -- cgit v1.2.1