From 230ed5e400ea4276d927570a7781cfcb5c7a534a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 25 Sep 2018 20:57:27 +0900 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. --------------------------- Cherry picked and adapted from commit ff63338d in tqt3 from Slávek Banko Signed-off-by: Michele Calgaro --- src/tools/qcstring.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/tools/qcstring.h') diff --git a/src/tools/qcstring.h b/src/tools/qcstring.h index 372ae80..a48cce8 100644 --- a/src/tools/qcstring.h +++ b/src/tools/qcstring.h @@ -81,20 +81,6 @@ Q_EXPORT int qstricmp( const char *, const char * ); Q_EXPORT int qstrnicmp( 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 - // qChecksum: Internet checksum -- cgit v1.2.3