diff options
| author | Michele Calgaro <[email protected]> | 2018-09-25 20:57:27 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-25 20:57:27 +0900 |
| commit | 230ed5e400ea4276d927570a7781cfcb5c7a534a (patch) | |
| tree | 56bb72cae9206a3a6734a380f48b85051d054614 /doc/html/qglobal-h.html | |
| parent | 2df70f03d493f5226821dd2e1da3759e3abceb02 (diff) | |
| download | qt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.tar.gz qt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.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.
---------------------------
Cherry picked and adapted from commit ff63338d in tqt3 from Slávek Banko <[email protected]>
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'doc/html/qglobal-h.html')
| -rw-r--r-- | doc/html/qglobal-h.html | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 17b08bd..dd8d61a 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -734,16 +734,6 @@ inline int qRound( double d ) // Size-dependent types (architechture-dependent byte order) // -#if !defined(QT_CLEAN_NAMESPACE) -// source compatibility with Qt 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 Q_INT8; // 8 bit signed typedef unsigned char Q_UINT8; // 8 bit unsigned typedef short Q_INT16; // 16 bit signed @@ -1020,28 +1010,6 @@ Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit Q_EXPORT void qSystemWarning( const char *, int code = -1 ); -#if !defined(QT_CLEAN_NAMESPACE) // compatibility with Qt 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) |