summaryrefslogtreecommitdiffstats
path: root/src/tools
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 /src/tools
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 'src/tools')
-rw-r--r--src/tools/ntqcstring.h14
-rw-r--r--src/tools/ntqglobal.h32
2 files changed, 0 insertions, 46 deletions
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index 0bcdffa5..e60e0969 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -81,20 +81,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/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index db41468f..f7613a2a 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -702,16 +702,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
@@ -989,28 +979,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)