summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-09-24 17:03:23 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-09-24 17:03:23 +0200
commitff63338d189a49a16b29a503ba23727cfa7e2e66 (patch)
treec6e82e67044286fe4471e97c8f079a2d205f979a /doc
parent02964eb384e1b5a73a198d04262497607d81e38f (diff)
downloadtqt3-ff63338d189a49a16b29a503ba23727cfa7e2e66.tar.gz
tqt3-ff63338d189a49a16b29a503ba23727cfa7e2e66.zip
Always build with a clean namespace
QT_CLEAN_NAMESPACE constant is no more needed This may theoretically affect applications created for Qt1 and Qt2, but such applications require further modifications as well. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'doc')
-rw-r--r--doc/html/porting.html4
-rw-r--r--doc/html/qcstring-h.html14
-rw-r--r--doc/html/qcursor-h.html13
-rw-r--r--doc/html/qglobal-h.html32
-rw-r--r--doc/html/qwindowdefs-h.html6
-rw-r--r--doc/porting3.doc4
6 files changed, 2 insertions, 71 deletions
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 8c0a3e10a..e5ca33762 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -217,9 +217,7 @@ previously disabled, please check these macro variables:
<li> <tt>CHECK_NULL</tt> becomes <tt>QT_CHECK_NULL</tt>
<li> <tt>CHECK_MATH</tt> becomes <tt>QT_CHECK_MATH</tt>
</ul>
-<p> The name of some debugging macro functions has been changed as well
-but source compatibility should not be affected if the macro variable
-<tt>QT_CLEAN_NAMESPACE</tt> is not defined:
+<p> The name of some debugging macro functions has been changed:
<p> <ul>
<li> <tt>ASSERT</tt> becomes <tt>Q_ASSERT</tt>
<li> <tt>CHECK_PTR</tt> becomes <tt>TQ_CHECK_PTR</tt>
diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html
index c38665f66..d7980c3b9 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 0c99af9ed..848d624bf 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 8a2d9e5dd..f5bdb6be8 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) &amp;&amp; !defined(__INSURE__)
- __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-Q_EXPORT void warning( const char *, ... ) // print warning message
-#if defined(Q_CC_GNU) &amp;&amp; !defined(__INSURE__)
- __attribute__ ((format (printf, 1, 2)))
-#endif
-;
-
-Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit
-#if defined(Q_CC_GNU) &amp;&amp; !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 7b3d22c8d..4ff4fd5e6 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
</pre>
<!-- eof -->
diff --git a/doc/porting3.doc b/doc/porting3.doc
index c3d192b8f..dd58db962 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