Rename additional global TQt functions

pull/1/head
Timothy Pearson 12 years ago
parent 0076a6194c
commit 543fa670b1

@ -28,7 +28,7 @@ bool QDir::exists( const QString &name, bool acceptAbsPath )
{ {
if ( name.isEmpty() ) { if ( name.isEmpty() ) {
#if defined(QT_CHECK_NULL) #if defined(QT_CHECK_NULL)
qWarning( "QDir::exists: Empty or null file name" ); tqWarning( "QDir::exists: Empty or null file name" );
#endif #endif
return FALSE; return FALSE;
} }

@ -604,7 +604,7 @@ Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeB
#ifdef QT_CHECK_RANGE #ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "TQMap: Warning invalid element" ) # define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
# else # else
# define QT_CHECK_INVALID_MAP_ELEMENT # define QT_CHECK_INVALID_MAP_ELEMENT

@ -99,7 +99,7 @@ GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC
{ {
int appScreenCount = QApplication::desktop()->numScreens(); int appScreenCount = QApplication::desktop()->numScreens();
if ( scrn < 0 || scrn >= appScreenCount ) { if ( scrn < 0 || scrn >= appScreenCount ) {
qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
QWidget* bla = 0; QWidget* bla = 0;
bla->setName("hello"); bla->setName("hello");
} }

@ -149,7 +149,7 @@ public:
} }
private: private:
Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1, int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
@ -170,7 +170,7 @@ public:
~TQStrIList() { clear(); } ~TQStrIList() { clear(); }
private: private:
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 )
{ return qstricmp((const char*)s1, { return tqstricmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
}; };

@ -128,15 +128,15 @@ public:
char comm='%'; char comm='%';
bool incmap = FALSE; bool incmap = FALSE;
while (iod->readLine(line,maxlen) > 0) { while (iod->readLine(line,maxlen) > 0) {
if (0==qstrnicmp(line,"<code_set_name>",15)) if (0==tqstrnicmp(line,"<code_set_name>",15))
n = line+15; n = line+15;
else if (0==qstrnicmp(line,"<escape_char> ",14)) else if (0==tqstrnicmp(line,"<escape_char> ",14))
esc = line[14]; esc = line[14];
else if (0==qstrnicmp(line,"<comment_char> ",15)) else if (0==tqstrnicmp(line,"<comment_char> ",15))
comm = line[15]; comm = line[15];
else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) { else if (line[0]==comm && 0==tqstrnicmp(line+1," alias ",7)) {
aliases.append(line+8); aliases.append(line+8);
} else if (0==qstrnicmp(line,"CHARMAP",7)) { } else if (0==tqstrnicmp(line,"CHARMAP",7)) {
if (!from_unicode_page) { if (!from_unicode_page) {
from_unicode_page = new char*[256]; from_unicode_page = new char*[256];
for (int i=0; i<256; i++) for (int i=0; i<256; i++)
@ -146,7 +146,7 @@ public:
to_unicode = new ushort[256]; to_unicode = new ushort[256];
} }
incmap = TRUE; incmap = TRUE;
} else if (0==qstrnicmp(line,"END CHARMAP",11)) } else if (0==tqstrnicmp(line,"END CHARMAP",11))
break; break;
else if (incmap) { else if (incmap) {
char* cursor = line; char* cursor = line;
@ -226,7 +226,7 @@ public:
} }
mb[nmb++] = 0; mb[nmb++] = 0;
from_unicode_page_multiByte[ch.row()][ch.cell()] from_unicode_page_multiByte[ch.row()][ch.cell()]
= qstrdup(mb); = tqstrdup(mb);
*mb_unicode = unicode; *mb_unicode = unicode;
} else { } else {
from_unicode_page[ch.row()][ch.cell()] = (char)byte; from_unicode_page[ch.row()][ch.cell()] = (char)byte;
@ -492,7 +492,7 @@ int QTextCodec::heuristicNameMatch(const char* hint) const
int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint) int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
{ {
// if they're the same, return a perfect score. // if they're the same, return a perfect score.
if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 ) if ( name && hint && *name && *hint && tqstricmp( name, hint ) == 0 )
return qstrlen( hint ); return qstrlen( hint );
// if the letters and numbers are the same, we have an "almost" // if the letters and numbers are the same, we have an "almost"

@ -423,7 +423,7 @@ void TQValueListPrivate<T>::clear()
#ifdef QT_CHECK_RANGE #ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "TQValueList: Warning invalid element" ) # define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" )
# define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() ); # define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
# else # else
# define QT_CHECK_INVALID_LIST_ELEMENT # define QT_CHECK_INVALID_LIST_ELEMENT

@ -28,7 +28,7 @@ bool QDir::exists( const QString &name, bool acceptAbsPath )
{ {
if ( name.isEmpty() ) { if ( name.isEmpty() ) {
#if defined(QT_CHECK_NULL) #if defined(QT_CHECK_NULL)
qWarning( "QDir::exists: Empty or null file name" ); tqWarning( "QDir::exists: Empty or null file name" );
#endif #endif
return FALSE; return FALSE;
} }

@ -604,7 +604,7 @@ Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeB
#ifdef QT_CHECK_RANGE #ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "TQMap: Warning invalid element" ) # define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
# else # else
# define QT_CHECK_INVALID_MAP_ELEMENT # define QT_CHECK_INVALID_MAP_ELEMENT

@ -99,7 +99,7 @@ GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC
{ {
int appScreenCount = QApplication::desktop()->numScreens(); int appScreenCount = QApplication::desktop()->numScreens();
if ( scrn < 0 || scrn >= appScreenCount ) { if ( scrn < 0 || scrn >= appScreenCount ) {
qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
QWidget* bla = 0; QWidget* bla = 0;
bla->setName("hello"); bla->setName("hello");
} }

@ -149,7 +149,7 @@ public:
} }
private: private:
Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1, int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
@ -170,7 +170,7 @@ public:
~TQStrIList() { clear(); } ~TQStrIList() { clear(); }
private: private:
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 )
{ return qstricmp((const char*)s1, { return tqstricmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
}; };

@ -128,15 +128,15 @@ public:
char comm='%'; char comm='%';
bool incmap = FALSE; bool incmap = FALSE;
while (iod->readLine(line,maxlen) > 0) { while (iod->readLine(line,maxlen) > 0) {
if (0==qstrnicmp(line,"<code_set_name>",15)) if (0==tqstrnicmp(line,"<code_set_name>",15))
n = line+15; n = line+15;
else if (0==qstrnicmp(line,"<escape_char> ",14)) else if (0==tqstrnicmp(line,"<escape_char> ",14))
esc = line[14]; esc = line[14];
else if (0==qstrnicmp(line,"<comment_char> ",15)) else if (0==tqstrnicmp(line,"<comment_char> ",15))
comm = line[15]; comm = line[15];
else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) { else if (line[0]==comm && 0==tqstrnicmp(line+1," alias ",7)) {
aliases.append(line+8); aliases.append(line+8);
} else if (0==qstrnicmp(line,"CHARMAP",7)) { } else if (0==tqstrnicmp(line,"CHARMAP",7)) {
if (!from_unicode_page) { if (!from_unicode_page) {
from_unicode_page = new char*[256]; from_unicode_page = new char*[256];
for (int i=0; i<256; i++) for (int i=0; i<256; i++)
@ -146,7 +146,7 @@ public:
to_unicode = new ushort[256]; to_unicode = new ushort[256];
} }
incmap = TRUE; incmap = TRUE;
} else if (0==qstrnicmp(line,"END CHARMAP",11)) } else if (0==tqstrnicmp(line,"END CHARMAP",11))
break; break;
else if (incmap) { else if (incmap) {
char* cursor = line; char* cursor = line;
@ -226,7 +226,7 @@ public:
} }
mb[nmb++] = 0; mb[nmb++] = 0;
from_unicode_page_multiByte[ch.row()][ch.cell()] from_unicode_page_multiByte[ch.row()][ch.cell()]
= qstrdup(mb); = tqstrdup(mb);
*mb_unicode = unicode; *mb_unicode = unicode;
} else { } else {
from_unicode_page[ch.row()][ch.cell()] = (char)byte; from_unicode_page[ch.row()][ch.cell()] = (char)byte;
@ -492,7 +492,7 @@ int QTextCodec::heuristicNameMatch(const char* hint) const
int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint) int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
{ {
// if they're the same, return a perfect score. // if they're the same, return a perfect score.
if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 ) if ( name && hint && *name && *hint && tqstricmp( name, hint ) == 0 )
return qstrlen( hint ); return qstrlen( hint );
// if the letters and numbers are the same, we have an "almost" // if the letters and numbers are the same, we have an "almost"

@ -423,7 +423,7 @@ void TQValueListPrivate<T>::clear()
#ifdef QT_CHECK_RANGE #ifdef QT_CHECK_RANGE
# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "TQValueList: Warning invalid element" ) # define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" )
# define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() ); # define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
# else # else
# define QT_CHECK_INVALID_LIST_ELEMENT # define QT_CHECK_INVALID_LIST_ELEMENT

@ -88,7 +88,7 @@ public:
} }
private: private:
Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1, int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
@ -109,7 +109,7 @@ public:
~Q3StrIList() { clear(); } ~Q3StrIList() { clear(); }
private: private:
int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 )
{ return qstricmp((const char*)s1, { return tqstricmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
}; };

@ -59,7 +59,7 @@ public:
Q3StrVec( uint size, bool deepc = true ) : Q3PtrVector<char>(size) {dc=deepc;} Q3StrVec( uint size, bool deepc = true ) : Q3PtrVector<char>(size) {dc=deepc;}
~Q3StrVec() { clear(); } ~Q3StrVec() { clear(); }
private: private:
Item newItem( Item d ) { return dc ? qstrdup( (const char*)d ) : d; } Item newItem( Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
void deleteItem( Item d ) { if ( dc ) delete[] (char*)d; } void deleteItem( Item d ) { if ( dc ) delete[] (char*)d; }
int compareItems( Item s1, Item s2 ) int compareItems( Item s1, Item s2 )
{ return qstrcmp((const char*)s1, { return qstrcmp((const char*)s1,
@ -82,7 +82,7 @@ public:
~Q3StrIVec() { clear(); } ~Q3StrIVec() { clear(); }
private: private:
int compareItems( Item s1, Item s2 ) int compareItems( Item s1, Item s2 )
{ return qstricmp((const char*)s1, { return tqstricmp((const char*)s1,
(const char*)s2); } (const char*)s2); }
}; };

@ -62,7 +62,7 @@ QT_MODULE(Core)
Safe and portable C string functions; extensions to standard string.h Safe and portable C string functions; extensions to standard string.h
*****************************************************************************/ *****************************************************************************/
Q_CORE_EXPORT char *qstrdup(const char *); Q_CORE_EXPORT char *tqstrdup(const char *);
inline uint qstrlen(const char *str) inline uint qstrlen(const char *str)
{ return str ? uint(strlen(str)) : 0; } { return str ? uint(strlen(str)) : 0; }
@ -78,7 +78,7 @@ inline uint qstrnlen(const char *str, uint maxlen)
} }
Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src); Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src);
Q_CORE_EXPORT char *qstrncpy(char *dst, const char *src, uint len); Q_CORE_EXPORT char *tqstrncpy(char *dst, const char *src, uint len);
Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2); Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2);
Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2); Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2);
@ -91,15 +91,15 @@ inline int qstrncmp(const char *str1, const char *str2, uint len)
return (str1 && str2) ? strncmp(str1, str2, len) return (str1 && str2) ? strncmp(str1, str2, len)
: (str1 ? 1 : (str2 ? -1 : 0)); : (str1 ? 1 : (str2 ? -1 : 0));
} }
Q_CORE_EXPORT int qstricmp(const char *, const char *); Q_CORE_EXPORT int tqstricmp(const char *, const char *);
Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len); Q_CORE_EXPORT int tqstrnicmp(const char *, const char *, uint len);
// implemented in qvsnprintf.cpp // implemented in qvsnprintf.cpp
Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap); Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...); Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len) inline QT3_SUPPORT void *tqmemmove(void *dst, const void *src, uint len)
{ return memmove(dst, src, len); } { return memmove(dst, src, len); }
inline QT3_SUPPORT uint cstrlen(const char *str) inline QT3_SUPPORT uint cstrlen(const char *str)
{ return uint(strlen(str)); } { return uint(strlen(str)); }
@ -111,9 +111,9 @@ inline QT3_SUPPORT int cstrncmp(const char *str1, const char *str2, uint len)
{ return strncmp(str1,str2,len); } { return strncmp(str1,str2,len); }
#endif #endif
// qChecksum: Internet checksum // tqChecksum: Internet checksum
Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len); Q_CORE_EXPORT quint16 tqChecksum(const char *s, uint len);
class QByteRef; class QByteRef;
class QString; class QString;
@ -578,10 +578,10 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &);
#endif #endif
#ifndef QT_NO_COMPRESS #ifndef QT_NO_COMPRESS
Q_CORE_EXPORT QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel = -1); Q_CORE_EXPORT QByteArray tqCompress(const uchar* data, int nbytes, int compressionLevel = -1);
Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes); Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes);
inline QByteArray qCompress(const QByteArray& data, int compressionLevel = -1) inline QByteArray tqCompress(const QByteArray& data, int compressionLevel = -1)
{ return qCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); } { return tqCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); }
inline QByteArray qUncompress(const QByteArray& data) inline QByteArray qUncompress(const QByteArray& data)
{ return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); } { return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); }
#endif #endif

@ -265,8 +265,8 @@ private:
typedef void (*QtCleanUpFunction)(); typedef void (*QtCleanUpFunction)();
Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction); Q_CORE_EXPORT void tqAddPostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction); Q_CORE_EXPORT void tqRemovePostRoutine(QtCleanUpFunction);
Q_CORE_EXPORT QString qAppName(); // get application name Q_CORE_EXPORT QString qAppName(); // get application name
#if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM) #if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM)

@ -255,12 +255,12 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
} }
#if !defined(QT_NO_DEBUG_STREAM) #if !defined(QT_NO_DEBUG_STREAM)
Q_CORE_EXPORT_INLINE QDebug qDebug() { return QDebug(QtDebugMsg); } Q_CORE_EXPORT_INLINE QDebug tqDebug() { return QDebug(QtDebugMsg); }
#else // QT_NO_DEBUG_STREAM #else // QT_NO_DEBUG_STREAM
#undef qDebug #undef tqDebug
inline QNoDebug qDebug() { return QNoDebug(); } inline QNoDebug tqDebug() { return QNoDebug(); }
#define qDebug QT_NO_QDEBUG_MACRO #define tqDebug QT_NO_QDEBUG_MACRO
#ifdef QT_NO_MEMBER_TEMPLATES #ifdef QT_NO_MEMBER_TEMPLATES
template<typename T> template<typename T>
@ -270,11 +270,11 @@ inline QNoDebug operator<<(QNoDebug debug, const T &) { return debug; }
#endif #endif
#if !defined(QT_NO_WARNING_OUTPUT) #if !defined(QT_NO_WARNING_OUTPUT)
Q_CORE_EXPORT_INLINE QDebug qWarning() { return QDebug(QtWarningMsg); } Q_CORE_EXPORT_INLINE QDebug tqWarning() { return QDebug(QtWarningMsg); }
#else #else
#undef qWarning #undef tqWarning
inline QNoDebug qWarning() { return QNoDebug(); } inline QNoDebug tqWarning() { return QNoDebug(); }
#define qWarning QT_NO_QWARNING_MACRO #define tqWarning QT_NO_QWARNING_MACRO
#endif #endif
QT_END_NAMESPACE QT_END_NAMESPACE

@ -488,7 +488,7 @@ namespace QT_NAMESPACE {}
# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
# define Q_NO_TEMPLATE_FRIENDS # define Q_NO_TEMPLATE_FRIENDS
# endif # endif
/* Apple's GCC 3.1 chokes on our streaming qDebug() */ /* Apple's GCC 3.1 chokes on our streaming tqDebug() */
# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3) # if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM # define Q_BROKEN_DEBUG_STREAM
# endif # endif
@ -1522,15 +1522,15 @@ public:
#endif #endif
}; };
Q_CORE_EXPORT const char *qVersion(); Q_CORE_EXPORT const char *tqVersion();
Q_CORE_EXPORT bool qSharedBuild(); Q_CORE_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
inline int qMacVersion() { return QSysInfo::MacintoshVersion; } inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
#endif #endif
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian) inline QT3_SUPPORT bool tqSysInfo(int *wordSize, bool *bigEndian)
{ {
*wordSize = QSysInfo::WordSize; *wordSize = QSysInfo::WordSize;
*bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian); *bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
@ -1593,13 +1593,13 @@ inline void qUnused(T &x) { (void)x; }
# define qPrintable(string) (string).toLocal8Bit().constData() # define qPrintable(string) (string).toLocal8Bit().constData()
#endif #endif
Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */ Q_CORE_EXPORT void tqDebug(const char *, ...) /* print debug message */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
Q_CORE_EXPORT void qWarning(const char *, ...) /* print warning message */ Q_CORE_EXPORT void tqWarning(const char *, ...) /* print warning message */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
@ -1612,14 +1612,14 @@ Q_CORE_EXPORT void qCritical(const char *, ...) /* print critical message */
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */ Q_CORE_EXPORT void tqFatal(const char *, ...) /* print fatal message and exit */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1); Q_CORE_EXPORT QT3_SUPPORT void tqSystemWarning(const char *msg, int code = -1);
#endif /* QT3_SUPPORT */ #endif /* QT3_SUPPORT */
Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...); Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...); Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
@ -1631,25 +1631,25 @@ Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
/* /*
Forward declarations only. Forward declarations only.
In order to use the qDebug() stream, you must #include<QDebug> In order to use the tqDebug() stream, you must #include<QDebug>
*/ */
class QDebug; class QDebug;
class QNoDebug; class QNoDebug;
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
Q_CORE_EXPORT_INLINE QDebug qDebug(); Q_CORE_EXPORT_INLINE QDebug tqDebug();
Q_CORE_EXPORT_INLINE QDebug qWarning(); Q_CORE_EXPORT_INLINE QDebug tqWarning();
Q_CORE_EXPORT_INLINE QDebug qCritical(); Q_CORE_EXPORT_INLINE QDebug qCritical();
#else #else
inline QNoDebug qDebug(); inline QNoDebug tqDebug();
#endif #endif
#define QT_NO_QDEBUG_MACRO while (false) qDebug #define QT_NO_QDEBUG_MACRO while (false) tqDebug
#ifdef QT_NO_DEBUG_OUTPUT #ifdef QT_NO_DEBUG_OUTPUT
# define qDebug QT_NO_QDEBUG_MACRO # define tqDebug QT_NO_QDEBUG_MACRO
#endif #endif
#define QT_NO_QWARNING_MACRO while (false) qWarning #define QT_NO_QWARNING_MACRO while (false) tqWarning
#ifdef QT_NO_WARNING_OUTPUT #ifdef QT_NO_WARNING_OUTPUT
# define qWarning QT_NO_QWARNING_MACRO # define tqWarning QT_NO_QWARNING_MACRO
#endif #endif
@ -1731,8 +1731,8 @@ typedef void (*QtMsgHandler)(QtMsgType, const char *);
Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler); Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {} inline QT3_SUPPORT void tqSuppressObsoleteWarnings(bool = true) {}
inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {} inline QT3_SUPPORT void tqObsolete(const char *, const char * = 0, const char * = 0) {}
#endif #endif
#if defined(QT_NO_THREAD) #if defined(QT_NO_THREAD)
@ -1941,7 +1941,7 @@ static inline bool qIsNull(float f)
#ifdef Q_FULL_TEMPLATE_INSTANTIATION #ifdef Q_FULL_TEMPLATE_INSTANTIATION
# define Q_DUMMY_COMPARISON_OPERATOR(C) \ # define Q_DUMMY_COMPARISON_OPERATOR(C) \
bool operator==(const C&) const { \ bool operator==(const C&) const { \
qWarning(#C"::operator==(const "#C"&) was called"); \ tqWarning(#C"::operator==(const "#C"&) was called"); \
return false; \ return false; \
} }
#else #else
@ -2403,15 +2403,15 @@ Q_CORE_EXPORT int qrand();
#ifndef QT_PRODUCT_LICENSE #ifndef QT_PRODUCT_LICENSE
# define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts() # define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
#endif #endif
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPath();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathDocs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathHeaders();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathLibs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathBins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathPlugins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathData();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathTranslations();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathSysconf();
#endif #endif
#if defined(Q_OS_SYMBIAN) #if defined(Q_OS_SYMBIAN)

@ -100,9 +100,9 @@ Yes, it is an informative comment ;-)
# undef DEBUG # undef DEBUG
#endif #endif
#define DEBUG 0 #define DEBUG 0
#ifdef qDebug #ifdef tqDebug
# define old_qDebug qDebug # define old_qDebug tqDebug
# undef qDebug # undef tqDebug
#endif #endif
#ifdef __LP64__ #ifdef __LP64__
@ -186,7 +186,7 @@ typedef AERecord AppleEvent;
#endif #endif
#ifdef old_qDebug #ifdef old_qDebug
# undef qDebug # undef tqDebug
# define qDebug QT_NO_QDEBUG_MACRO # define tqDebug QT_NO_QDEBUG_MACRO
# undef old_qDebug # undef old_qDebug
#endif #endif

@ -342,7 +342,7 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons) Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons)
#define QT_REQUIRE_VERSION(argc, argv, str) { QString s = QString::fromLatin1(str);\ #define QT_REQUIRE_VERSION(argc, argv, str) { QString s = QString::fromLatin1(str);\
QString sq = QString::fromLatin1(qVersion()); \ QString sq = QString::fromLatin1(tqVersion()); \
if ((sq.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ if ((sq.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\
(sq.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\ (sq.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\
sq.section(QChar::fromLatin1('.'),2,2).toInt()<(s.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\ sq.section(QChar::fromLatin1('.'),2,2).toInt()<(s.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\
@ -353,8 +353,8 @@ if (!qApp){ \
} \ } \
QString s = QApplication::tr("Executable '%1' requires Qt "\ QString s = QApplication::tr("Executable '%1' requires Qt "\
"%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\ "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\
str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\ str)).arg(QString::fromLatin1(tqVersion())); QMessageBox::critical(0, QApplication::tr(\
"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }} "Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); tqFatal(s.toLatin1().data()); }}
#endif // QT_NO_MESSAGEBOX #endif // QT_NO_MESSAGEBOX

@ -72,7 +72,7 @@ public:
Q_ASSERT(aSignal); Q_ASSERT(aSignal);
if (((aSignal[0] - '0') & 0x03) != QSIGNAL_CODE) { if (((aSignal[0] - '0') & 0x03) != QSIGNAL_CODE) {
qWarning("QSignalSpy: Not a valid signal, use the SIGNAL macro"); tqWarning("QSignalSpy: Not a valid signal, use the SIGNAL macro");
return; return;
} }
@ -80,13 +80,13 @@ public:
const QMetaObject *mo = obj->metaObject(); const QMetaObject *mo = obj->metaObject();
int sigIndex = mo->indexOfMethod(ba.constData()); int sigIndex = mo->indexOfMethod(ba.constData());
if (sigIndex < 0) { if (sigIndex < 0) {
qWarning("QSignalSpy: No such signal: '%s'", ba.constData()); tqWarning("QSignalSpy: No such signal: '%s'", ba.constData());
return; return;
} }
if (!QMetaObject::connect(obj, sigIndex, this, memberOffset, if (!QMetaObject::connect(obj, sigIndex, this, memberOffset,
Qt::DirectConnection, 0)) { Qt::DirectConnection, 0)) {
qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect."); tqWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
return; return;
} }
sig = ba; sig = ba;
@ -119,7 +119,7 @@ private:
for (int i = 0; i < params.count(); ++i) { for (int i = 0; i < params.count(); ++i) {
int tp = QMetaType::type(params.at(i).constData()); int tp = QMetaType::type(params.at(i).constData());
if (tp == QMetaType::Void) if (tp == QMetaType::Void)
qWarning("Don't know how to handle '%s', use qRegisterMetaType to register it.", tqWarning("Don't know how to handle '%s', use qRegisterMetaType to register it.",
params.at(i).constData()); params.at(i).constData());
args << tp; args << tp;
} }

@ -72,12 +72,12 @@ namespace QTest
template<> inline char *toString(const QLatin1String &str) template<> inline char *toString(const QLatin1String &str)
{ {
return qstrdup(str.latin1()); return tqstrdup(str.latin1());
} }
template<> inline char *toString(const QString &str) template<> inline char *toString(const QString &str)
{ {
return qstrdup(str.toLatin1().constData()); return tqstrdup(str.toLatin1().constData());
} }
template<> inline char *toString(const QByteArray &ba) template<> inline char *toString(const QByteArray &ba)
@ -88,63 +88,63 @@ template<> inline char *toString(const QByteArray &ba)
template<> inline char *toString(const QTime &time) template<> inline char *toString(const QTime &time)
{ {
return time.isValid() return time.isValid()
? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData()) ? tqstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData())
: qstrdup("Invalid QTime"); : tqstrdup("Invalid QTime");
} }
template<> inline char *toString(const QDate &date) template<> inline char *toString(const QDate &date)
{ {
return date.isValid() return date.isValid()
? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData()) ? tqstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData())
: qstrdup("Invalid QDate"); : tqstrdup("Invalid QDate");
} }
template<> inline char *toString(const QDateTime &dateTime) template<> inline char *toString(const QDateTime &dateTime)
{ {
return dateTime.isValid() return dateTime.isValid()
? qstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) + ? tqstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) +
(dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1().constData()) (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1().constData())
: qstrdup("Invalid QDateTime"); : tqstrdup("Invalid QDateTime");
} }
template<> inline char *toString(const QChar &c) template<> inline char *toString(const QChar &c)
{ {
return qstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)).toLatin1().constData());
} }
template<> inline char *toString(const QPoint &p) template<> inline char *toString(const QPoint &p)
{ {
return qstrdup(QString::fromLatin1("QPoint(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QPoint(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
} }
template<> inline char *toString(const QSize &s) template<> inline char *toString(const QSize &s)
{ {
return qstrdup(QString::fromLatin1("QSize(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QSize(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
} }
template<> inline char *toString(const QRect &s) template<> inline char *toString(const QRect &s)
{ {
return qstrdup(QString::fromLatin1("QRect(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QRect(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
} }
template<> inline char *toString(const QPointF &p) template<> inline char *toString(const QPointF &p)
{ {
return qstrdup(QString::fromLatin1("QPointF(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QPointF(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
} }
template<> inline char *toString(const QSizeF &s) template<> inline char *toString(const QSizeF &s)
{ {
return qstrdup(QString::fromLatin1("QSizeF(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QSizeF(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
} }
template<> inline char *toString(const QRectF &s) template<> inline char *toString(const QRectF &s)
{ {
return qstrdup(QString::fromLatin1("QRectF(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData()); return tqstrdup(QString::fromLatin1("QRectF(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
} }
template<> inline char *toString(const QUrl &uri) template<> inline char *toString(const QUrl &uri)
{ {
return qstrdup(uri.toEncoded().constData()); return tqstrdup(uri.toEncoded().constData());
} }
template<> inline char *toString(const QVariant &v) template<> inline char *toString(const QVariant &v)
@ -168,7 +168,7 @@ template<> inline char *toString(const QVariant &v)
} }
vstring.append(')'); vstring.append(')');
return qstrdup(vstring.constData()); return tqstrdup(vstring.constData());
} }
#ifndef QTEST_NO_SPECIALIZATIONS #ifndef QTEST_NO_SPECIALIZATIONS

@ -90,7 +90,7 @@ public:
{ {
if (!instance()) { if (!instance()) {
instance() = new QTestAccessibility; instance() = new QTestAccessibility;
qAddPostRoutine(cleanup); tqAddPostRoutine(cleanup);
} }
} }
static void cleanup() static void cleanup()
@ -127,19 +127,19 @@ private:
static void rootObjectHandler(QObject *object) static void rootObjectHandler(QObject *object)
{ {
// qDebug("rootObjectHandler called %p", object); // tqDebug("rootObjectHandler called %p", object);
if (object) { if (object) {
QApplication* app = qobject_cast<QApplication*>(object); QApplication* app = qobject_cast<QApplication*>(object);
if ( !app ) if ( !app )
qWarning("QTEST_ACCESSIBILITY: root Object is not a QApplication!"); tqWarning("QTEST_ACCESSIBILITY: root Object is not a QApplication!");
} else { } else {
qWarning("QTEST_ACCESSIBILITY: root Object called with 0 pointer"); tqWarning("QTEST_ACCESSIBILITY: root Object called with 0 pointer");
} }
} }
static void updateHandler(QObject *o, int c, QAccessible::Event e) static void updateHandler(QObject *o, int c, QAccessible::Event e)
{ {
// qDebug("updateHandler called: %p %d %d", o, c, (int)e); // tqDebug("updateHandler called: %p %d %d", o, c, (int)e);
eventList().append(QTestAccessibilityEvent(o, c, (int)e)); eventList().append(QTestAccessibilityEvent(o, c, (int)e));
} }

@ -954,8 +954,8 @@ Boston, MA 02110-1301, USA.
#endif #endif
#define tqSystemWarning qSystemWarning #define tqSystemWarning tqSystemWarning
#define tqSuppressObsoleteWarnings qSuppressObsoleteWarnings #define tqSuppressObsoleteWarnings tqSuppressObsoleteWarnings
#define tqmoc moc #define tqmoc moc
#define TQMOC MOC #define TQMOC MOC
@ -1000,30 +1000,30 @@ Boston, MA 02110-1301, USA.
#define tqApp qApp #define tqApp qApp
#define tqAddPostRoutine qAddPostRoutine #define tqAddPostRoutine tqAddPostRoutine
#define tqWarning qWarning #define tqWarning tqWarning
#define tqSharedBuild qSharedBuild #define tqSharedBuild tqSharedBuild
#define tqNetworkProtocolRegister qNetworkProtocolRegister #define tqNetworkProtocolRegister tqNetworkProtocolRegister
#define tqDebug qDebug #define tqDebug tqDebug
#define tqCompress qCompress #define tqCompress tqCompress
#define tqFatal qFatal #define tqFatal tqFatal
#define tqSqlDriverExtDict qSqlDriverExtDict #define tqSqlDriverExtDict tqSqlDriverExtDict
#define tqSqlOpenExtDict qSqlOpenExtDict #define tqSqlOpenExtDict tqSqlOpenExtDict
#define tqInitNetworkProtocols qInitNetworkProtocols #define tqInitNetworkProtocols tqInitNetworkProtocols
#define tqSuppressObsoleteWarnings qSuppressObsoleteWarnings #define tqSuppressObsoleteWarnings tqSuppressObsoleteWarnings
#define tqChecksum qChecksum #define tqChecksum tqChecksum
#define tqRemovePostRoutine qRemovePostRoutine #define tqRemovePostRoutine tqRemovePostRoutine
#define tqInstallPath qInstallPath #define tqInstallPath tqInstallPath
#define tqObsolete qObsolete #define tqObsolete tqObsolete
#define tqVersion qVersion #define tqVersion tqVersion
#define tqSystemWarning qSystemWarning #define tqSystemWarning tqSystemWarning
#define tqSysInfo qSysInfo #define tqSysInfo tqSysInfo
#define tqmemmove qmemmove #define tqmemmove tqmemmove
#define tqstrncpy qstrncpy #define tqstrncpy tqstrncpy
#define tqstrdup qstrdup #define tqstrdup tqstrdup
#define tqstrnicmp qstrnicmp #define tqstrnicmp tqstrnicmp
#define tqstricmp qstricmp #define tqstricmp tqstricmp
#define tqt_get_application_thread_id qt_get_application_thread_id #define tqt_get_application_thread_id qt_get_application_thread_id
#define tqt_x_user_time qt_x_user_time #define tqt_x_user_time qt_x_user_time
@ -1218,7 +1218,7 @@ Boston, MA 02110-1301, USA.
#define tqMakePair qMakePair #define tqMakePair qMakePair
#define tqt_ucm_query_verification_data qt_ucm_query_verification_data #define tqt_ucm_query_verification_data qt_ucm_query_verification_data
#define tqmemmove qmemmove #define tqmemmove tqmemmove
#define TQ_ControlElement ControlElement #define TQ_ControlElement ControlElement
#define TQ_ComplexControl ComplexControl #define TQ_ComplexControl ComplexControl

@ -62,7 +62,7 @@ QT_MODULE(Core)
Safe and portable C string functions; extensions to standard string.h Safe and portable C string functions; extensions to standard string.h
*****************************************************************************/ *****************************************************************************/
Q_CORE_EXPORT char *qstrdup(const char *); Q_CORE_EXPORT char *tqstrdup(const char *);
inline uint qstrlen(const char *str) inline uint qstrlen(const char *str)
{ return str ? uint(strlen(str)) : 0; } { return str ? uint(strlen(str)) : 0; }
@ -78,7 +78,7 @@ inline uint qstrnlen(const char *str, uint maxlen)
} }
Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src); Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src);
Q_CORE_EXPORT char *qstrncpy(char *dst, const char *src, uint len); Q_CORE_EXPORT char *tqstrncpy(char *dst, const char *src, uint len);
Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2); Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2);
Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2); Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2);
@ -91,15 +91,15 @@ inline int qstrncmp(const char *str1, const char *str2, uint len)
return (str1 && str2) ? strncmp(str1, str2, len) return (str1 && str2) ? strncmp(str1, str2, len)
: (str1 ? 1 : (str2 ? -1 : 0)); : (str1 ? 1 : (str2 ? -1 : 0));
} }
Q_CORE_EXPORT int qstricmp(const char *, const char *); Q_CORE_EXPORT int tqstricmp(const char *, const char *);
Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len); Q_CORE_EXPORT int tqstrnicmp(const char *, const char *, uint len);
// implemented in qvsnprintf.cpp // implemented in qvsnprintf.cpp
Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap); Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...); Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len) inline QT3_SUPPORT void *tqmemmove(void *dst, const void *src, uint len)
{ return memmove(dst, src, len); } { return memmove(dst, src, len); }
inline QT3_SUPPORT uint cstrlen(const char *str) inline QT3_SUPPORT uint cstrlen(const char *str)
{ return uint(strlen(str)); } { return uint(strlen(str)); }
@ -111,9 +111,9 @@ inline QT3_SUPPORT int cstrncmp(const char *str1, const char *str2, uint len)
{ return strncmp(str1,str2,len); } { return strncmp(str1,str2,len); }
#endif #endif
// qChecksum: Internet checksum // tqChecksum: Internet checksum
Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len); Q_CORE_EXPORT quint16 tqChecksum(const char *s, uint len);
class QByteRef; class QByteRef;
class QString; class QString;
@ -583,10 +583,10 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &);
#endif #endif
#ifndef QT_NO_COMPRESS #ifndef QT_NO_COMPRESS
Q_CORE_EXPORT QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel = -1); Q_CORE_EXPORT QByteArray tqCompress(const uchar* data, int nbytes, int compressionLevel = -1);
Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes); Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes);
inline QByteArray qCompress(const QByteArray& data, int compressionLevel = -1) inline QByteArray tqCompress(const QByteArray& data, int compressionLevel = -1)
{ return qCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); } { return tqCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); }
inline QByteArray qUncompress(const QByteArray& data) inline QByteArray qUncompress(const QByteArray& data)
{ return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); } { return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); }
#endif #endif

@ -488,7 +488,7 @@ namespace QT_NAMESPACE {}
# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
# define Q_NO_TEMPLATE_FRIENDS # define Q_NO_TEMPLATE_FRIENDS
# endif # endif
/* Apple's GCC 3.1 chokes on our streaming qDebug() */ /* Apple's GCC 3.1 chokes on our streaming tqDebug() */
# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3) # if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM # define Q_BROKEN_DEBUG_STREAM
# endif # endif
@ -1522,15 +1522,15 @@ public:
#endif #endif
}; };
Q_CORE_EXPORT const char *qVersion(); Q_CORE_EXPORT const char *tqVersion();
Q_CORE_EXPORT bool qSharedBuild(); Q_CORE_EXPORT bool tqSharedBuild();
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
inline int qMacVersion() { return QSysInfo::MacintoshVersion; } inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
#endif #endif
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian) inline QT3_SUPPORT bool tqSysInfo(int *wordSize, bool *bigEndian)
{ {
*wordSize = QSysInfo::WordSize; *wordSize = QSysInfo::WordSize;
*bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian); *bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
@ -1593,13 +1593,13 @@ inline void qUnused(T &x) { (void)x; }
# define qPrintable(string) (string).toLocal8Bit().constData() # define qPrintable(string) (string).toLocal8Bit().constData()
#endif #endif
Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */ Q_CORE_EXPORT void tqDebug(const char *, ...) /* print debug message */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
Q_CORE_EXPORT void qWarning(const char *, ...) /* print warning message */ Q_CORE_EXPORT void tqWarning(const char *, ...) /* print warning message */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
@ -1612,14 +1612,14 @@ Q_CORE_EXPORT void qCritical(const char *, ...) /* print critical message */
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */ Q_CORE_EXPORT void tqFatal(const char *, ...) /* print fatal message and exit */
#if defined(Q_CC_GNU) && !defined(__INSURE__) #if defined(Q_CC_GNU) && !defined(__INSURE__)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
#endif #endif
; ;
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1); Q_CORE_EXPORT QT3_SUPPORT void tqSystemWarning(const char *msg, int code = -1);
#endif /* QT3_SUPPORT */ #endif /* QT3_SUPPORT */
Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...); Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...); Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
@ -1631,25 +1631,25 @@ Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
/* /*
Forward declarations only. Forward declarations only.
In order to use the qDebug() stream, you must #include<QDebug> In order to use the tqDebug() stream, you must #include<QDebug>
*/ */
class QDebug; class QDebug;
class QNoDebug; class QNoDebug;
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
Q_CORE_EXPORT_INLINE QDebug qDebug(); Q_CORE_EXPORT_INLINE QDebug tqDebug();
Q_CORE_EXPORT_INLINE QDebug qWarning(); Q_CORE_EXPORT_INLINE QDebug tqWarning();
Q_CORE_EXPORT_INLINE QDebug qCritical(); Q_CORE_EXPORT_INLINE QDebug qCritical();
#else #else
inline QNoDebug qDebug(); inline QNoDebug tqDebug();
#endif #endif
#define QT_NO_QDEBUG_MACRO while (false) qDebug #define QT_NO_QDEBUG_MACRO while (false) tqDebug
#ifdef QT_NO_DEBUG_OUTPUT #ifdef QT_NO_DEBUG_OUTPUT
# define qDebug QT_NO_QDEBUG_MACRO # define tqDebug QT_NO_QDEBUG_MACRO
#endif #endif
#define QT_NO_QWARNING_MACRO while (false) qWarning #define QT_NO_QWARNING_MACRO while (false) tqWarning
#ifdef QT_NO_WARNING_OUTPUT #ifdef QT_NO_WARNING_OUTPUT
# define qWarning QT_NO_QWARNING_MACRO # define tqWarning QT_NO_QWARNING_MACRO
#endif #endif
@ -1731,8 +1731,8 @@ typedef void (*QtMsgHandler)(QtMsgType, const char *);
Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler); Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
#ifdef QT3_SUPPORT #ifdef QT3_SUPPORT
inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {} inline QT3_SUPPORT void tqSuppressObsoleteWarnings(bool = true) {}
inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {} inline QT3_SUPPORT void tqObsolete(const char *, const char * = 0, const char * = 0) {}
#endif #endif
#if defined(QT_NO_THREAD) #if defined(QT_NO_THREAD)
@ -1942,7 +1942,7 @@ static inline bool qIsNull(float f)
#ifdef Q_FULL_TEMPLATE_INSTANTIATION #ifdef Q_FULL_TEMPLATE_INSTANTIATION
# define Q_DUMMY_COMPARISON_OPERATOR(C) \ # define Q_DUMMY_COMPARISON_OPERATOR(C) \
bool operator==(const C&) const { \ bool operator==(const C&) const { \
qWarning(#C"::operator==(const "#C"&) was called"); \ tqWarning(#C"::operator==(const "#C"&) was called"); \
return false; \ return false; \
} }
#else #else
@ -2404,15 +2404,15 @@ Q_CORE_EXPORT int qrand();
#ifndef QT_PRODUCT_LICENSE #ifndef QT_PRODUCT_LICENSE
# define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts() # define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
#endif #endif
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPath();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathDocs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathHeaders();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathLibs();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathBins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathPlugins();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathData();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathTranslations();
QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathSysconf();
#endif #endif
#if defined(Q_OS_SYMBIAN) #if defined(Q_OS_SYMBIAN)

Loading…
Cancel
Save