diff options
| author | Timothy Pearson <[email protected]> | 2012-02-28 22:31:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-28 22:31:39 -0600 |
| commit | 41bb408dde90e755b07cd2ab8a9bdec7548c84b0 (patch) | |
| tree | 6d4d5407c000add30aa78630e009c0e5d633e440 | |
| parent | 1740cd279522c060e738bbbffacab83355d2b794 (diff) | |
| download | tqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.tar.gz tqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.zip | |
Automated conversion from qt3
377 files changed, 2588 insertions, 2588 deletions
@@ -1093,15 +1093,15 @@ static const char QT_INSTALL_TRANSLATIONS[267] = "qt_trnpath=$QT_INSTALL_TRANSLA static const char QT_INSTALL_SYSCONF [267] = "qt_cnfpath=$QT_INSTALL_SYSCONF"; /* strlen( "qt_xxxpath=" ) == 11 */ -const char *qInstallPath() { return QT_INSTALL_PREFIX + 11; } -const char *qInstallPathDocs() { return QT_INSTALL_DOCS + 11; } -const char *qInstallPathHeaders() { return QT_INSTALL_HEADERS + 11; } -const char *qInstallPathLibs() { return QT_INSTALL_LIBS + 11; } -const char *qInstallPathBins() { return QT_INSTALL_BINS + 11; } -const char *qInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; } -const char *qInstallPathData() { return QT_INSTALL_DATA + 11; } -const char *qInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; } -const char *qInstallPathSysconf() { return QT_INSTALL_SYSCONF + 11; } +const char *tqInstallPath() { return QT_INSTALL_PREFIX + 11; } +const char *tqInstallPathDocs() { return QT_INSTALL_DOCS + 11; } +const char *tqInstallPathHeaders() { return QT_INSTALL_HEADERS + 11; } +const char *tqInstallPathLibs() { return QT_INSTALL_LIBS + 11; } +const char *tqInstallPathBins() { return QT_INSTALL_BINS + 11; } +const char *tqInstallPathPlugins() { return QT_INSTALL_PLUGINS + 11; } +const char *tqInstallPathData() { return QT_INSTALL_DATA + 11; } +const char *tqInstallPathTranslations() { return QT_INSTALL_TRANSLATIONS + 11; } +const char *tqInstallPathSysconf() { return QT_INSTALL_SYSCONF + 11; } EOF # avoid unecessary rebuilds by copying only if qconfig.cpp has changed diff --git a/doc/debug.doc b/doc/debug.doc index 91ec8af25..dde061e87 100644 --- a/doc/debug.doc +++ b/doc/debug.doc @@ -72,10 +72,10 @@ that can help with debugging. Qt includes three global functions for writing out warning and debug text. \list -\i \link ::qDebug() qDebug()\endlink for writing debug output for testing etc. -\i \link ::qWarning() qWarning()\endlink for writing warning output when program +\i \link ::tqDebug() tqDebug()\endlink for writing debug output for testing etc. +\i \link ::tqWarning() tqWarning()\endlink for writing warning output when program errors occur. -\i \link ::qFatal() qFatal()\endlink for writing fatal error messages +\i \link ::tqFatal() tqFatal()\endlink for writing fatal error messages and exiting. \endlist @@ -166,12 +166,12 @@ Example: { #if defined(QT_CHECK_NULL) if ( p == 0 ) - qWarning( "f: Null pointer not allowed" ); + tqWarning( "f: Null pointer not allowed" ); #endif #if defined(QT_CHECK_RANGE) if ( i < 0 ) - qWarning( "f: The index cannot be negative" ); + tqWarning( "f: The index cannot be negative" ); #endif } \endcode diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html index c9a0b0c0d..ab874cfcd 100644 --- a/doc/html/canvas-example.html +++ b/doc/html/canvas-example.html @@ -867,7 +867,7 @@ void <a name="f653"></a>Main::addMesh() #ifndef QT_NO_PROGRESSDIALOG progress.<a href="ntqprogressdialog.html#setProgress">setProgress</a>( rows ); #endif - // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); + // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); } void <a name="f654"></a>Main::addRectangle() diff --git a/doc/html/designer-manual-8.html b/doc/html/designer-manual-8.html index 74cde6610..a0f4643b1 100644 --- a/doc/html/designer-manual-8.html +++ b/doc/html/designer-manual-8.html @@ -77,7 +77,7 @@ bool createConnections() // create the default database connection TQSqlDatabase *defaultDB = TQSqlDatabase::addDatabase( "TQPSQL7" ); if ( ! defaultDB ) { - qWarning( "Failed to connect to driver" ); + tqWarning( "Failed to connect to driver" ); return FALSE; } defaultDB->setDatabaseName( "book" ); @@ -85,9 +85,9 @@ bool createConnections() defaultDB->setPassword( "bookpw" ); defaultDB->setHostName( "bookhost" ); if ( ! defaultDB->open() ) { - qWarning( "Failed to open books database: " + + tqWarning( "Failed to open books database: " + defaultDB->lastError().driverText() ); - qWarning( defaultDB->lastError().databaseText() ); + tqWarning( defaultDB->lastError().databaseText() ); return FALSE; } diff --git a/doc/html/functions.html b/doc/html/functions.html index 915f5a0db..45b63c180 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -2077,7 +2077,7 @@ packImage: <a href="ntqftp.html#put">TQFtp</a> <a href="ntqurloperator.html#put">TQUrlOperator</a><li>putPoints: <a href="ntqpointarray.html#putPoints">TQPointArray</a><li>putch: <a href="ntqfile.html#putch">TQFile</a> <a href="ntqiodevice.html#putch">TQIODevice</a> <a href="ntqsocket.html#putch">TQSocket</a><li><a name="q"></a> -qAddPostRoutine: +tqAddPostRoutine: <a href="ntqapplication.html#qAddPostRoutine">TQApplication</a><li>qAlpha: <a href="ntqcolor.html#qAlpha">TQColor</a><li>qBlue: <a href="ntqcolor.html#qBlue">TQColor</a><li>qChecksum: diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html index 07f5573f4..f0df8f7d2 100644 --- a/doc/html/ntqapplication.html +++ b/doc/html/ntqapplication.html @@ -1900,7 +1900,7 @@ similar to the C printf() function. is sent to the debugger. <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including the '\0'-terminator). -<p> <b>Warning:</b> Passing (const char *)0 as argument to qDebug might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to tqDebug might lead to crashes on certain platforms due to the platforms printf implementation. <p> <p>See also <a href="#qWarning">qWarning</a>(), <a href="#qFatal">qFatal</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>. @@ -1926,7 +1926,7 @@ similar to the C printf() function. is sent to the debugger. <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including the '\0'-terminator). -<p> <b>Warning:</b> Passing (const char *)0 as argument to qFatal might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to tqFatal might lead to crashes on certain platforms due to the platforms printf implementation. <p> <p>See also <a href="#qDebug">qDebug</a>(), <a href="#qWarning">qWarning</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>. @@ -2029,7 +2029,7 @@ similar to the C printf() function. is sent to the debugger. <p> <b>Warning:</b> The internal buffer is limited to 8196 bytes (including the '\0'-terminator). -<p> <b>Warning:</b> Passing (const char *)0 as argument to qWarning might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to tqWarning might lead to crashes on certain platforms due to the platforms printf implementation. <p> <p>See also <a href="#qDebug">qDebug</a>(), <a href="#qFatal">qFatal</a>(), <a href="#qInstallMsgHandler">qInstallMsgHandler</a>(), and <a href="debug.html">Debugging</a>. diff --git a/doc/html/porting.html b/doc/html/porting.html index 39062649c..8c0a3e10a 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -390,8 +390,8 @@ new code. <li> <tt>#define strcpy qstrcpy</tt> <li> <tt>#define strcmp qstrcmp</tt> <li> <tt>#define strncmp tqstrncmp</tt> -<li> <tt>#define stricmp qstricmp</tt> -<li> <tt>#define strnicmp qstrnicmp</tt> +<li> <tt>#define stricmp tqstricmp</tt> +<li> <tt>#define strnicmp tqstrnicmp</tt> </ul> <p> See the changes-3.0.0 document for an explanation of why this had to be done. You might have been relying on the non-portable and unpredictable behavior diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html index 3aeef7985..8d777fb60 100644 --- a/doc/html/qcstring-h.html +++ b/doc/html/qcstring-h.html @@ -89,9 +89,9 @@ body { background: #ffffff; color: black; } Safe and portable C string functions; extensions to standard string.h *****************************************************************************/ -Q_EXPORT void *qmemmove( void *dst, const void *src, uint len ); +Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); -Q_EXPORT char *qstrdup( const char * ); +Q_EXPORT char *tqstrdup( const char * ); Q_EXPORT inline uint tqstrlen( const char *str ) { return str ? (uint)strlen(str) : 0u; } @@ -99,7 +99,7 @@ Q_EXPORT inline uint tqstrlen( const char *str ) Q_EXPORT inline char *qstrcpy( char *dst, const char *src ) { return src ? strcpy(dst, src) : 0; } -Q_EXPORT char *qstrncpy( char *dst, const char *src, uint len ); +Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) { @@ -113,9 +113,9 @@ Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT int qstricmp( const char *, const char * ); +Q_EXPORT int tqstricmp( const char *, const char * ); -Q_EXPORT int qstrnicmp( const char *, const char *, uint len ); +Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); #ifndef QT_CLEAN_NAMESPACE Q_EXPORT inline uint cstrlen( const char *str ) @@ -132,9 +132,9 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len ) #endif -// qChecksum: Internet checksum +// tqChecksum: Internet checksum -Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len ); +Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len ); /***************************************************************************** TQByteArray class @@ -156,10 +156,10 @@ typedef TQMemArray<char> TQByteArray; #endif #ifndef QT_NO_COMPRESS -Q_EXPORT TQByteArray qCompress( const uchar* data, int nbytes ); +Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); -Q_EXPORT inline TQByteArray qCompress( const TQByteArray& data) -{ return qCompress( (const uchar*)data.data(), data.size() ); } +Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) +{ return tqCompress( (const uchar*)data.data(), data.size() ); } Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) { return tqUncompress( (const uchar*)data.data(), data.size() ); } #endif diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html index 6a5031369..048af28b8 100644 --- a/doc/html/qgl-h.html +++ b/doc/html/qgl-h.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } #define TQGL_VERSION 450 #define TQGL_VERSION_STR "4.5" TQM_EXPORT_OPENGL inline const char *qGLVersion() { - qObsolete( 0, "qGLVersion", "qVersion" ); + tqObsolete( 0, "qGLVersion", "qVersion" ); return TQGL_VERSION_STR; } #endif diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 397f2e4ee..14ea0fe50 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -942,9 +942,9 @@ extern Q_EXPORT bool qt_winunicode; // System information // -Q_EXPORT const char *qVersion(); -Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool qSharedBuild(); +Q_EXPORT const char *tqVersion(); +Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); +Q_EXPORT bool tqSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) @@ -1003,25 +1003,25 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void qDebug( const char *, ... ) // print debug message +Q_EXPORT void tqDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qWarning( const char *, ... ) // print warning message +Q_EXPORT void tqWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit +Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qSystemWarning( const char *, int code = -1 ); +Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); #if !defined(QT_CLEAN_NAMESPACE) // compatibility with TQt 1 @@ -1049,9 +1049,9 @@ Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit #if !defined(Q_ASSERT) # if defined(QT_CHECK_STATE) # if defined(QT_FATAL_ASSERT) -# define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # else -# define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # endif # else # define Q_ASSERT(x) @@ -1067,10 +1067,10 @@ Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit #endif // QT_NO_COMPAT -Q_EXPORT bool qt_check_pointer( bool c, const char *, int ); +Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); #if defined(QT_CHECK_NULL) -# define TQ_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__)) +# define TQ_CHECK_PTR(p) (tqt_check_pointer((p)==0,__FILE__,__LINE__)) #else # define TQ_CHECK_PTR(p) #endif @@ -1090,27 +1090,27 @@ Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); typedef TQtMsgHandler msg_handler; #endif // QT_NO_COMPAT -Q_EXPORT void qSuppressObsoleteWarnings( bool = TRUE ); +Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void qObsolete( const char *obj, const char *oldfunc, +Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void qObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void qObsolete( const char *message ); +Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); +Q_EXPORT void tqObsolete( const char *message ); // // Install paths from configure // -Q_EXPORT const char *qInstallPath(); -Q_EXPORT const char *qInstallPathDocs(); -Q_EXPORT const char *qInstallPathHeaders(); -Q_EXPORT const char *qInstallPathLibs(); -Q_EXPORT const char *qInstallPathBins(); -Q_EXPORT const char *qInstallPathPlugins(); -Q_EXPORT const char *qInstallPathData(); -Q_EXPORT const char *qInstallPathTranslations(); -Q_EXPORT const char *qInstallPathSysconf(); +Q_EXPORT const char *tqInstallPath(); +Q_EXPORT const char *tqInstallPathDocs(); +Q_EXPORT const char *tqInstallPathHeaders(); +Q_EXPORT const char *tqInstallPathLibs(); +Q_EXPORT const char *tqInstallPathBins(); +Q_EXPORT const char *tqInstallPathPlugins(); +Q_EXPORT const char *tqInstallPathData(); +Q_EXPORT const char *tqInstallPathTranslations(); +Q_EXPORT const char *tqInstallPathSysconf(); #endif /* __cplusplus */ @@ -1125,7 +1125,7 @@ Q_EXPORT const char *qInstallPathSysconf(); #ifdef Q_FULL_TEMPLATE_INSTANTIATION # define Q_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ - qWarning( #C"::operator==( const "#C"& ) got called." ); \ + tqWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else diff --git a/doc/html/qheader-h.html b/doc/html/qheader-h.html index ee92c4a65..501dde05f 100644 --- a/doc/html/qheader-h.html +++ b/doc/html/qheader-h.html @@ -248,7 +248,7 @@ inline TQHeader::Orientation TQHeader::orientation() const inline void TQHeader::setTracking( bool enable ) { trackingIsOn = enable; } inline bool TQHeader::tracking() const { return trackingIsOn; } -extern Q_EXPORT bool qt_qheader_label_return_null_strings; // needed for professional edition +extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition #endif // QT_NO_HEADER diff --git a/doc/html/qmake-manual-4.html b/doc/html/qmake-manual-4.html index 990d60508..8fe09fd1a 100644 --- a/doc/html/qmake-manual-4.html +++ b/doc/html/qmake-manual-4.html @@ -135,7 +135,7 @@ body { background: #ffffff; color: black; } </pre> <p>Use <em>qmake</em> as before to generate a makefile. If you rename <em>main.cpp</em> temporarily, you will see the message and <em>qmake</em> will stop processing.</p> <h3><a name="6"></a>Checking for more than one condition</h3> -<p>Suppose you use Windows and you want to be able to see the qDebug() statements when you run your application on the command line. Unless you build your application with the console setting, you won't see the output. We can easily put <em>console</em> on the CONFIG line so that on Windows the makefile will have this setting. But let's say that we only want to add the CONFIG line if we are running on Windows <em>and</em> when <em>debug</em> is already on the CONFIG line. This requires using two nested scopes; just create one scope, then create the other inside that one. Put the settings to be processed inside the last scope, like this:</p> +<p>Suppose you use Windows and you want to be able to see the tqDebug() statements when you run your application on the command line. Unless you build your application with the console setting, you won't see the output. We can easily put <em>console</em> on the CONFIG line so that on Windows the makefile will have this setting. But let's say that we only want to add the CONFIG line if we are running on Windows <em>and</em> when <em>debug</em> is already on the CONFIG line. This requires using two nested scopes; just create one scope, then create the other inside that one. Put the settings to be processed inside the last scope, like this:</p> <pre> win32 { debug { diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index 2ff20da0d..d6e5319a3 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -612,7 +612,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l #ifdef QT_CHECK_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() ); # else # define QT_CHECK_INVALID_MAP_ELEMENT diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html index c52826bd8..c014327e0 100644 --- a/doc/html/qmessagebox-h.html +++ b/doc/html/qmessagebox-h.html @@ -245,13 +245,13 @@ private: // Disabled copy constructor and operator= * } */ #define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ -TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ +TQString sq=TQString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !tqApp){ int c=0; new \ TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\ "%2, found TQt %3.").arg(TQString::fromLatin1(tqAppName())).arg(TQString::fromLatin1(\ -str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\ -"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }} +str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\ +"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }} #endif // QT_NO_MESSAGEBOX diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index ae37a8427..dfa12ef0a 100644 --- a/doc/html/qstring-h.html +++ b/doc/html/qstring-h.html @@ -261,7 +261,7 @@ public: static bool networkOrdered() { int wordSize; bool bigEndian = FALSE; - qSysInfo( &wordSize, &bigEndian ); + tqSysInfo( &wordSize, &bigEndian ); return bigEndian; } diff --git a/doc/html/qstrlist-h.html b/doc/html/qstrlist-h.html index 49a3e7e09..88f998a87 100644 --- a/doc/html/qstrlist-h.html +++ b/doc/html/qstrlist-h.html @@ -100,7 +100,7 @@ public: TQStrList& operator=( const TQStrList & ); private: - TQPtrCollection::Item newItem( TQPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } + TQPtrCollection::Item newItem( TQPtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; } void deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } @@ -121,7 +121,7 @@ public: ~TQStrIList() { clear(); } private: int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { return qstricmp((const char*)s1, + { return tqstricmp((const char*)s1, (const char*)s2); } }; diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html index 16d084b87..c88d0ca6b 100644 --- a/doc/html/qvaluelist-h.html +++ b/doc/html/qvaluelist-h.html @@ -431,7 +431,7 @@ Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() #ifdef QT_CHECK_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() ); # else # define QT_CHECK_INVALID_LIST_ELEMENT diff --git a/doc/html/qwindowdefs-h.html b/doc/html/qwindowdefs-h.html index 75e2dea00..0a7f48282 100644 --- a/doc/html/qwindowdefs-h.html +++ b/doc/html/qwindowdefs-h.html @@ -183,12 +183,12 @@ typedef struct _XGC *GC; typedef struct _XRegion *Region; typedef unsigned long WId; -Q_EXPORT Display *qt_xdisplay(); -Q_EXPORT int qt_xscreen(); -Q_EXPORT WId qt_xrootwin(); // ### REMOVE 4.0 -Q_EXPORT WId qt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 -Q_EXPORT GC qt_xget_readonly_gc( int scrn, bool monochrome ); -Q_EXPORT GC qt_xget_temp_gc( int scrn, bool monochrome ); +Q_EXPORT Display *tqt_xdisplay(); +Q_EXPORT int tqt_xscreen(); +Q_EXPORT WId tqt_xrootwin(); // ### REMOVE 4.0 +Q_EXPORT WId tqt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 +Q_EXPORT GC tqt_xget_readonly_gc( int scrn, bool monochrome ); +Q_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome ); Q_EXPORT const char *tqAppClass(); // get application class @@ -221,8 +221,8 @@ Q_EXPORT const char *tqAppName(); // get application name // Misc functions typedef void (*TQtCleanUpFunction)(); -Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction ); -Q_EXPORT void qRemovePostRoutine( TQtCleanUpFunction ); +Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction ); +Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction ); #if !defined(QT_CLEAN_NAMESPACE) // source compatibility with TQt 2.x diff --git a/doc/html/tutorial1-08.html b/doc/html/tutorial1-08.html index a98e8e301..4586ceab9 100644 --- a/doc/html/tutorial1-08.html +++ b/doc/html/tutorial1-08.html @@ -78,7 +78,7 @@ limit the possible range of <tt>minVal</tt> and <tt>maxVal</tt> to 0..99 to avoi overflow of the TQLCDNumber. (We could have allowed values down to -9 but chose not to.) If the arguments are illegal, we use TQt's <a href="ntqapplication.html#qWarning">qWarning</a>() function to issue a warning to the user and return -immediately. qWarning() is a printf-like function that by default +immediately. tqWarning() is a printf-like function that by default sends its output to <tt>stderr</tt>. If you want, you can install your own handler function using <a href="ntqapplication.html#qInstallMsgHandler">::qInstallMsgHandler</a>(). <p> <h3> <a href="t8-cannon-h.html">t8/cannon.h</a> diff --git a/doc/i18n.doc b/doc/i18n.doc index d10a4f309..77a0046b8 100644 --- a/doc/i18n.doc +++ b/doc/i18n.doc @@ -297,8 +297,8 @@ example: QString s1 = "%1 of %2 files copied. Copying: %3"; QString s2 = "Kopierer nu %3. Av totalt %2 filer er %1 kopiert."; - qDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() ); - qDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() ); + tqDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() ); + tqDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() ); \endcode produces the correct output in English and Norwegian: diff --git a/doc/mac.doc b/doc/mac.doc index 2447901b7..df68c717a 100644 --- a/doc/mac.doc +++ b/doc/mac.doc @@ -177,7 +177,7 @@ do this: kCFURLPOSIXPathStyle); const char *pathPtr = CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding()); - qDebug("Path = %s", pathPtr); + tqDebug("Path = %s", pathPtr); CFRelease(pluginRef); CFRelease(macPath); \endcode diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt index 7b67978e9..f1f1c49df 100644 --- a/doc/man/man3/qapplication.3qt +++ b/doc/man/man3/qapplication.3qt @@ -1696,7 +1696,7 @@ Example: .br .fi .PP -If \fCb\fR is zero, the Q_ASSERT statement will output the following message using the qWarning() function: +If \fCb\fR is zero, the Q_ASSERT statement will output the following message using the tqWarning() function: .PP .nf .br @@ -1704,7 +1704,7 @@ If \fCb\fR is zero, the Q_ASSERT statement will output the following message usi .br .fi .PP -See also qWarning() and Debugging. +See also tqWarning() and Debugging. .SH "void TQ_CHECK_PTR ( void * p )" If \fIp\fR is 0, prints a warning message containing the source code file name and line number, saying that the program ran out of memory. .PP @@ -1726,8 +1726,8 @@ Example: .br .fi .PP -See also qWarning() and Debugging. -.SH "void qAddPostRoutine ( QtCleanUpFunction p )" +See also tqWarning() and Debugging. +.SH "void tqAddPostRoutine ( QtCleanUpFunction p )" Adds a global routine that will be called from the QApplication destructor. This function is normally used to add cleanup routines for program-wide functionality. .PP The function given by \fIp\fR should take no arguments and return nothing, like this: @@ -1754,13 +1754,13 @@ The function given by \fIp\fR should take no arguments and return nothing, like .br global_ptr = new int[100]; // allocate data .br - qAddPostRoutine( cleanup_ptr ); // delete later + tqAddPostRoutine( cleanup_ptr ); // delete later .br } .br .fi .PP -Note that for an application- or module-wide cleanup, qAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the QApplication destructor is called, for example. +Note that for an application- or module-wide cleanup, tqAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the QApplication destructor is called, for example. .PP For modules and libraries, using a reference-counted initialization manager or Qt' parent-child delete mechanism may be better. Here is an example of a private class which uses the parent-child mechanism to call a cleanup function at the right time: .PP @@ -1803,7 +1803,7 @@ For modules and libraries, using a reference-counted initialization manager or Q .fi .PP By selecting the right parent widget/object, this can often be made to clean up the module's data at the exact right moment. -.SH "void qDebug ( const char * msg, ... )" +.SH "void tqDebug ( const char * msg, ... )" Prints a debug message \fImsg\fR, or calls the message handler (if it has been installed). .PP This function takes a format string and a list of arguments, similar to the C printf() function. @@ -1812,7 +1812,7 @@ Example: .PP .nf .br - qDebug( "my window handle = %x", myWidget->id() ); + tqDebug( "my window handle = %x", myWidget->id() ); .br .fi .PP @@ -1820,10 +1820,10 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the .PP \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '\0'-terminator). .PP -\fBWarning:\fR Passing (const char *)0 as argument to qDebug might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to tqDebug might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also qWarning(), qFatal(), qInstallMsgHandler(), and Debugging. -.SH "void qFatal ( const char * msg, ... )" +See also tqWarning(), tqFatal(), qInstallMsgHandler(), and Debugging. +.SH "void tqFatal ( const char * msg, ... )" Prints a fatal error message \fImsg\fR and exits, or calls the message handler (if it has been installed). .PP This function takes a format string and a list of arguments, similar to the C printf() function. @@ -1838,7 +1838,7 @@ Example: .br if ( b == 0 ) // program error .br - qFatal( "divide: cannot divide by zero" ); + tqFatal( "divide: cannot divide by zero" ); .br return a/b; .br @@ -1850,9 +1850,9 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the .PP \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '\0'-terminator). .PP -\fBWarning:\fR Passing (const char *)0 as argument to qFatal might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to tqFatal might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also qDebug(), qWarning(), qInstallMsgHandler(), and Debugging. +See also tqDebug(), tqWarning(), qInstallMsgHandler(), and Debugging. .SH "QtMsgHandler qInstallMsgHandler ( QtMsgHandler h )" Installs a Qt message handler \fIh\fR. Returns a pointer to the message handler previously defined. .PP @@ -1920,22 +1920,22 @@ Example: .br .fi .PP -See also qDebug(), qWarning(), qFatal(), and Debugging. -.SH "bool qSysInfo ( int * wordSize, bool * bigEndian )" +See also tqDebug(), tqWarning(), tqFatal(), and Debugging. +.SH "bool tqSysInfo ( int * wordSize, bool * bigEndian )" Obtains information about the system. .PP The system's word size in bits (typically 32) is returned in \fI*wordSize\fR. The \fI*bigEndian\fR is set to TRUE if this is a big-endian machine, or to FALSE if this is a little-endian machine. .PP -In debug mode, this function calls qFatal() with a message if the computer is truly weird (i.e. different endianness for 16 bit and 32 bit integers); in release mode it returns FALSE. -.SH "void qSystemWarning ( const char * msg, int code )" +In debug mode, this function calls tqFatal() with a message if the computer is truly weird (i.e. different endianness for 16 bit and 32 bit integers); in release mode it returns FALSE. +.SH "void tqSystemWarning ( const char * msg, int code )" Prints the message \fImsg\fR and uses \fIcode\fR to get a system specific error message. When \fIcode\fR is -1 (the default), the system's last error code will be used if possible. Use this method to handle failures in platform specific API calls. .PP This function does nothing when Qt is built with \fCQT_NO_DEBUG\fR defined. -.SH "const char * qVersion ()" +.SH "const char * tqVersion ()" Returns the Qt version number as a string, for example, "2.3.0" or" 3.0.5". .PP The \fCTQT_VERSION\fR define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, Qt 3.0.5's \fCTQT_VERSION\fR is 0x030005. -.SH "void qWarning ( const char * msg, ... )" +.SH "void tqWarning ( const char * msg, ... )" Prints a warning message \fImsg\fR, or calls the message handler (if it has been installed). .PP This function takes a format string and a list of arguments, similar to the C printf() function. @@ -1950,7 +1950,7 @@ Example: .br if ( c > 200 ) .br - qWarning( "f: bad argument, c == %d", c ); + tqWarning( "f: bad argument, c == %d", c ); .br } .br @@ -1960,9 +1960,9 @@ Under X11, the text is printed to stderr. Under Windows, the text is sent to the .PP \fBWarning:\fR The internal buffer is limited to 8196 bytes (including the '\0'-terminator). .PP -\fBWarning:\fR Passing (const char *)0 as argument to qWarning might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to tqWarning might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also qDebug(), qFatal(), qInstallMsgHandler(), and Debugging. +See also tqDebug(), tqFatal(), qInstallMsgHandler(), and Debugging. .SH "SEE ALSO" .BR http://doc.trolltech.com/ntqapplication.html diff --git a/doc/man/man3/qasciicache.3qt b/doc/man/man3/qasciicache.3qt index fbfaa9163..0d05a0d95 100644 --- a/doc/man/man3/qasciicache.3qt +++ b/doc/man/man3/qasciicache.3qt @@ -151,7 +151,7 @@ See also maxCost() and totalCost(). .SH "uint QAsciiCache::size () const" Returns the size of the hash array used to implement the cache. This should be a bit bigger than count() is likely to be. .SH "void QAsciiCache::statistics () const" -A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library. .SH "type * QAsciiCache::take ( const char * k )" Takes the item associated with \fIk\fR out of the cache without deleting it and returns a pointer to the item taken out, or 0 if the key does not exist in the cache. .PP diff --git a/doc/man/man3/qasciidict.3qt b/doc/man/man3/qasciidict.3qt index 53b21f3ff..1298d4736 100644 --- a/doc/man/man3/qasciidict.3qt +++ b/doc/man/man3/qasciidict.3qt @@ -275,7 +275,7 @@ Returns the size of the internal hash array (as specified in the constructor). .PP See also count(). .SH "void QAsciiDict::statistics () const" -Debugging-only function that prints out the dictionary distribution using qDebug(). +Debugging-only function that prints out the dictionary distribution using tqDebug(). .SH "type * QAsciiDict::take ( const char * key )" Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled). .PP diff --git a/doc/man/man3/qbytearray.3qt b/doc/man/man3/qbytearray.3qt index 071b0ee79..030f5e2ed 100644 --- a/doc/man/man3/qbytearray.3qt +++ b/doc/man/man3/qbytearray.3qt @@ -53,11 +53,11 @@ Constructs an empty QByteArray. .SH "QByteArray::QByteArray ( int size )" Constructs a QByteArray of size \fIsize\fR. .SH RELATED FUNCTION DOCUMENTATION -.SH "QByteArray qCompress ( const QByteArray & data )" +.SH "QByteArray tqCompress ( const QByteArray & data )" Compresses the array \fIdata\fR and returns the compressed byte array using zlib. .PP See also tqUncompress(). -.SH "QByteArray qCompress ( const uchar * data, int nbytes )" +.SH "QByteArray tqCompress ( const uchar * data, int nbytes )" This is an overloaded member function, provided for convenience. It behaves essentially like the above function. .PP Compresses the array \fIdata\fR which is \fInbytes\fR long and returns the compressed byte array. @@ -66,7 +66,7 @@ Uncompresses the array \fIdata\fR and returns the uncompressed byte array. .PP Returns an empty QByteArray if the input data was corrupt. .PP -See also qCompress(). +See also tqCompress(). .SH "QByteArray tqUncompress ( const uchar * data, int nbytes )" This is an overloaded member function, provided for convenience. It behaves essentially like the above function. .PP diff --git a/doc/man/man3/qcache.3qt b/doc/man/man3/qcache.3qt index 9b095088a..149ada958 100644 --- a/doc/man/man3/qcache.3qt +++ b/doc/man/man3/qcache.3qt @@ -175,7 +175,7 @@ See also maxCost() and totalCost(). .SH "uint QCache::size () const" Returns the size of the hash array used to implement the cache. This should be a bit bigger than count() is likely to be. .SH "void QCache::statistics () const" -A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library. .SH "type * QCache::take ( const QString & k )" Takes the item associated with \fIk\fR out of the cache without deleting it, and returns a pointer to the item taken out, or 0 if the key does not exist in the cache. .PP diff --git a/doc/man/man3/qcanvasview.3qt b/doc/man/man3/qcanvasview.3qt index bceebfec7..fb8580f4d 100644 --- a/doc/man/man3/qcanvasview.3qt +++ b/doc/man/man3/qcanvasview.3qt @@ -68,7 +68,7 @@ If you want users to be able to interact with a canvas view, subclass QCanvasVie .br if ( (*it)->rtti() == QCanvasRectangle::RTTI ) .br - qDebug("A QCanvasRectangle lies somewhere at this point"); + tqDebug("A QCanvasRectangle lies somewhere at this point"); .br } .br diff --git a/doc/man/man3/qclipboard.3qt b/doc/man/man3/qclipboard.3qt index 0a157703e..b8480ac87 100644 --- a/doc/man/man3/qclipboard.3qt +++ b/doc/man/man3/qclipboard.3qt @@ -125,7 +125,7 @@ Example: .br if ( !text.isNull() ) .br - qDebug( "The clipboard contains: " + text ); + tqDebug( "The clipboard contains: " + text ); .br .br // Copy text into the clipboard diff --git a/doc/man/man3/qcstring.3qt b/doc/man/man3/qcstring.3qt index 2b291cfb9..c6194e4fc 100644 --- a/doc/man/man3/qcstring.3qt +++ b/doc/man/man3/qcstring.3qt @@ -1041,7 +1041,7 @@ See also Note on character comparisons. Reads a string into \fIstr\fR from the stream \fIs\fR. .PP See also Format of the QDataStream operators. -.SH "void * qmemmove ( void * dst, const void * src, uint len )" +.SH "void * tqmemmove ( void * dst, const void * src, uint len )" This function is normally part of the C library. Qt implements memmove() for platforms that do not provide it. .PP memmove() copies \fIlen\fR bytes from \fIsrc\fR into \fIdst\fR. The data is copied correctly even if \fIsrc\fR and \fIdst\fR overlap. @@ -1054,18 +1054,18 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0. .PP Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both). .PP -See also tqstrncmp(), qstricmp(), qstrnicmp(), and Note on character comparisons. +See also tqstrncmp(), tqstricmp(), tqstrnicmp(), and Note on character comparisons. .SH "char * qstrcpy ( char * dst, const char * src )" A safe strcpy() function. .PP Copies all characters up to and including the '\0' from \fIsrc\fR into \fIdst\fR and returns a pointer to \fIdst\fR. -.SH "char * qstrdup ( const char * src )" +.SH "char * tqstrdup ( const char * src )" Returns a duplicate string. .PP Allocates space for a copy of \fIsrc\fR, copies it, and returns a pointer to the copy. If \fIsrc\fR is 0, it immediately returns 0. .PP The returned string must be deleted using \fCdelete[]\fR. -.SH "int qstricmp ( const char * str1, const char * str2 )" +.SH "int tqstricmp ( const char * str1, const char * str2 )" A safe stricmp() function. .PP Compares \fIstr1\fR and \fIstr2\fR ignoring the case. @@ -1076,7 +1076,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0. .PP Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both). .PP -See also qstrcmp(), tqstrncmp(), qstrnicmp(), and Note on character comparisons. +See also qstrcmp(), tqstrncmp(), tqstrnicmp(), and Note on character comparisons. .SH "uint tqstrlen ( const char * str )" A safe strlen function. .PP @@ -1092,14 +1092,14 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0. .PP Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both). .PP -See also qstrcmp(), qstricmp(), qstrnicmp(), and Note on character comparisons. -.SH "char * qstrncpy ( char * dst, const char * src, uint len )" +See also qstrcmp(), tqstricmp(), tqstrnicmp(), and Note on character comparisons. +.SH "char * tqstrncpy ( char * dst, const char * src, uint len )" A safe strncpy() function. .PP Copies at most \fIlen\fR bytes from \fIsrc\fR (stopping at \fIlen\fR or the terminating '\0' whichever comes first) into \fIdst\fR and returns a pointer to \fIdst\fR. Guarantees that \fIdst\fR is '\0'-terminated. If \fIsrc\fR or \fIdst\fR is 0, returns 0 immediately. .PP See also qstrcpy(). -.SH "int qstrnicmp ( const char * str1, const char * str2, uint len )" +.SH "int tqstrnicmp ( const char * str1, const char * str2, uint len )" A safe strnicmp() function. .PP Compares at most \fIlen\fR bytes of \fIstr1\fR and \fIstr2\fR ignoring the case. @@ -1110,7 +1110,7 @@ Special case I: Returns 0 if \fIstr1\fR and \fIstr2\fR are both 0. .PP Special case II: Returns a random nonzero value if \fIstr1\fR is 0 or \fIstr2\fR is 0 (but not both). .PP -See also qstrcmp(), tqstrncmp(), qstricmp(), and Note on character comparisons. +See also qstrcmp(), tqstrncmp(), tqstricmp(), and Note on character comparisons. .SH "SEE ALSO" .BR http://doc.trolltech.com/ntqcstring.html diff --git a/doc/man/man3/qdatetime.3qt b/doc/man/man3/qdatetime.3qt index abab91950..c2ecc145d 100644 --- a/doc/man/man3/qdatetime.3qt +++ b/doc/man/man3/qdatetime.3qt @@ -219,7 +219,7 @@ Example: .br QDateTime xmas( QDate(dt.date().year(),12,24), QTime(17,00) ); .br - qDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); + tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); .br .fi .PP diff --git a/doc/man/man3/qdict.3qt b/doc/man/man3/qdict.3qt index 57e8231bb..c8f9a4c05 100644 --- a/doc/man/man3/qdict.3qt +++ b/doc/man/man3/qdict.3qt @@ -332,7 +332,7 @@ Returns the size of the internal hash array (as specified in the constructor). .PP See also count(). .SH "void QDict::statistics () const" -Debugging-only function that prints out the dictionary distribution using qDebug(). +Debugging-only function that prints out the dictionary distribution using tqDebug(). .SH "type * QDict::take ( const QString & key )" Takes the item with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled). .PP diff --git a/doc/man/man3/qdir.3qt b/doc/man/man3/qdir.3qt index bd8ccc31d..3ef6a07be 100644 --- a/doc/man/man3/qdir.3qt +++ b/doc/man/man3/qdir.3qt @@ -233,7 +233,7 @@ See if a directory exists. .br if ( !d.exists() ) .br - qWarning( "Cannot find the example directory" ); + tqWarning( "Cannot find the example directory" ); .br .fi .PP @@ -245,7 +245,7 @@ Traversing directories and reading a file. .br if ( !d.cd("tmp") ) { // "/tmp" .br - qWarning( "Cannot find the \\"/tmp\\" directory" ); + tqWarning( "Cannot find the \\"/tmp\\" directory" ); .br } else { .br @@ -253,7 +253,7 @@ Traversing directories and reading a file. .br if ( !f.open(IO_ReadWrite) ) .br - qWarning( "Cannot create the file %s", f.name() ); + tqWarning( "Cannot create the file %s", f.name() ); .br } .br @@ -615,7 +615,7 @@ Note: If the directory is a symbolic link to the root directory this function re .br if ( d.isRoot() ) .br - qWarning( "It is a root link" ); + tqWarning( "It is a root link" ); .br .fi .PP @@ -663,7 +663,7 @@ Example: .br if ( d1 != d2 ) .br - qDebug( "They differ" ); + tqDebug( "They differ" ); .br .fi .SH "QDir & QDir::operator= ( const QDir & d )" @@ -689,7 +689,7 @@ Example: .br if ( d1 == d2 ) .br - qDebug( "They're the same" ); + tqDebug( "They're the same" ); .br .fi .SH "QString QDir::operator[] ( int index ) const" diff --git a/doc/man/man3/qerrormessage.3qt b/doc/man/man3/qerrormessage.3qt index 182926dd9..4e5ce9e17 100644 --- a/doc/man/man3/qerrormessage.3qt +++ b/doc/man/man3/qerrormessage.3qt @@ -43,7 +43,7 @@ There are two ways to use this class: <ol type=1> .IP 1 For production applications. In this context the class can be used to display messages which you don't need the user to see more than once. To use QErrorMessage like this, you create the dialog in the usual way and call the message() slot, or connect signals to it. .IP 2 -For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a QErrorMessage that displays qDebug(), qWarning() and qFatal() messages. +For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a QErrorMessage that displays tqDebug(), tqWarning() and tqFatal() messages. .PP In both cases QErrorMessage will queue pending messages, and display them (or not) in order, as soon as the user presses Enter or clicks OK after seeing each message. .PP diff --git a/doc/man/man3/qfileinfo.3qt b/doc/man/man3/qfileinfo.3qt index 8fc19e0d5..5cf8195df 100644 --- a/doc/man/man3/qfileinfo.3qt +++ b/doc/man/man3/qfileinfo.3qt @@ -429,11 +429,11 @@ Example: .br if ( fi.permission( QFileInfo::WriteUser | QFileInfo::ReadGroup ) ) .br - qWarning( "I can change the file; my group can read the file" ); + tqWarning( "I can change the file; my group can read the file" ); .br if ( fi.permission( QFileInfo::WriteGroup | QFileInfo::WriteOther ) ) .br - qWarning( "The group or others can change the file" ); + tqWarning( "The group or others can change the file" ); .br .fi .PP diff --git a/doc/man/man3/qfontdatabase.3qt b/doc/man/man3/qfontdatabase.3qt index a13caf4b4..7582fa7d2 100644 --- a/doc/man/man3/qfontdatabase.3qt +++ b/doc/man/man3/qfontdatabase.3qt @@ -147,7 +147,7 @@ int main( int argc, char **argv ) .br QString family = *f; .br - qDebug( family ); + tqDebug( family ); .br QStringList styles = fdb.styles( family ); .br @@ -169,7 +169,7 @@ int main( int argc, char **argv ) .br dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; .br - qDebug( dstyle ); + tqDebug( dstyle ); .br } .br diff --git a/doc/man/man3/qftp.3qt b/doc/man/man3/qftp.3qt index cf35b1388..a1b5c450b 100644 --- a/doc/man/man3/qftp.3qt +++ b/doc/man/man3/qftp.3qt @@ -156,7 +156,7 @@ If you want to use QFtp with the QNetworkProtocol interface, you do not use it d .br .fi .PP -This code will only work if the QFtp class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with QFtp. +This code will only work if the QFtp class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with QFtp. .PP The rest of this descrption describes the direct interface to FTP. .PP diff --git a/doc/man/man3/qglformat.3qt b/doc/man/man3/qglformat.3qt index 30162f21f..6c61f0638 100644 --- a/doc/man/man3/qglformat.3qt +++ b/doc/man/man3/qglformat.3qt @@ -184,7 +184,7 @@ After the widget has been created, you can find out which of the requested featu .br if ( !w->format().hasOverlay() ) { .br - qFatal( "Cool hardware required" ); + tqFatal( "Cool hardware required" ); .br } .br @@ -239,11 +239,11 @@ This constructor makes it easy to specify a certain desired format in classes de .br if ( !format().stencil() ) .br - qWarning( "Could not get stencil buffer; results will be suboptimal" ); + tqWarning( "Could not get stencil buffer; results will be suboptimal" ); .br if ( !format().alphaChannel() ) .br - qWarning( "Could not get alpha channel; results will be suboptimal" ); + tqWarning( "Could not get alpha channel; results will be suboptimal" ); .br ... .br diff --git a/doc/man/man3/qguardedptr.3qt b/doc/man/man3/qguardedptr.3qt index 67de03a1c..11f362d4c 100644 --- a/doc/man/man3/qguardedptr.3qt +++ b/doc/man/man3/qguardedptr.3qt @@ -75,7 +75,7 @@ Example: .br else .br - qDebug("The label has been destroyed"); + tqDebug("The label has been destroyed"); .br .fi .PP diff --git a/doc/man/man3/qhttp.3qt b/doc/man/man3/qhttp.3qt index c73f499e1..0710e05e2 100644 --- a/doc/man/man3/qhttp.3qt +++ b/doc/man/man3/qhttp.3qt @@ -144,7 +144,7 @@ If you want to use QHttp with the QNetworkProtocol interface, you do not use it .br .fi .PP -This code will only work if the QHttp class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with HTTP. +This code will only work if the QHttp class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with HTTP. .PP The QNetworkProtocol interface for HTTP only supports the operations operationGet() and operationPut(), i.e. QUrlOperator::get() and QUrlOperator::put(), if you use it with a QUrlOperator. .PP diff --git a/doc/man/man3/qintcache.3qt b/doc/man/man3/qintcache.3qt index a5ca1ef18..b12feaed0 100644 --- a/doc/man/man3/qintcache.3qt +++ b/doc/man/man3/qintcache.3qt @@ -145,7 +145,7 @@ See also maxCost() and totalCost(). .SH "uint QIntCache::size () const" Returns the size of the hash array used to implement the cache. This should be a bit larger than count() is likely to be. .SH "void QIntCache::statistics () const" -A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using tqDebug(). This function does nothing in the release library. .SH "type * QIntCache::take ( long k )" Takes the item associated with \fIk\fR out of the cache without deleting it, and returns a pointer to the item taken out or 0 if the key does not exist in the cache. .PP diff --git a/doc/man/man3/qintdict.3qt b/doc/man/man3/qintdict.3qt index 77bf86491..355002cad 100644 --- a/doc/man/man3/qintdict.3qt +++ b/doc/man/man3/qintdict.3qt @@ -271,7 +271,7 @@ Returns the size of the internal hash array (as specified in the constructor). .PP See also count(). .SH "void QIntDict::statistics () const" -Debugging-only function that prints out the dictionary distribution using qDebug(). +Debugging-only function that prints out the dictionary distribution using tqDebug(). .SH "type * QIntDict::take ( long key )" Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled). .PP diff --git a/doc/man/man3/qlocalfs.3qt b/doc/man/man3/qlocalfs.3qt index 5a1640087..13ffcab91 100644 --- a/doc/man/man3/qlocalfs.3qt +++ b/doc/man/man3/qlocalfs.3qt @@ -32,7 +32,7 @@ This class is derived from QNetworkProtocol. QLocalFs is not normally used direc .br .fi .PP -This code will only work if the QLocalFs class is registered; to register the class, you must call qInitNetworkProtocols() before using a QUrlOperator with QLocalFs. +This code will only work if the QLocalFs class is registered; to register the class, you must call tqInitNetworkProtocols() before using a QUrlOperator with QLocalFs. .PP If you really need to use QLocalFs directly, don't forget to set its QUrlOperator with setUrl(). .PP diff --git a/doc/man/man3/qmemarray.3qt b/doc/man/man3/qmemarray.3qt index 1b6e68735..5a26651d0 100644 --- a/doc/man/man3/qmemarray.3qt +++ b/doc/man/man3/qmemarray.3qt @@ -203,12 +203,12 @@ Example: .br for ( int i = 0; i < a.size(); i++ ) .br - qDebug( "%d: %d", i, a[i] ); + tqDebug( "%d: %d", i, a[i] ); .br .br - qDebug( "1 is found %d times", a.contains(1) ); + tqDebug( "1 is found %d times", a.contains(1) ); .br - qDebug( "5 is found at index %d", a.find(5) ); + tqDebug( "5 is found at index %d", a.find(5) ); .br .br return 0; @@ -540,7 +540,7 @@ See also Format of the QDataStream operators. Reads a byte array into \fIa\fR from the stream \fIs\fR and returns a reference to the stream. .PP See also Format of the QDataStream operators. -.SH "Q_UINT16 qChecksum ( const char * data, uint len )" +.SH "Q_UINT16 tqChecksum ( const char * data, uint len )" Returns the CRC-16 checksum of \fIlen\fR bytes starting at \fIdata\fR. .PP The checksum is independent of the byte order (endianness). diff --git a/doc/man/man3/qobject.3qt b/doc/man/man3/qobject.3qt index f83c0ab16..e1e5e7a1b 100644 --- a/doc/man/man3/qobject.3qt +++ b/doc/man/man3/qobject.3qt @@ -555,7 +555,7 @@ Example: .br QKeyEvent *k = (QKeyEvent*)ev; .br - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); .br return TRUE; .br @@ -668,7 +668,7 @@ Here's a \fCKeyPressEater\fR class that eats the key presses of its monitored ob .br QKeyEvent *k = (QKeyEvent *)e; .br - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); .br return TRUE; // eat event .br @@ -903,7 +903,7 @@ Example: .br { .br - qDebug( "timer event, id %d", e->timerId() ); + tqDebug( "timer event, id %d", e->timerId() ); .br } .br @@ -945,11 +945,11 @@ You can find an object by name (and type) using child(). You can find a set of o .PP The object name is set by the constructor or by the setName() function. The object name is not very useful in the current version of Qt, but will become increasingly important in the future. .PP -If the object does not have a name, the name() function returns" unnamed", so printf() (used in qDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ). +If the object does not have a name, the name() function returns" unnamed", so printf() (used in tqDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ). .PP .nf .br - qDebug( "MyClass::setPrecision(): (%s) invalid precision %f", + tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f", .br name(), newPrecision ); .br diff --git a/doc/man/man3/qptrdict.3qt b/doc/man/man3/qptrdict.3qt index e4d220a95..4656bb15e 100644 --- a/doc/man/man3/qptrdict.3qt +++ b/doc/man/man3/qptrdict.3qt @@ -273,7 +273,7 @@ Returns the size of the internal hash table (as specified in the constructor). .PP See also count(). .SH "void QPtrDict::statistics () const" -Debugging-only function that prints out the dictionary distribution using qDebug(). +Debugging-only function that prints out the dictionary distribution using tqDebug(). .SH "type * QPtrDict::take ( void * key )" Takes the item associated with \fIkey\fR out of the dictionary without deleting it (even if auto-deletion is enabled). .PP diff --git a/doc/man/man3/qsqlcursor.3qt b/doc/man/man3/qsqlcursor.3qt index 4f73ae6a3..47df1a62d 100644 --- a/doc/man/man3/qsqlcursor.3qt +++ b/doc/man/man3/qsqlcursor.3qt @@ -193,7 +193,7 @@ For example: .br while ( cur.next() ) { .br - qDebug( cur.value( "id" ).toString() + ": " + + tqDebug( cur.value( "id" ).toString() + ": " + .br cur.value( "surname" ).toString() + " " + .br diff --git a/doc/man/man3/qsqlquery.3qt b/doc/man/man3/qsqlquery.3qt index b6c816cd3..07b22894e 100644 --- a/doc/man/man3/qsqlquery.3qt +++ b/doc/man/man3/qsqlquery.3qt @@ -358,7 +358,7 @@ The bound values can be examined in the following way: .br for ( it = vals.begin(); it != vals.end(); ++it ) .br - qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() ); + tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() ); .br ... .br @@ -373,7 +373,7 @@ The bound values can be examined in the following way: .br for ( it = list.begin(); it != list.end(); ++it ) .br - qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); + tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); .br ... .br diff --git a/doc/man/man3/qstring.3qt b/doc/man/man3/qstring.3qt index e93ca2523..1395b5fa5 100644 --- a/doc/man/man3/qstring.3qt +++ b/doc/man/man3/qstring.3qt @@ -770,7 +770,7 @@ The following example shows how we could create a 'status' string when processin .PP It is generally fine to use filenames and numbers as we have done in the example above. But note that using arg() to construct natural language sentences does not usually translate well into other languages because sentence structure and word order often differ between languages. .PP -If there is no place marker (\fC%1\fR, \fC%2\fR, etc.), a warning message (qWarning()) is output and the result is undefined. +If there is no place marker (\fC%1\fR, \fC%2\fR, etc.), a warning message (tqWarning()) is output and the result is undefined. .PP \fBWarning:\fR If any placeholder occurs more than once, the result is undefined. .SH "QString QString::arg ( long a, int fieldWidth = 0, int base = 10 ) const" diff --git a/doc/man/man3/qthread.3qt b/doc/man/man3/qthread.3qt index 01a83214d..69538e5c4 100644 --- a/doc/man/man3/qthread.3qt +++ b/doc/man/man3/qthread.3qt @@ -99,7 +99,7 @@ A QThread represents a separate thread of control within the program; it shares .br sleep( 1 ); .br - qDebug( "Ping!" ); + tqDebug( "Ping!" ); .br } .br diff --git a/doc/man/man3/qtime.3qt b/doc/man/man3/qtime.3qt index bae95d37f..b409e4089 100644 --- a/doc/man/man3/qtime.3qt +++ b/doc/man/man3/qtime.3qt @@ -293,7 +293,7 @@ Sets this time to the current time. This is practical for timing: .br some_lengthy_task(); .br - qDebug( "Time elapsed: %d ms", t.elapsed() ); + tqDebug( "Time elapsed: %d ms", t.elapsed() ); .br .fi .PP diff --git a/doc/man/man3/qurloperator.3qt b/doc/man/man3/qurloperator.3qt index c13a29c22..a38dc990f 100644 --- a/doc/man/man3/qurloperator.3qt +++ b/doc/man/man3/qurloperator.3qt @@ -149,7 +149,7 @@ If you want to be notified about success/failure, progress, etc., you can connec .PP The class uses the functionality of registered network protocols to perform these operations. Depending of the protocol of the URL, it uses an appropriate network protocol class for the operations. Each of the operation functions of QUrlOperator creates a QNetworkOperation object that describes the operation and puts it into the operation queue for the network protocol used. If no suitable protocol could be found (because no implementation of the necessary network protocol is registered), the URL operator emits errors. Not every protocol supports every operation, but error handling deals with this problem. .PP -To register the available network protocols, use the qInitNetworkProtocols() function. The protocols currently supported are: +To register the available network protocols, use the tqInitNetworkProtocols() function. The protocols currently supported are: .TP FTP, .TP @@ -348,7 +348,7 @@ See also copy(). .SH "void QUrlOperator::stop ()\fC [virtual]\fR" Stops the current network operation and removes all this QUrlOperator's waiting network operations. .SH RELATED FUNCTION DOCUMENTATION -.SH "void qInitNetworkProtocols ()" +.SH "void tqInitNetworkProtocols ()" This function registers the network protocols for FTP and HTTP. You must call this function before you use QUrlOperator for these protocols. .PP This function is declared in ntqnetwork.h. diff --git a/doc/man/man3/qvariant.3qt b/doc/man/man3/qvariant.3qt index 13103e0f9..cc1c0b38c 100644 --- a/doc/man/man3/qvariant.3qt +++ b/doc/man/man3/qvariant.3qt @@ -441,7 +441,7 @@ Here is some example code to demonstrate the use of QVariant: .br int z = v.toInt(); // z = 123 .br - qDebug("Type is %s", // prints "Type is int" + tqDebug("Type is %s", // prints "Type is int" .br v.typeName()); .br diff --git a/doc/network.doc b/doc/network.doc index f6b986d8e..a51a1eadd 100644 --- a/doc/network.doc +++ b/doc/network.doc @@ -148,9 +148,9 @@ void MyClass::slotOperationFinished( QNetworkOperation *op ) switch ( op->operation() ) { case QNetworkProtocol::OpMkDir: if ( op->state() == QNetworkProtocol::StFailed ) - qDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() ); + tqDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() ); else - qDebug( "Successfully created directory %s", op->arg( 0 ).latin1() ); + tqDebug( "Successfully created directory %s", op->arg( 0 ).latin1() ); break; // ... and so on } @@ -179,24 +179,24 @@ void MyClass::slotInsertEntries( const QValueList<QUrlInfo> &info, QNetworkOpera QValueList<QUrlInfo>::ConstIterator it = info.begin(); for ( ; it != info.end(); ++it ) { const QUrlInfo &inf = *it; - qDebug( "Name: %s, Size: %d, Last Modified: %s", + tqDebug( "Name: %s, Size: %d, Last Modified: %s", inf.name().latin1(), inf.size(), inf.lastModified().toString().latin1() ); } } void MyClass::slotStart( QNetworkOperation * ) { - qDebug( "Start reading '%s'", op.toString().latin1() ); + tqDebug( "Start reading '%s'", op.toString().latin1() ); } void MyClass::slotFinished( QNetworkOperation *operation ) { if ( operation->operation() == QNetworkProtocol::OpListChildren ) { if ( operation->state() == QNetworkProtocol::StFailed ) - qDebug( "Couldn't read '%s'! Following error occurred: %s", + tqDebug( "Couldn't read '%s'! Following error occurred: %s", op.toString().latin1(), operation->protocolDetail().latin1() ); else - qDebug( "Finished reading '%s'!", op.toString().latin1() ); + tqDebug( "Finished reading '%s'!", op.toString().latin1() ); } } diff --git a/doc/networking.doc b/doc/networking.doc index 99d3ceb2a..62b4a49af 100644 --- a/doc/networking.doc +++ b/doc/networking.doc @@ -68,7 +68,7 @@ must register them before you can use QUrlOperator. For example, put the following call in your \c main() function, after creating your QApplication object: \code - qInitNetworkProtocols(); + tqInitNetworkProtocols(); \endcode \section1 Network- and Protocol-Transparent Operations @@ -325,7 +325,7 @@ But, before we can use our new protocol, we have to register it first, so QUrlOp \skipto register \printline register -This registers Qip protocol and bonds it to prefix "qip". You can use qInitNetworkProtocols() which registers pre coded Ftp (for "ftp") and Http ("http") protocols. Local file system (QLocalFs) is always registered. +This registers Qip protocol and bonds it to prefix "qip". You can use tqInitNetworkProtocols() which registers pre coded Ftp (for "ftp") and Http ("http") protocols. Local file system (QLocalFs) is always registered. Client implementation (\c network/infoprotocol/infourlclient/client.cpp): diff --git a/doc/plugins-howto.doc b/doc/plugins-howto.doc index c9836686c..d006b1b06 100644 --- a/doc/plugins-howto.doc +++ b/doc/plugins-howto.doc @@ -83,7 +83,7 @@ run, Qt will first treat the application's executable directory as the Files\MyApp} and has a style plugin, Qt will look in \c{C:\Program Files\MyApp\styles}. (See \l{QApplication::applicationDirPath()} for how to find out where the application's executable is.) Qt will also -look in the directory given by \c{qInstallPathPlugins()}. If you want +look in the directory given by \c{tqInstallPathPlugins()}. If you want Qt to look in additional places you can add as many paths as you need with calls to \c{QApplication::addLibraryPath()}. And if you want to set your own path or paths you can use diff --git a/doc/porting3.doc b/doc/porting3.doc index e7e4d5193..38209ed77 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -348,8 +348,8 @@ Additionally, these preprocessor directives have been removed: \i \c {#define strcpy qstrcpy} \i \c {#define strcmp qstrcmp} \i \c {#define strncmp tqstrncmp} -\i \c {#define stricmp qstricmp} -\i \c {#define strnicmp qstrnicmp} +\i \c {#define stricmp tqstricmp} +\i \c {#define strnicmp tqstrnicmp} \endlist See the changes-3.0.0 document for an explanation of why this had to be done. diff --git a/doc/qasciicache.doc b/doc/qasciicache.doc index 76fa5da92..cb9738c35 100644 --- a/doc/qasciicache.doc +++ b/doc/qasciicache.doc @@ -97,7 +97,7 @@ \internal - Do not use. A QAsciiCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version. */ @@ -139,7 +139,7 @@ \internal - Do not use. A QAsciiCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version. */ /*! @@ -292,7 +292,7 @@ \fn void QAsciiCache::statistics() const A debug-only utility function. Prints out cache usage, hit/miss, - and distribution information using qDebug(). This function does + and distribution information using tqDebug(). This function does nothing in the release library. */ diff --git a/doc/qasciidict.doc b/doc/qasciidict.doc index 789eb1af1..a62a65433 100644 --- a/doc/qasciidict.doc +++ b/doc/qasciidict.doc @@ -308,7 +308,7 @@ \fn void QAsciiDict::statistics() const Debugging-only function that prints out the dictionary - distribution using qDebug(). + distribution using tqDebug(). */ /*! diff --git a/doc/qcache.doc b/doc/qcache.doc index af9421118..72af738d3 100644 --- a/doc/qcache.doc +++ b/doc/qcache.doc @@ -98,7 +98,7 @@ \internal - Do not use. A QCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. */ @@ -136,7 +136,7 @@ \internal - Do not use. A QCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. */ /*! @@ -285,7 +285,7 @@ \fn void QCache::statistics() const A debug-only utility function. Prints out cache usage, hit/miss, - and distribution information using qDebug(). This function does + and distribution information using tqDebug(). This function does nothing in the release library. */ diff --git a/doc/qdict.doc b/doc/qdict.doc index c06549909..5f1892cb7 100644 --- a/doc/qdict.doc +++ b/doc/qdict.doc @@ -383,7 +383,7 @@ \fn void QDict::statistics() const Debugging-only function that prints out the dictionary - distribution using qDebug(). + distribution using tqDebug(). */ /*! diff --git a/doc/qintcache.doc b/doc/qintcache.doc index acda6c7ec..d27a844bb 100644 --- a/doc/qintcache.doc +++ b/doc/qintcache.doc @@ -91,7 +91,7 @@ \internal - Do not use. A QCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. */ /*! @@ -125,7 +125,7 @@ \internal - Do not use. A QIntCache cannot be copied. Calls qFatal() in debug version. + Do not use. A QIntCache cannot be copied. Calls tqFatal() in debug version. */ /*! @@ -273,7 +273,7 @@ \fn void QIntCache::statistics() const A debug-only utility function. Prints out cache usage, hit/miss, - and distribution information using qDebug(). This function does + and distribution information using tqDebug(). This function does nothing in the release library. */ diff --git a/doc/qintdict.doc b/doc/qintdict.doc index 6272d913b..6c8c3b265 100644 --- a/doc/qintdict.doc +++ b/doc/qintdict.doc @@ -287,7 +287,7 @@ \fn void QIntDict::statistics() const Debugging-only function that prints out the dictionary - distribution using qDebug(). + distribution using tqDebug(). */ /*! diff --git a/doc/qmemarray.doc b/doc/qmemarray.doc index 79fe4bb87..59a707037 100644 --- a/doc/qmemarray.doc +++ b/doc/qmemarray.doc @@ -96,10 +96,10 @@ { QMemArray<int> a = fib( 6 ); // get first 6 fibonaccis for ( int i = 0; i < a.size(); i++ ) - qDebug( "%d: %d", i, a[i] ); + tqDebug( "%d: %d", i, a[i] ); - qDebug( "1 is found %d times", a.contains(1) ); - qDebug( "5 is found at index %d", a.find(5) ); + tqDebug( "1 is found %d times", a.contains(1) ); + tqDebug( "5 is found at index %d", a.find(5) ); return 0; } diff --git a/doc/qptrdict.doc b/doc/qptrdict.doc index 60cc83612..769ba617f 100644 --- a/doc/qptrdict.doc +++ b/doc/qptrdict.doc @@ -292,7 +292,7 @@ \fn void QPtrDict::statistics() const Debugging-only function that prints out the dictionary - distribution using qDebug(). + distribution using tqDebug(). */ /*! diff --git a/doc/sql.doc b/doc/sql.doc index 43ebfdec2..c33ac2efd 100644 --- a/doc/sql.doc +++ b/doc/sql.doc @@ -453,7 +453,7 @@ retrieve data from it. \quotefile sql/overview/retrieve1/main.cpp \skipto if ( \printline if ( -\printuntil qDebug +\printuntil tqDebug \printline \printline \printline @@ -644,7 +644,7 @@ setValue() to ensure that the value used is the one we want. \quotefile sql/overview/extract/main.cpp \skipto QSqlCursor \printline QSqlCursor -\printuntil qDebug +\printuntil tqDebug \printline \caption From \l sql/overview/extract/main.cpp @@ -668,7 +668,7 @@ in the \c{ORDER BY} clause. Now we iterate through each matching record (if any). We retrieve the contents of the id, forename and surname fields and pass them on to -some processing function, in this example a simple qDebug() call. +some processing function, in this example a simple tqDebug() call. \target Manipulating_Records \section2 Manipulating Records diff --git a/doc/tutorial.doc b/doc/tutorial.doc index 5ed29990f..feee705e6 100644 --- a/doc/tutorial.doc +++ b/doc/tutorial.doc @@ -916,8 +916,8 @@ have set up the QLCDNumber to always display two digits, we want to limit the possible range of \c minVal and \c maxVal to 0..99 to avoid overflow of the QLCDNumber. (We could have allowed values down to -9 but chose not to.) If the arguments are illegal, we use Qt's -qWarning() function to issue a warning to the user and return -immediately. qWarning() is a printf-like function that by default +tqWarning() function to issue a warning to the user and return +immediately. tqWarning() is a printf-like function that by default sends its output to \c stderr. If you want, you can install your own handler function using \l ::qInstallMsgHandler(). diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp index 86405b51f..3c96ca4ac 100644 --- a/examples/canvas/canvas.cpp +++ b/examples/canvas/canvas.cpp @@ -732,7 +732,7 @@ void Main::addMesh() #ifndef QT_NO_PROGRESSDIALOG progress.setProgress( rows ); #endif - // qDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); + // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); } void Main::addRectangle() diff --git a/examples/canvas/makeimg.cpp b/examples/canvas/makeimg.cpp index acb90dbde..d8c4c1928 100644 --- a/examples/canvas/makeimg.cpp +++ b/examples/canvas/makeimg.cpp @@ -65,7 +65,7 @@ int main( int*, char**) #endif *img = img->smoothScale( w/2, h/2 ); - qDebug( "saving out.png"); + tqDebug( "saving out.png"); img->save( "out.png", "PNG" ); w = img->width(); diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp index 7716d771f..33227c9af 100644 --- a/examples/demo/opengl/glinfo_x11.cpp +++ b/examples/demo/opengl/glinfo_x11.cpp @@ -236,7 +236,7 @@ GLInfo::GLInfo() dpy = gl.x11Display(); if ( !dpy ) { - qWarning( "Error: unable to open display %s\n", displayName ); + tqWarning( "Error: unable to open display %s\n", displayName ); } numScreens = ScreenCount( dpy ); diff --git a/examples/demo/opengl/gltexobj.cpp b/examples/demo/opengl/gltexobj.cpp index 8a2a8c102..117917e38 100644 --- a/examples/demo/opengl/gltexobj.cpp +++ b/examples/demo/opengl/gltexobj.cpp @@ -100,7 +100,7 @@ void GLTexobj::initializeGL() TQImage tex1, tex2, buf; if ( !buf.load( "opengl/gllogo.bmp" ) ) { // Load first image from file - qWarning( "Could not read image file, using single-color instead." ); + tqWarning( "Could not read image file, using single-color instead." ); TQImage dummy( 128, 128, 32 ); dummy.fill( TQt::green.rgb() ); buf = dummy; @@ -108,7 +108,7 @@ void GLTexobj::initializeGL() tex1 = TQGLWidget::convertToGLFormat( buf ); // flipped 32bit RGBA if ( !buf.load( "opengl/qtlogo.bmp" ) ) { // Load first image from file - qWarning( "Could not read image file, using single-color instead." ); + tqWarning( "Could not read image file, using single-color instead." ); TQImage dummy( 128, 128, 32 ); dummy.fill( TQt::red.rgb() ); buf = dummy; diff --git a/examples/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp index 98442281f..1c735a9b6 100644 --- a/examples/fileiconview/qfileiconview.cpp +++ b/examples/fileiconview/qfileiconview.cpp @@ -471,7 +471,7 @@ TQtFileIconView::TQtFileIconView( const TQString &dir, TQWidget *parent, const c : TQIconView( parent, name ), viewDir( dir ), newFolderNum( 0 ) { if ( !iconFolderLockedLarge ) { - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); TQWMatrix m; m.scale( 0.6, 0.6 ); TQPixmap iconpix( folder_locked_icon ); diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp index f797dd013..f7f3593c5 100644 --- a/examples/iconview/main.cpp +++ b/examples/iconview/main.cpp @@ -27,18 +27,18 @@ public: public slots: void dropped( TQDropEvent *mime ) { - qDebug( "Dropped Mimesource %p into the view %p", mime, view ); - qDebug( " Formats:" ); + tqDebug( "Dropped Mimesource %p into the view %p", mime, view ); + tqDebug( " Formats:" ); int i = 0; const char *str = mime->format( i ); - qDebug( " %s", str ); + tqDebug( " %s", str ); while ( str ) { - qDebug( " %s", str ); + tqDebug( " %s", str ); str = mime->format( ++i ); } }; void moved() { - qDebug( "All selected items were moved to another widget" ); + tqDebug( "All selected items were moved to another widget" ); } protected: diff --git a/examples/life/main.cpp b/examples/life/main.cpp index 8b3a64dd5..61003a51c 100644 --- a/examples/life/main.cpp +++ b/examples/life/main.cpp @@ -13,7 +13,7 @@ void usage() { - qWarning( "Usage: life [-scale scale]" ); + tqWarning( "Usage: life [-scale scale]" ); } int main( int argc, char **argv ) diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp index fa6f83acb..e2b04e4a8 100644 --- a/examples/network/clientserver/server/server.cpp +++ b/examples/network/clientserver/server/server.cpp @@ -79,7 +79,7 @@ public: TQServerSocket( 4242, 1, parent ) { if ( !ok() ) { - qWarning("Failed to bind to port 4242"); + tqWarning("Failed to bind to port 4242"); exit(1); } } diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp index 827d5cdb4..28e0bd37a 100644 --- a/examples/network/httpd/httpd.cpp +++ b/examples/network/httpd/httpd.cpp @@ -27,7 +27,7 @@ public: TQServerSocket(8080,1,parent) { if ( !ok() ) { - qWarning("Failed to bind to port 8080"); + tqWarning("Failed to bind to port 8080"); exit( 1 ); } } diff --git a/examples/network/networkprotocol/main.cpp b/examples/network/networkprotocol/main.cpp index 5f9f7d33c..db00b6a98 100644 --- a/examples/network/networkprotocol/main.cpp +++ b/examples/network/networkprotocol/main.cpp @@ -17,7 +17,7 @@ int main( int argc, char **argv ) { TQApplication a( argc, argv ); - qInitNetworkProtocols(); + tqInitNetworkProtocols(); TQNetworkProtocol::registerNetworkProtocol( "nntp", new TQNetworkProtocolFactory<Nntp> ); View v; diff --git a/examples/opengl/box/main.cpp b/examples/opengl/box/main.cpp index c91fadf52..52521c845 100644 --- a/examples/opengl/box/main.cpp +++ b/examples/opengl/box/main.cpp @@ -30,7 +30,7 @@ int main( int argc, char **argv ) TQApplication a(argc,argv); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp index 74eba96c2..0ceb2f6cb 100644 --- a/examples/opengl/gear/gear.cpp +++ b/examples/opengl/gear/gear.cpp @@ -278,7 +278,7 @@ int main( int argc, char **argv ) TQApplication a( argc, argv ); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp index 59b6c244c..3f59ecd18 100644 --- a/examples/opengl/glpixmap/globjwin.cpp +++ b/examples/opengl/glpixmap/globjwin.cpp @@ -180,7 +180,7 @@ void GLObjectWindow::drawOnPixmap( TQPixmap* pm ) // Draw some text on the pixmap to differentiate it from the GL window if ( pm->isNull() ) { - qWarning("Cannot draw on null pixmap"); + tqWarning("Cannot draw on null pixmap"); return; } else { diff --git a/examples/opengl/glpixmap/main.cpp b/examples/opengl/glpixmap/main.cpp index b8f735582..67d1c77d5 100644 --- a/examples/opengl/glpixmap/main.cpp +++ b/examples/opengl/glpixmap/main.cpp @@ -30,7 +30,7 @@ int main( int argc, char **argv ) TQApplication a(argc,argv); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp index 22e367b4d..3a56a5fe3 100644 --- a/examples/opengl/overlay/main.cpp +++ b/examples/opengl/overlay/main.cpp @@ -31,7 +31,7 @@ int main( int argc, char **argv ) TQApplication a(argc,argv); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/opengl/overlay_x11/gearwidget.cpp b/examples/opengl/overlay_x11/gearwidget.cpp index 4d717f27e..e9a00c0ae 100644 --- a/examples/opengl/overlay_x11/gearwidget.cpp +++ b/examples/opengl/overlay_x11/gearwidget.cpp @@ -250,7 +250,7 @@ void GearWidget::resizeGL( int width, int height ) void GearWidget::paintGL() { - qDebug( "GearWidget: Doing GL rendering." ); + tqDebug( "GearWidget: Doing GL rendering." ); #if defined (Q_GLX) static bool doneIt = FALSE; if ( !doneIt ) { @@ -259,7 +259,7 @@ void GearWidget::paintGL() // simpler in future versions of TQt! XWindowAttributes a; XGetWindowAttributes( x11Display(), winId(), &a ); - qDebug( "TQGLWidget: using Visual ID: 0x%x.", + tqDebug( "TQGLWidget: using Visual ID: 0x%x.", (int)XVisualIDFromVisual( a.visual ) ); } #endif diff --git a/examples/opengl/overlay_x11/main.cpp b/examples/opengl/overlay_x11/main.cpp index 45d3a0ea4..c8a5dfba5 100644 --- a/examples/opengl/overlay_x11/main.cpp +++ b/examples/opengl/overlay_x11/main.cpp @@ -36,7 +36,7 @@ TQColor findOverlayTransparentColor() appVisual = (Visual*)TQPaintDevice::x11AppVisual(); #endif - qDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) ); + tqDebug( "Default Visual ID: 0x%x", (int)XVisualIDFromVisual(appVisual) ); typedef struct OverlayProp { long visual; @@ -80,11 +80,11 @@ TQColor findOverlayTransparentColor() return TQColor( tqRgb( 1, 2, 3 ), overlayProp[i].value ); } - qWarning( "Default visual is not in overlay plane" ); + tqWarning( "Default visual is not in overlay plane" ); return invalidColor; #else // defined(Q_WS_X11) - qWarning( "Wrong window system - Only X11 has overlay support." ); + tqWarning( "Wrong window system - Only X11 has overlay support." ); return invalidColor; #endif } @@ -96,13 +96,13 @@ int main( int argc, char **argv ) TQApplication a( argc, argv ); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } TQColor transparentColor = findOverlayTransparentColor(); if ( !transparentColor.isValid() ) { - qWarning( "Failed to get transparent color for overlay. Exiting." ); + tqWarning( "Failed to get transparent color for overlay. Exiting." ); return -1; } diff --git a/examples/opengl/sharedbox/glbox.cpp b/examples/opengl/sharedbox/glbox.cpp index f3ded8888..76163a712 100644 --- a/examples/opengl/sharedbox/glbox.cpp +++ b/examples/opengl/sharedbox/glbox.cpp @@ -57,18 +57,18 @@ void GLBox::initializeGL() sharedDisplayList = makeObject(); // Make one object = sharedDisplayList; // Use it sharedListUsers++; // Keep reference count - qDebug( "GLBox %s created shared display list.", name() ); + tqDebug( "GLBox %s created shared display list.", name() ); } else { // There is a shared diplay list if ( isSharing() ) { // Can we access it? object = sharedDisplayList; // Yes, use it sharedListUsers++; // Keep reference count - qDebug( "GLBox %s uses shared display list.", name() ); + tqDebug( "GLBox %s uses shared display list.", name() ); } else { localDisplayList = makeObject(); // No, roll our own object = localDisplayList; // and use that - qDebug( "GLBox %s uses private display list.", name() ); + tqDebug( "GLBox %s uses private display list.", name() ); } } } @@ -84,14 +84,14 @@ GLBox::~GLBox() makeCurrent(); // We're going to do gl calls if ( localDisplayList != 0 ) { // Did we make our own? glDeleteLists( localDisplayList, 1 ); // Yes, delete it - qDebug( "GLBox %s deleted private display list.", name() ); + tqDebug( "GLBox %s deleted private display list.", name() ); } else { sharedListUsers--; // No, we used the shared one; keep refcount if ( sharedListUsers == 0 ) { // Any sharers left? glDeleteLists( sharedDisplayList, 1 ); // No, delete it sharedDisplayList = 0; - qDebug( "GLBox %s deleted shared display list.", name() ); + tqDebug( "GLBox %s deleted shared display list.", name() ); } } } diff --git a/examples/opengl/sharedbox/main.cpp b/examples/opengl/sharedbox/main.cpp index b8f735582..67d1c77d5 100644 --- a/examples/opengl/sharedbox/main.cpp +++ b/examples/opengl/sharedbox/main.cpp @@ -30,7 +30,7 @@ int main( int argc, char **argv ) TQApplication a(argc,argv); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/opengl/texture/gltexobj.cpp b/examples/opengl/texture/gltexobj.cpp index fc77eaa5a..973cd4d53 100644 --- a/examples/opengl/texture/gltexobj.cpp +++ b/examples/opengl/texture/gltexobj.cpp @@ -109,7 +109,7 @@ void GLTexobj::initializeGL() TQImage tex1, tex2, buf; if ( !buf.load( "gllogo.bmp" ) ) { // Load first image from file - qWarning( "Could not read image file, using single-color instead." ); + tqWarning( "Could not read image file, using single-color instead." ); TQImage dummy( 128, 128, 32 ); dummy.fill( TQt::green.rgb() ); buf = dummy; @@ -117,7 +117,7 @@ void GLTexobj::initializeGL() tex1 = TQGLWidget::convertToGLFormat( buf ); // flipped 32bit RGBA if ( !buf.load( "qtlogo.bmp" ) ) { // Load first image from file - qWarning( "Could not read image file, using single-color instead." ); + tqWarning( "Could not read image file, using single-color instead." ); TQImage dummy( 128, 128, 32 ); dummy.fill( TQt::red.rgb() ); buf = dummy; diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp index 51c48ea7c..35b97f368 100644 --- a/examples/opengl/texture/main.cpp +++ b/examples/opengl/texture/main.cpp @@ -28,7 +28,7 @@ int main( int argc, char **argv ) TQApplication a(argc,argv); if ( !TQGLFormat::hasOpenGL() ) { - qWarning( "This system has no OpenGL support. Exiting." ); + tqWarning( "This system has no OpenGL support. Exiting." ); return -1; } diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp index 3ed6beee9..d12867e37 100644 --- a/examples/progress/progress.cpp +++ b/examples/progress/progress.cpp @@ -272,7 +272,7 @@ private: { if ( timer_driven ) { if ( pb ) { - qWarning("This cannot happen!"); + tqWarning("This cannot happen!"); return; } rects = n; diff --git a/examples/qdir/qdir.cpp b/examples/qdir/qdir.cpp index 1902d9e73..1f13f72fe 100644 --- a/examples/qdir/qdir.cpp +++ b/examples/qdir/qdir.cpp @@ -307,7 +307,7 @@ int main( int argc, char ** argv ) else if ( arg == "-custom" ) custom = TRUE; else if ( arg[0] == '-' ) { - qDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n" + tqDebug("Usage: qdir [-any | -dir | -custom] [-preview] [-default f] {-filter f} [caption ...]\n" " -any Get any filename, need not exist.\n" " -dir Return a directory rather than a file.\n" " -custom Opens a customized TQFileDialog with \n" diff --git a/examples/sql/blob/main.cpp b/examples/sql/blob/main.cpp index 524ecd9c8..9bb9ea0c4 100644 --- a/examples/sql/blob/main.cpp +++ b/examples/sql/blob/main.cpp @@ -29,52 +29,52 @@ int main( int argc, char ** argv ) db->setPassword( PASSWORD ); db->setHostName( HOST ); if ( !db->open() ) { - qWarning( db->lastError().databaseText() ); + tqWarning( db->lastError().databaseText() ); return 1; } if ( argc < 2 ) { - qWarning( "Usage: %s <filename>", argv[0] ); + tqWarning( "Usage: %s <filename>", argv[0] ); return 1; } // read a file which we want to insert into the database TQFile f( argv[1] ); if ( !f.open( IO_ReadOnly ) ) { - qWarning( "Unable to open data file '%s' - exiting", argv[1] ); + tqWarning( "Unable to open data file '%s' - exiting", argv[1] ); return 1; } TQByteArray binaryData = f.readAll(); - qWarning( "Data size: %d", binaryData.size() ); + tqWarning( "Data size: %d", binaryData.size() ); // create a table with a binary field TQSqlQuery q; if ( !q.exec( "CREATE TABLE blobexample ( id INT PRIMARY KEY, binfield LONGBLOB )" ) ) { - qWarning( "Unable to create table - exiting" ); + tqWarning( "Unable to create table - exiting" ); return 1; } // insert a BLOB into the table if ( !q.prepare( "INSERT INTO blobexample ( id, binfield ) VALUES ( ?, ? )" ) ) { - qWarning( "Unable to prepare query - exiting" ); + tqWarning( "Unable to prepare query - exiting" ); return 1; } q.bindValue( 0, 1 ); q.bindValue( 1, binaryData ); if ( !q.exec() ) { - qWarning( "Unable to execute prepared query - exiting" ); + tqWarning( "Unable to execute prepared query - exiting" ); return 1; } // read the BLOB back from the database if ( !q.exec( "SELECT id, binfield FROM blobexample" ) ) { - qWarning( "Unable to execute query - exiting" ); + tqWarning( "Unable to execute query - exiting" ); return 1; } - qWarning( "\nTQSqlQuery:" ); + tqWarning( "\nTQSqlQuery:" ); while ( q.next() ) { - qWarning( "BLOB id: %d", q.value( 0 ).toInt() ); - qWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() ); + tqWarning( "BLOB id: %d", q.value( 0 ).toInt() ); + tqWarning( "BLOB size: %d", q.value( 1 ).toByteArray().size() ); } // write another BLOB using TQSqlCursor @@ -83,23 +83,23 @@ int main( int argc, char ** argv ) r->setValue( "id", 2 ); r->setValue( "binfield", binaryData ); if ( !cur.insert() ) { - qWarning( "Unable to insert BLOB using TQSqlCursor - exiting" ); + tqWarning( "Unable to insert BLOB using TQSqlCursor - exiting" ); return 1; } // read the BLOBs back using TQSqlCursor if ( !cur.select() ) { - qWarning( "Unable retrieve blobexample table using TQSqlCursor - exiting" ); + tqWarning( "Unable retrieve blobexample table using TQSqlCursor - exiting" ); return 1; } - qWarning( "\nTQSqlCursor:" ); + tqWarning( "\nTQSqlCursor:" ); while ( cur.next() ) { - qWarning( "BLOB id: %d", cur.value( "id" ).toInt() ); - qWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() ); + tqWarning( "BLOB id: %d", cur.value( "id" ).toInt() ); + tqWarning( "BLOB size: %d", cur.value( "binfield" ).toByteArray().size() ); } if ( !q.exec( "DROP TABLE blobexample" ) ) { - qWarning( "Unable to drop table - exiting" ); + tqWarning( "Unable to drop table - exiting" ); return 1; } return 0; diff --git a/examples/sql/overview/connection.cpp b/examples/sql/overview/connection.cpp index ee49b1a2a..bb8654df1 100644 --- a/examples/sql/overview/connection.cpp +++ b/examples/sql/overview/connection.cpp @@ -18,7 +18,7 @@ bool createConnections() defaultDB->setPassword( DB_SALES_PASSWD ); defaultDB->setHostName( DB_SALES_HOST ); if ( ! defaultDB->open() ) { - qWarning( "Failed to open sales database: " + defaultDB->lastError().text() ); + tqWarning( "Failed to open sales database: " + defaultDB->lastError().text() ); return FALSE; } @@ -28,7 +28,7 @@ bool createConnections() oracle->setPassword( DB_ORDERS_PASSWD ); oracle->setHostName( DB_ORDERS_HOST ); if ( ! oracle->open() ) { - qWarning( "Failed to open orders database: " + oracle->lastError().text() ); + tqWarning( "Failed to open orders database: " + oracle->lastError().text() ); return FALSE; } diff --git a/examples/sql/overview/extract/main.cpp b/examples/sql/overview/extract/main.cpp index 8a6606d21..0c47911ce 100644 --- a/examples/sql/overview/extract/main.cpp +++ b/examples/sql/overview/extract/main.cpp @@ -33,7 +33,7 @@ int main( int argc, char *argv[] ) int id = cur.value( "id" ).toInt(); TQString name = cur.value( "forename" ).toString() + " " + cur.value( "surname" ).toString(); - qDebug( TQString::number( id ) + ": " + name ); + tqDebug( TQString::number( id ) + ": " + name ); } } diff --git a/examples/sql/overview/order1/main.cpp b/examples/sql/overview/order1/main.cpp index 89d7658de..8c2c48df3 100644 --- a/examples/sql/overview/order1/main.cpp +++ b/examples/sql/overview/order1/main.cpp @@ -22,7 +22,7 @@ int main( int argc, char *argv[] ) TQSqlIndex order = cur.index( fields ); cur.select( order ); while ( cur.next() ) { - qDebug( cur.value( "id" ).toString() + ": " + + tqDebug( cur.value( "id" ).toString() + ": " + cur.value( "surname" ).toString() + " " + cur.value( "forename" ).toString() ); } diff --git a/examples/sql/overview/order2/main.cpp b/examples/sql/overview/order2/main.cpp index 2dfba8315..09c36151b 100644 --- a/examples/sql/overview/order2/main.cpp +++ b/examples/sql/overview/order2/main.cpp @@ -24,7 +24,7 @@ int main( int argc, char *argv[] ) cur.setValue( "surname", "Bloggs" ); cur.select( filter, order ); while ( cur.next() ) { - qDebug( cur.value( "id" ).toString() + ": " + + tqDebug( cur.value( "id" ).toString() + ": " + cur.value( "surname" ).toString() + " " + cur.value( "forename" ).toString() ); } diff --git a/examples/sql/overview/retrieve1/main.cpp b/examples/sql/overview/retrieve1/main.cpp index 1b7e11778..768f870de 100644 --- a/examples/sql/overview/retrieve1/main.cpp +++ b/examples/sql/overview/retrieve1/main.cpp @@ -20,7 +20,7 @@ int main( int argc, char *argv[] ) TQSqlQuery query( "SELECT id, surname FROM staff" ); if ( query.isActive() ) { while ( query.next() ) { - qDebug( query.value(0).toString() + ": " + + tqDebug( query.value(0).toString() + ": " + query.value(1).toString() ); } } diff --git a/examples/sql/overview/retrieve2/main.cpp b/examples/sql/overview/retrieve2/main.cpp index ecb59296e..71079e5ee 100644 --- a/examples/sql/overview/retrieve2/main.cpp +++ b/examples/sql/overview/retrieve2/main.cpp @@ -20,7 +20,7 @@ int main( int argc, char *argv[] ) TQSqlCursor cur( "staff" ); // Specify the table/view name cur.select(); // We'll retrieve every record while ( cur.next() ) { - qDebug( cur.value( "id" ).toString() + ": " + + tqDebug( cur.value( "id" ).toString() + ": " + cur.value( "surname" ).toString() + " " + cur.value( "salary" ).toString() ); } diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp index 771b59e25..1f72181d7 100644 --- a/examples/tablet/tabletstats.cpp +++ b/examples/tablet/tabletstats.cpp @@ -89,11 +89,11 @@ void StatsCanvas::tabletEvent( TQTabletEvent *e ) e->accept(); switch( e->type() ) { case TQEvent::TabletPress: - qDebug( "Tablet Press" ); + tqDebug( "Tablet Press" ); mousePressed = TRUE; break; case TQEvent::TabletRelease: - qDebug( "Tablet Release" ); + tqDebug( "Tablet Release" ); mousePressed = FALSE; clearScreen(); break; @@ -115,7 +115,7 @@ void StatsCanvas::tabletEvent( TQTabletEvent *e ) void StatsCanvas::mouseMoveEvent( TQMouseEvent *e ) { - qDebug( "Mouse Move" ); + tqDebug( "Mouse Move" ); // do nothing TQWidget::mouseMoveEvent( e ); } @@ -123,13 +123,13 @@ void StatsCanvas::mouseMoveEvent( TQMouseEvent *e ) void StatsCanvas::mousePressEvent( TQMouseEvent *e ) { - qDebug( "Mouse Press" ); + tqDebug( "Mouse Press" ); TQWidget::mousePressEvent( e ); } void StatsCanvas::mouseReleaseEvent( TQMouseEvent *e ) { - qDebug( "Mouse Release" ); + tqDebug( "Mouse Release" ); TQWidget::mouseReleaseEvent( e ); } diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp index d31baf3dc..a7704805c 100644 --- a/examples/thread/semaphores/main.cpp +++ b/examples/thread/semaphores/main.cpp @@ -255,7 +255,7 @@ void SemaphoreExample::customEvent(TQCustomEvent *event) { default: { - qWarning("Unknown custom event type: %d", event->type()); + tqWarning("Unknown custom event type: %d", event->type()); } } } diff --git a/examples/tictac/main.cpp b/examples/tictac/main.cpp index bfd4035d3..5ea8e1a36 100644 --- a/examples/tictac/main.cpp +++ b/examples/tictac/main.cpp @@ -19,7 +19,7 @@ int main( int argc, char **argv ) if ( argc == 2 ) // get board size n n = atoi(argv[1]); if ( n < 3 || n > 10 ) { // out of range - qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] ); + tqWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] ); return 1; } TicTacToe ttt( n ); // create game diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp index 8a1f5d69c..6ef91f65c 100644 --- a/examples/widgets/widgets.cpp +++ b/examples/widgets/widgets.cpp @@ -714,21 +714,21 @@ void WidgetView::dummy() void WidgetView::selectionChanged() { - //qDebug("selectionChanged"); + //tqDebug("selectionChanged"); } void WidgetView::selectionChanged( TQListViewItem* /*item*/) { - //qDebug("selectionChanged %p", item ); + //tqDebug("selectionChanged %p", item ); } void WidgetView::clicked( TQListViewItem* /*item*/ ) { - //qDebug("clicked %p", item ); + //tqDebug("clicked %p", item ); } void WidgetView::mySelectionChanged( TQListViewItem* /*item*/ ) { - //qDebug("mySelectionChanged %p", item ); + //tqDebug("mySelectionChanged %p", item ); } void WidgetView::showProperties() @@ -747,5 +747,5 @@ void WidgetView::showProperties() p->writable() ? "write" : "only", p->type() ); output += tmp; } - qDebug( output ); + tqDebug( output ); } diff --git a/extensions/nsplugin/examples/grapher/grapher.cpp b/extensions/nsplugin/examples/grapher/grapher.cpp index c02a3c6ca..d1a4239a0 100644 --- a/extensions/nsplugin/examples/grapher/grapher.cpp +++ b/extensions/nsplugin/examples/grapher/grapher.cpp @@ -159,7 +159,7 @@ void Graph::timerEvent(TQTimerEvent*) void Graph::setStyle(const char* stext) { for ( Style s = Pie; styleName[s]; s = Style(s+1) ) { - if ( qstricmp(stext,styleName[s])==0 ) { + if ( tqstricmp(stext,styleName[s])==0 ) { setStyle(s); return; } diff --git a/extensions/nsplugin/src/qnp.cpp b/extensions/nsplugin/src/qnp.cpp index 108223fa3..d60bc8f4e 100644 --- a/extensions/nsplugin/src/qnp.cpp +++ b/extensions/nsplugin/src/qnp.cpp @@ -800,7 +800,7 @@ TQNPWidget::TQNPWidget() : pi(next_pi) { if (!next_pi) { - qFatal("TQNPWidget must only be created within call to newWindow"); + tqFatal("TQNPWidget must only be created within call to newWindow"); } next_pi->widget = this; next_pi = 0; @@ -942,7 +942,7 @@ TQNPInstance::TQNPInstance() : pi(next_pi) { if (!next_pi) { - qFatal("TQNPInstance must only be created within call to newInstance"); + tqFatal("TQNPInstance must only be created within call to newInstance"); } next_pi->instance = this; next_pi = 0; @@ -1207,7 +1207,7 @@ const char* TQNPInstance::arg(const char* name) const { for (int i=0; i<pi->argc; i++) { // SGML: names are case insensitive - if ( qstricmp( name, pi->argn[i] ) == 0 ) { + if ( tqstricmp( name, pi->argn[i] ) == 0 ) { if (pi->argv[i].isEmpty()) return ""; else @@ -1558,7 +1558,7 @@ void* TQNPlugin::getJavaClass() */ void TQNPlugin::unuseJavaClass() { - qFatal("TQNPlugin::unuseJavaClass() must be overridden along with getJavaClass()"); + tqFatal("TQNPlugin::unuseJavaClass() must be overridden along with getJavaClass()"); } /*! @@ -1625,7 +1625,7 @@ bool TQNPXt::redeliverEvent( XEvent *event ) { // redeliver the event to Xt, NOT through TQt if ( static_d->dispatchers[ event->type ]( event ) ) { - // qDebug( "Xt: redelivered event" ); + // tqDebug( "Xt: redelivered event" ); return TRUE; } return FALSE; @@ -1709,11 +1709,11 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) if ( w ) { if ( !grabbed && ( event->type == XFocusIn && event->xfocus.mode == NotifyGrab ) ) { - // qDebug( "Xt: grab started" ); + // tqDebug( "Xt: grab started" ); grabbed = TRUE; } else if ( grabbed && ( event->type == XFocusOut && event->xfocus.mode == NotifyUngrab ) ) { - // qDebug( "Xt: grab ended" ); + // tqDebug( "Xt: grab ended" ); grabbed = FALSE; } } @@ -1760,7 +1760,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) qnpxt_keep_alive(); if ( delivered ) { - // qDebug( "TQt: delivered event" ); + // tqDebug( "TQt: delivered event" ); return True; } @@ -1775,7 +1775,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) case EnterNotify: case LeaveNotify: case ClientMessage: - // qDebug( "TQt: active popup - discarding event" ); + // tqDebug( "TQt: active popup - discarding event" ); return True; default: @@ -1787,7 +1787,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) if ( qnpxt ) { // send event through TQt modality handling... if ( !qt_try_modal( qnpxt, event ) ) { - // qDebug( "TQt: active modal widget discarded event" ); + // tqDebug( "TQt: active modal widget discarded event" ); return True; } } else if ( !grabbed ) { @@ -1814,7 +1814,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) case EnterNotify: case LeaveNotify: case ClientMessage: - // qDebug( "TQt: active modal widget discarded unknown event" ); + // tqDebug( "TQt: active modal widget discarded unknown event" ); return True; default: break; @@ -1824,7 +1824,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) } if ( static_d->dispatchers[ event->type ]( event ) ) { - // qDebug( "Xt: delivered event" ); + // tqDebug( "Xt: delivered event" ); // Xt handled the event. return True; } @@ -1839,7 +1839,7 @@ TQNPXt::TQNPXt( const char *applicationClass, XtAppContext context, { #if defined(QT_CHECK_STATE) if ( static_d ) - qWarning( "TQNPXt: should only have one TQNPXt instance!" ); + tqWarning( "TQNPXt: should only have one TQNPXt instance!" ); #endif d = static_d = new TQNPXtPrivate; @@ -1966,7 +1966,7 @@ void TQNPXt::registerSocketNotifier( TQSocketNotifier *notifier ) break; default: - qWarning( "TQNPXtEventLoop: socket notifier has invalid type" ); + tqWarning( "TQNPXtEventLoop: socket notifier has invalid type" ); return; } @@ -1985,7 +1985,7 @@ void TQNPXt::unregisterSocketNotifier( TQSocketNotifier *notifier ) ++it; if ( ! it.current() ) { // this shouldn't happen - qWarning( "TQNPXtEventLoop: failed to unregister socket notifier" ); + tqWarning( "TQNPXtEventLoop: failed to unregister socket notifier" ); return; } diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp index fe27f8091..b40debbe7 100644 --- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -164,7 +164,7 @@ TQRect TQAccessibleWidget::rect( int control ) const { #if defined(QT_DEBUG) if ( control ) - qWarning( "TQAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); + tqWarning( "TQAccessibleWidget::rect: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); #else Q_UNUSED(control) #endif @@ -179,7 +179,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const { #if defined(QT_DEBUG) if ( startControl ) - qWarning( "TQAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() ); + tqWarning( "TQAccessibleWidget::navigate: This implementation does not support subelements! (ID %d unknown for %s)", startControl, widget()->className() ); #else Q_UNUSED(startControl); #endif @@ -249,7 +249,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const return ( index != -1 ) ? index+1 : -1; } default: - qWarning( "TQAccessibleWidget::navigate: unhandled request" ); + tqWarning( "TQAccessibleWidget::navigate: unhandled request" ); break; }; return -1; @@ -297,7 +297,7 @@ bool TQAccessibleWidget::doDefaultAction( int control ) { #if defined(QT_DEBUG) if ( control ) - qWarning( "TQAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); + tqWarning( "TQAccessibleWidget::doDefaultAction: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); #else Q_UNUSED(control) #endif @@ -407,7 +407,7 @@ bool TQAccessibleWidget::setFocus( int control ) { #if defined(QT_DEBUG) if ( control ) - qWarning( "TQAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); + tqWarning( "TQAccessibleWidget::setFocus: This implementation does not support subelements! (ID %d unknown for %s)", control, widget()->className() ); #else Q_UNUSED(control) #endif @@ -422,7 +422,7 @@ bool TQAccessibleWidget::setFocus( int control ) bool TQAccessibleWidget::setSelected( int, bool, bool ) { #if defined(QT_DEBUG) - qWarning( "TQAccessibleWidget::setSelected: This function not supported for simple widgets." ); + tqWarning( "TQAccessibleWidget::setSelected: This function not supported for simple widgets." ); #endif return FALSE; } @@ -431,7 +431,7 @@ bool TQAccessibleWidget::setSelected( int, bool, bool ) void TQAccessibleWidget::clearSelection() { #if defined(QT_DEBUG) - qWarning( "TQAccessibleWidget::clearSelection: This function not supported for simple widgets." ); + tqWarning( "TQAccessibleWidget::clearSelection: This function not supported for simple widgets." ); #endif } diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index 5e8d36cc0..a721d9739 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -306,7 +306,7 @@ void TQMultiInputContext::changeInputMethod( TQString key ) currentIMKey = key; - //qDebug( "TQMultiInputContext::changeInputMethod(): index=%d, slave=%s", + //tqDebug( "TQMultiInputContext::changeInputMethod(): index=%d, slave=%s", // imIndex, (const char *)_slave->identifierName() ); } } diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp index b0cb94c11..e9b42c9ba 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp @@ -141,7 +141,7 @@ bool TQSimpleInputContext::filterEvent( const TQEvent *event ) // only one character. See description of // TQInputContext::filterEvent() about key compression. val = text[0].unicode(); - // qDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); + // tqDebug( "str = %s", (const char*)keyevent->text().local8Bit() ); } // Store value @@ -165,13 +165,13 @@ bool TQSimpleInputContext::filterEvent( const TQEvent *event ) void TQSimpleInputContext::setFocus() { - //qDebug( "TQSimpleInputContext: %p->setFocus(), focusWidget()=%p", + //tqDebug( "TQSimpleInputContext: %p->setFocus(), focusWidget()=%p", //this, focusWidget() ); } void TQSimpleInputContext::unsetFocus() { - //qDebug( "TQSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", + //tqDebug( "TQSimpleInputContext: %p->unsetFocus(), focusWidget()=%p", //this, focusWidget() ); reset(); } @@ -189,7 +189,7 @@ void TQSimpleInputContext::mouseHandler( int x, TQEvent::Type type, case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: case TQEvent::MouseMove: - // qDebug( "TQSimpleInputContext::mouseHandler: " + // tqDebug( "TQSimpleInputContext::mouseHandler: " // "x=%d, type=%d, button=%d, state=%d", x, type, button, state ); break; default: @@ -241,7 +241,7 @@ bool TQSimpleInputContext::checkComposeTable( uint* composeBuffer, const TQCompo // no entries were found if ( p == composeTable->data + composeTable->size ) { - // qDebug( "no match" ); + // tqDebug( "no match" ); clearComposeBuffer(); return FALSE; } @@ -251,18 +251,18 @@ bool TQSimpleInputContext::checkComposeTable( uint* composeBuffer, const TQCompo // check if partial match if ( composeBuffer[i] == 0 && p->keys[i] ) { - // qDebug("partial match"); + // tqDebug("partial match"); return TRUE; } if ( composeBuffer[i] != p->keys[i] ) { - // qDebug("different entry"); + // tqDebug("different entry"); clearComposeBuffer(); return i!=0; } } - // qDebug("match exactly"); + // tqDebug("match exactly"); // match exactly commitChar( p->value ); diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp index a184874bc..108a31e7a 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp @@ -86,7 +86,7 @@ extern "C" { XPointer /*client_data*/, XPointer /*call_data*/) { - // qDebug("xim_create_callback"); + // tqDebug("xim_create_callback"); TQXIMInputContext::create_xim(); } @@ -94,7 +94,7 @@ extern "C" { XPointer /*client_data*/, XPointer /*call_data*/) { - // qDebug("xim_destroy_callback"); + // tqDebug("xim_destroy_callback"); TQXIMInputContext::close_xim(); Display *dpy = TQPaintDevice::x11AppDisplay(); XRegisterIMInstantiateCallback(dpy, 0, 0, 0, @@ -170,7 +170,7 @@ extern "C" { TQXIMInputContext *qic = (TQXIMInputContext *) client_data; if (! qic) { #ifdef QT_XIM_DEBUG - qDebug("compose start: no qic"); + tqDebug("compose start: no qic"); #endif // QT_XIM_DEBUG return 0; @@ -180,7 +180,7 @@ extern "C" { qic->sendIMEvent( TQEvent::IMStart ); #ifdef QT_XIM_DEBUG - qDebug("compose start"); + tqDebug("compose start"); #endif // QT_XIM_DEBUG return 0; @@ -190,7 +190,7 @@ extern "C" { TQXIMInputContext *qic = (TQXIMInputContext *) client_data; if (! qic) { #ifdef QT_XIM_DEBUG - qDebug("compose event: invalid compose event %p", qic); + tqDebug("compose event: invalid compose event %p", qic); #endif // QT_XIM_DEBUG return 0; @@ -202,7 +202,7 @@ extern "C" { send_imstart = TRUE; } else if ( ! qic->isComposing() || ! qic->hasFocus() ) { #ifdef QT_XIM_DEBUG - qDebug( "compose event: invalid compose event composing=%d hasFocus=%d", + tqDebug( "compose event: invalid compose event composing=%d hasFocus=%d", qic->isComposing(), qic->hasFocus() ); #endif // QT_XIM_DEBUG @@ -221,7 +221,7 @@ extern "C" { ! drawstruct->chg_length && ! text ) { if( qic->composingText.isEmpty() ) { #ifdef QT_XIM_DEBUG - qDebug( "compose emptied" ); + tqDebug( "compose emptied" ); #endif // QT_XIM_DEBUG // if the composition string has been emptied, we need // to send an IMEnd event @@ -296,7 +296,7 @@ extern "C" { bool qt_compose_emptied = qic->composingText.isEmpty(); if ( qt_compose_emptied ) { #ifdef QT_XIM_DEBUG - qDebug( "compose emptied" ); + tqDebug( "compose emptied" ); #endif // QT_XIM_DEBUG // if the composition string has been emptied, we need // to send an IMEnd event @@ -356,12 +356,12 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget ) #if !defined(QT_NO_XIM) fontsetRefCount++; if (! qt_xim) { - qWarning("TQInputContext: no input method context available"); + tqWarning("TQInputContext: no input method context available"); return; } if (! widget->isTopLevel()) { - // qWarning("TQInputContext: cannot create input context for non-toplevel widgets"); + // tqWarning("TQInputContext: cannot create input context for non-toplevel widgets"); return; } @@ -420,7 +420,7 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget ) (char *) 0); if (! ic) - qFatal("Failed to create XIM input context!"); + tqFatal("Failed to create XIM input context!"); // when resetting the input context, preserve the input state (void) XSetICValues((XIC) ic, XNResetState, XIMPreserveState, (char *) 0); @@ -483,11 +483,11 @@ void TQXIMInputContext::init_xim() ximServerName = ""; if ( !XSupportsLocale() ) - qWarning("TQt: Locales not supported on X server"); + tqWarning("TQt: Locales not supported on X server"); #ifdef USE_X11R6_XIM else if ( XSetLocaleModifiers (ximServerName.ascii()) == 0 ) - qWarning( "TQt: Cannot set locale modifiers: %s", + tqWarning( "TQt: Cannot set locale modifiers: %s", ximServerName.ascii()); else { Display *dpy = TQPaintDevice::x11AppDisplay(); @@ -499,7 +499,7 @@ void TQXIMInputContext::init_xim() } #else // !USE_X11R6_XIM else if ( XSetLocaleModifiers ("") == 0 ) - qWarning("TQt: Cannot set locale modifiers"); + tqWarning("TQt: Cannot set locale modifiers"); else TQXIMInputContext::create_xim(); #endif // USE_X11R6_XIM @@ -522,7 +522,7 @@ void TQXIMInputContext::create_xim() destroy.callback = (XIMProc) xim_destroy_callback; destroy.client_data = 0; if ( XSetIMValues( qt_xim, XNDestroyCallback, &destroy, (char *) 0 ) != 0 ) - qWarning( "Xlib doesn't support destroy callback"); + tqWarning( "Xlib doesn't support destroy callback"); #endif // USE_X11R6_XIM XIMStyles *styles = 0; @@ -553,7 +553,7 @@ void TQXIMInputContext::create_xim() } } - // qDebug("TQApplication: using im style %lx", qt_xim_style); + // tqDebug("TQApplication: using im style %lx", qt_xim_style); XFree( (char *)styles ); } @@ -566,7 +566,7 @@ void TQXIMInputContext::create_xim() } else { // Give up - qWarning( "No supported input style found." + tqWarning( "No supported input style found." " See InputMethod documentation."); TQXIMInputContext::close_xim(); } @@ -714,7 +714,7 @@ void TQXIMInputContext::reset() #if !defined(QT_NO_XIM) if ( focusWidget() && isComposing() && ! composingText.isNull() ) { #ifdef QT_XIM_DEBUG - qDebug("TQXIMInputContext::reset: composing - sending IMEnd (empty) to %p", + tqDebug("TQXIMInputContext::reset: composing - sending IMEnd (empty) to %p", focusWidget() ); #endif // QT_XIM_DEBUG @@ -742,7 +742,7 @@ void TQXIMInputContext::resetClientState() void TQXIMInputContext::close( const TQString &errMsg ) { - qDebug( errMsg ); + tqDebug( errMsg ); emit deletionRequested(); } diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf index b300f0597..81e21d18d 100644 --- a/qmake/book/qmake-tutorial.leaf +++ b/qmake/book/qmake-tutorial.leaf @@ -193,7 +193,7 @@ processing. \section1 Checking for more than one condition -Suppose you use Windows and you want to be able to see the qDebug() +Suppose you use Windows and you want to be able to see the tqDebug() statements when you run your application on the command line. Unless you build your application with the console setting, you won't see the output. We can easily put \e console on the CONFIG line so that on diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp index 687116dfc..14853508a 100644 --- a/qmake/examples/precompile/myobject.cpp +++ b/qmake/examples/precompile/myobject.cpp @@ -10,5 +10,5 @@ MyObject::MyObject() MyObject::~MyObject() { - qDebug("MyObject::~MyObject()"); + tqDebug("MyObject::~MyObject()"); } diff --git a/qmake/examples/tutorial/hello.cpp b/qmake/examples/tutorial/hello.cpp index da01513b5..8ab5e5a5a 100644 --- a/qmake/examples/tutorial/hello.cpp +++ b/qmake/examples/tutorial/hello.cpp @@ -3,5 +3,5 @@ MyPushButton::MyPushButton( const TQString& text ) : TQPushButton( text, 0, "mypushbutton" ) { - qDebug( "My PushButton has been constructed" ); + tqDebug( "My PushButton has been constructed" ); } diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp index 00260f8e3..34bf35070 100644 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ b/qmake/generators/mac/metrowerks_xml.cpp @@ -70,7 +70,7 @@ MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t) } else if(project->first("TEMPLATE") == "subdirs") { writeHeader(t); - qDebug("Not supported!"); + tqDebug("Not supported!"); return TRUE; } return FALSE; @@ -641,9 +641,9 @@ MetrowerksMakefileGenerator::createFork(const TQString &f) if(FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &fileSpec, NULL) == noErr) FSpCreateResFile(&fileSpec, 'CUTE', 'TEXT', smSystemScript); else - qDebug("bogus %d", __LINE__); + tqDebug("bogus %d", __LINE__); } else - qDebug("bogus %d", __LINE__); + tqDebug("bogus %d", __LINE__); fclose(o); if(perms) chmod(f.latin1(), perms); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 798edc260..d988819a0 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1511,7 +1511,7 @@ UnixMakefileGenerator::pkgConfigPrefix() const { if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX")) return project->first("QMAKE_PKGCONFIG_PREFIX"); - return qInstallPath(); + return tqInstallPath(); } TQString diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 03653f40f..30543709c 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -481,15 +481,15 @@ bool VCCLCompilerTool::parseOption( const char* option ) switch ( first ) { case '?': case 'h': - qWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" ); + tqWarning( "Generator: Option '/?', '/help': MSVC.NET projects do not support outputting help info" ); found = FALSE; break; case '@': - qWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" ); + tqWarning( "Generator: Option '/@': MSVC.NET projects do not support the use of a response file" ); found = FALSE; break; case 'l': - qWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" ); + tqWarning( "Generator: Option '/link': qmake generator does not support passing link options through the compiler tool" ); found = FALSE; break; case 'A': @@ -585,7 +585,7 @@ bool VCCLCompilerTool::parseOption( const char* option ) switch ( second ) { case '3': case '4': - qWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" ); + tqWarning( "Option '/G3' and '/G4' were phased out in Visual C++ 5.0" ); found = FALSE; break; case '5': OptimizeForProcessor = procOptimizePentium; @@ -773,7 +773,7 @@ bool VCCLCompilerTool::parseOption( const char* option ) } else if ( second == 'P' ) { CompileAs = compileAsCPlusPlus; } else { - qWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" ); + tqWarning( "Generator: Options '/Tp<filename>' and '/Tc<filename>' are not supported by qmake" ); found = FALSE; break; } break; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 843d3aad7..b5148dfbc 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -395,7 +395,7 @@ void VcprojGenerator::writeSubDirs(TQTextStream &t) } } #ifdef DEBUG_SOLUTION_GEN - qDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() ); + tqDebug( "Deps for %20s: [%s]", newDep->target.latin1(), newDep->dependencies.join(" :: " ).latin1() ); #endif solution_cleanup.append(newDep); solution_depends.insert(newDep->target, newDep); @@ -1533,9 +1533,9 @@ void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList void VcprojGenerator::outputVariables() { #if 0 - qDebug( "Generator: MSVC.NET: List of current variables:" ); + tqDebug( "Generator: MSVC.NET: List of current variables:" ); for ( TQMap<TQString, TQStringList>::ConstIterator it = project->variables().begin(); it != project->variables().end(); ++it) { - qDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() ); + tqDebug( "Generator: MSVC.NET: %s => %s", it.key().latin1(), it.data().join(" | ").latin1() ); } #endif } diff --git a/qmake/main.cpp b/qmake/main.cpp index ac65f5ca8..ceb8e468c 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -54,7 +54,7 @@ #undef main #ifdef Q_OS_MAC // for qurl -bool qt_resolve_symlinks = FALSE; +bool tqt_resolve_symlinks = FALSE; #endif #if defined(Q_WS_WIN) diff --git a/qmake/project.cpp b/qmake/project.cpp index d905b089d..f60dba06a 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -90,19 +90,19 @@ TQStringList qmake_mkspec_paths() ret << (QT_INSTALL_PREFIX + concat); #endif #if defined(HAVE_QCONFIG_CPP) - ret << (qInstallPath() + concat); + ret << (tqInstallPath() + concat); #endif #ifdef QT_INSTALL_DATA ret << (QT_INSTALL_DATA + concat); #endif #if defined(HAVE_QCONFIG_CPP) - ret << (qInstallPathData() + concat); + ret << (tqInstallPathData() + concat); #endif /* prefer $QTDIR if it is set */ if (getenv("QTDIR")) ret << getenv("QTDIR"); - ret << qInstallPathData(); + ret << tqInstallPathData(); return ret; } @@ -931,13 +931,13 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt feature_roots << (QT_INSTALL_PREFIX + concat); #endif #if defined(HAVE_QCONFIG_CPP) - feature_roots << (qInstallPath() + concat); + feature_roots << (tqInstallPath() + concat); #endif #ifdef QT_INSTALL_DATA feature_roots << (QT_INSTALL_DATA + concat); #endif #if defined(HAVE_QCONFIG_CPP) - feature_roots << (qInstallPathData() + concat); + feature_roots << (tqInstallPathData() + concat); #endif for(TQStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) { TQString prf = (*it) + TQDir::separator() + file; diff --git a/qmake/property.cpp b/qmake/property.cpp index 846b45128..d7ce32f0f 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -82,13 +82,13 @@ TQMakeProperty::value(TQString v, bool just_check) #ifdef QT_INSTALL_PREFIX return QT_INSTALL_PREFIX; #elif defined(HAVE_QCONFIG_CPP) - return qInstallPath(); + return tqInstallPath(); #endif } else if(v == "QT_INSTALL_DATA") { #ifdef QT_INSTALL_DATA return QT_INSTALL_DATA; #elif defined(HAVE_QCONFIG_CPP) - return qInstallPathData(); + return tqInstallPathData(); #endif } else if(v == "QMAKE_MKSPECS") { return qmake_mkspec_paths().join(Option::target_mode == Option::TARG_WIN_MODE ? ";" : ":"); diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp index 79c3700fb..1a93c8b2b 100644 --- a/src/attic/qtmultilineedit.cpp +++ b/src/attic/qtmultilineedit.cpp @@ -725,7 +725,7 @@ static void cleanupMLBuffer() static TQPixmap *getCacheBuffer( TQSize sz ) { if ( !buffer ) { - qAddPostRoutine( cleanupMLBuffer ); + tqAddPostRoutine( cleanupMLBuffer ); buffer = new TQPixmap; } @@ -744,7 +744,7 @@ void TQtMultiLineEdit::paintCell( TQPainter *painter, int row, int ) TQFontMetrics fm( painter->font() ); TQString s = stringShown(row); if ( s.isNull() ) { - qWarning( "TQtMultiLineEdit::paintCell: (%s) no text at line %d", + tqWarning( "TQtMultiLineEdit::paintCell: (%s) no text at line %d", name( "unnamed" ), row ); return; } @@ -2157,8 +2157,8 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) if ( !isReadOnly() ) { const char* fmt; for (int i=0; !ps && (fmt=ms->format(i)); i++) { - ps = qstrnicmp(fmt,"text/",5)==0 - && qstrnicmp(fmt+5,"plain",5)!=0; + ps = tqstrnicmp(fmt,"text/",5)==0 + && tqstrnicmp(fmt+5,"plain",5)!=0; } } } diff --git a/src/attic/qttableview.cpp b/src/attic/qttableview.cpp index 21fefbd67..9f68ec4b8 100644 --- a/src/attic/qttableview.cpp +++ b/src/attic/qttableview.cpp @@ -272,7 +272,7 @@ void TQtTableView::setNumRows( int rows ) { if ( rows < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQtTableView::setNumRows: (%s) Negative argument %d.", + tqWarning( "TQtTableView::setNumRows: (%s) Negative argument %d.", name( "unnamed" ), rows ); #endif return; @@ -314,7 +314,7 @@ void TQtTableView::setNumCols( int cols ) { if ( cols < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQtTableView::setNumCols: (%s) Negative argument %d.", + tqWarning( "TQtTableView::setNumCols: (%s) Negative argument %d.", name( "unnamed" ), cols ); #endif return; @@ -580,7 +580,7 @@ void TQtTableView::setCellWidth( int cellWidth ) return; #if defined(QT_CHECK_RANGE) if ( cellWidth < 0 || cellWidth > SHRT_MAX ) { - qWarning( "TQtTableView::setCellWidth: (%s) Argument out of range (%d)", + tqWarning( "TQtTableView::setCellWidth: (%s) Argument out of range (%d)", name( "unnamed" ), cellWidth ); return; } @@ -634,7 +634,7 @@ void TQtTableView::setCellHeight( int cellHeight ) return; #if defined(QT_CHECK_RANGE) if ( cellHeight < 0 || cellHeight > SHRT_MAX ) { - qWarning( "TQtTableView::setCellHeight: (%s) Argument out of range (%d)", + tqWarning( "TQtTableView::setCellHeight: (%s) Argument out of range (%d)", name( "unnamed" ), cellHeight ); return; } @@ -1578,7 +1578,7 @@ int TQtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) { if ( yPos < minViewY() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQtTableView::findRawRow: (%s) internal error: " + tqWarning( "TQtTableView::findRawRow: (%s) internal error: " "yPos < minViewY() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), yPos, yOffs ); @@ -1625,7 +1625,7 @@ int TQtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) { if ( xPos < minViewX() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQtTableView::findRawCol: (%s) internal error: " + tqWarning( "TQtTableView::findRawCol: (%s) internal error: " "xPos < minViewX() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), xPos, xOffs ); diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index 7b337fb49..a8b348b94 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -3013,7 +3013,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray(TQPtrList<TQPixmap> list, TQPtrList<TQP img(new TQCanvasPixmap*[list.count()]) { if (list.count() != hotspots.count()) { - qWarning("TQCanvasPixmapArray: lists have different lengths"); + tqWarning("TQCanvasPixmapArray: lists have different lengths"); reset(); img = 0; } else { @@ -3041,7 +3041,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray(TQValueList<TQPixmap> list, TQPointArra { bool have_hotspots = ( hotspots.size() != 0 ); if (have_hotspots && list.count() != hotspots.count()) { - qWarning("TQCanvasPixmapArray: lists have different lengths"); + tqWarning("TQCanvasPixmapArray: lists have different lengths"); reset(); img = 0; } else { @@ -3480,7 +3480,7 @@ void TQCanvasSprite::draw(TQPainter& painter) TQCanvasItemList l = canvas()->collisions(e->pos()); for (TQCanvasItemList::Iterator it=l.begin(); it!=l.end(); ++it) { if ( (*it)->rtti() == TQCanvasRectangle::RTTI ) - qDebug("A TQCanvasRectangle lies somewhere at this point"); + tqDebug("A TQCanvasRectangle lies somewhere at this point"); } } \endcode @@ -4295,7 +4295,7 @@ TQCanvasSpline::~TQCanvasSpline() void TQCanvasSpline::setControlPoints(TQPointArray ctrl, bool close) { if ( (int)ctrl.count() % 3 != (close ? 0 : 1) ) { - qWarning( "TQCanvasSpline::setControlPoints(): Number of points doesn't fit." ); + tqWarning( "TQCanvasSpline::setControlPoints(): Number of points doesn't fit." ); int numCurves = (ctrl.count() - (close ? 0 : 1 ))/ 3; ctrl.resize( numCurves*3 + ( close ? 0 : 1 ) ); } diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp index efb90ff39..49ebce4e7 100644 --- a/src/codecs/qbig5codec.cpp +++ b/src/codecs/qbig5codec.cpp @@ -531,7 +531,7 @@ static int qt_UnicodeToBig5(ushort ch, uchar *buf) int TQBig5Codec::mibEnum() const { /* See http://www.iana.org/assignments/character-sets */ - //qDebug("TQBig5Codec::mibEnum() = 2026"); + //tqDebug("TQBig5Codec::mibEnum() = 2026"); return 2026; } @@ -539,7 +539,7 @@ int TQBig5Codec::mibEnum() const /*! \reimp */ const char* TQBig5Codec::name() const { - //qDebug("TQBig5Codec::name() = \"Big5\""); + //tqDebug("TQBig5Codec::name() = \"Big5\""); return "Big5"; } @@ -554,7 +554,7 @@ public: TQString toUnicode(const char* chars, int len) { - //qDebug("TQBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); + //tqDebug("TQBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); TQString result; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -599,7 +599,7 @@ public: /*! \reimp */ TQTextDecoder* TQBig5Codec::makeDecoder() const { - //qDebug("TQBig5Codec::makeDecoder()"); + //tqDebug("TQBig5Codec::makeDecoder()"); return new TQBig5Decoder(); } @@ -607,7 +607,7 @@ TQTextDecoder* TQBig5Codec::makeDecoder() const /*! \reimp */ TQCString TQBig5Codec::fromUnicode(const TQString& uc, int& lenInOut) const { - //qDebug("TQBig5Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQBig5Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); int l = TQMIN((int)uc.length(),lenInOut); int rlen = l*3+1; TQCString rstr(rlen); @@ -639,7 +639,7 @@ TQCString TQBig5Codec::fromUnicode(const TQString& uc, int& lenInOut) const /*! \reimp */ TQString TQBig5Codec::toUnicode(const char* chars, int len) const { - //qDebug("TQBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len); + //tqDebug("TQBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len); TQString result; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -677,7 +677,7 @@ TQString TQBig5Codec::toUnicode(const char* chars, int len) const /*! \reimp */ int TQBig5Codec::heuristicContentMatch(const char* chars, int len) const { - //qDebug("TQBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len); + //tqDebug("TQBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len); int score = 0; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -705,7 +705,7 @@ int TQBig5Codec::heuristicContentMatch(const char* chars, int len) const return -1; } } - //qDebug("TQBig5Codec::heuristicContentMatch() score = %d", score); + //tqDebug("TQBig5Codec::heuristicContentMatch() score = %d", score); return score; } @@ -713,15 +713,15 @@ int TQBig5Codec::heuristicContentMatch(const char* chars, int len) const /*! \reimp */ int TQBig5Codec::heuristicNameMatch(const char* hint) const { - //qDebug("TQBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); + //tqDebug("TQBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); int score = 0; bool zh = FALSE; - if (qstrnicmp(hint, "zh_TW", 5) == 0) { + if (tqstrnicmp(hint, "zh_TW", 5) == 0) { score += 16; zh = TRUE; } - else if ( qstrnicmp(hint, "zh", 2) == 0 || - qstrnicmp(hint, "chinese", 7) == 0) { + else if ( tqstrnicmp(hint, "zh", 2) == 0 || + tqstrnicmp(hint, "chinese", 7) == 0) { score += 2; zh = TRUE; } @@ -735,11 +735,11 @@ int TQBig5Codec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if ( qstricmp(p, "Big5") == 0 || - qstricmp(p, "TW-Big5") == 0 ) { + if ( tqstricmp(p, "Big5") == 0 || + tqstricmp(p, "TW-Big5") == 0 ) { return score + 10; } - else if ( qstrnicmp(p, "Big5", 4) == 0 ) + else if ( tqstrnicmp(p, "Big5", 4) == 0 ) return score + 2; } return TQTextCodec::heuristicNameMatch(hint); @@ -817,7 +817,7 @@ int TQBig5hkscsCodec::mibEnum() const { /* See http://www.iana.org/assignments/character-sets */ /* http://www.iana.org/assignments/charset-reg/Big5-HKSCS */ - //qDebug("TQBig5hkscsCodec::mibEnum() = 2101"); + //tqDebug("TQBig5hkscsCodec::mibEnum() = 2101"); return 2101; } @@ -825,7 +825,7 @@ int TQBig5hkscsCodec::mibEnum() const /*! \reimp */ const char* TQBig5hkscsCodec::name() const { - //qDebug("TQBig5hkscsCodec::name() = \"Big5-HKSCS\""); + //tqDebug("TQBig5hkscsCodec::name() = \"Big5-HKSCS\""); return "Big5-HKSCS"; } @@ -840,7 +840,7 @@ public: TQString toUnicode(const char* chars, int len) { - //qDebug("TQBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); + //tqDebug("TQBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); TQString result; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -885,7 +885,7 @@ public: /*! \reimp */ TQTextDecoder* TQBig5hkscsCodec::makeDecoder() const { - //qDebug("TQBig5hkscsCodec::makeDecoder()"); + //tqDebug("TQBig5hkscsCodec::makeDecoder()"); return new TQBig5hkscsDecoder(); } @@ -893,7 +893,7 @@ TQTextDecoder* TQBig5hkscsCodec::makeDecoder() const /*! \reimp */ TQCString TQBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut) const { - //qDebug("TQBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); int l = TQMIN((int)uc.length(),lenInOut); int rlen = l*3+1; TQCString rstr(rlen); @@ -922,7 +922,7 @@ TQCString TQBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut) const /*! \reimp */ TQString TQBig5hkscsCodec::toUnicode(const char* chars, int len) const { - //qDebug("TQBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); + //tqDebug("TQBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); TQString result; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -960,15 +960,15 @@ TQString TQBig5hkscsCodec::toUnicode(const char* chars, int len) const /*! \reimp */ int TQBig5hkscsCodec::heuristicNameMatch(const char* hint) const { - //qDebug("TQBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); + //tqDebug("TQBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); int score = 0; bool zh = FALSE; - if (qstrnicmp(hint, "zh_HK", 5) == 0) { + if (tqstrnicmp(hint, "zh_HK", 5) == 0) { score += 16; zh = TRUE; } - else if ( qstrnicmp(hint, "zh", 2) == 0 || - qstrnicmp(hint, "chinese", 7) == 0) { + else if ( tqstrnicmp(hint, "zh", 2) == 0 || + tqstrnicmp(hint, "chinese", 7) == 0) { score += 2; zh = TRUE; } @@ -982,13 +982,13 @@ int TQBig5hkscsCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if ( qstricmp(p, "Big5-HKSCS") == 0 || - qstricmp(p, "HKSCS-Big5") == 0 || - qstricmp(p, "Big5HKSCS") == 0 || - qstricmp(p, "hkbig5") == 0 ) { + if ( tqstricmp(p, "Big5-HKSCS") == 0 || + tqstricmp(p, "HKSCS-Big5") == 0 || + tqstricmp(p, "Big5HKSCS") == 0 || + tqstricmp(p, "hkbig5") == 0 ) { return score + 10; } - else if (qstrnicmp(p, "Big5", 4) == 0) { + else if (tqstrnicmp(p, "Big5", 4) == 0) { return score + 2; } } @@ -999,7 +999,7 @@ int TQBig5hkscsCodec::heuristicNameMatch(const char* hint) const /*! \reimp */ int TQBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const { - //qDebug("TQBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len); + //tqDebug("TQBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len); int score = 0; for (int i=0; i<len; i++) { uchar ch = chars[i]; @@ -1027,7 +1027,7 @@ int TQBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const return -1; } } - //qDebug("TQBig5hkscsCodec::heuristicContentMatch() score = %d", score); + //tqDebug("TQBig5hkscsCodec::heuristicContentMatch() score = %d", score); return score; } diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp index 1b5a3c897..52ce9592d 100644 --- a/src/codecs/qeucjpcodec.cpp +++ b/src/codecs/qeucjpcodec.cpp @@ -302,10 +302,10 @@ int TQEucJpCodec::heuristicNameMatch(const char* hint) const { int score = 0; bool ja = FALSE; - if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) { + if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) { score += 3; ja = TRUE; - } else if (qstrnicmp(hint, "ja", 2) == 0) { + } else if (tqstrnicmp(hint, "ja", 2) == 0) { score += 2; ja = TRUE; } @@ -320,16 +320,16 @@ int TQEucJpCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if ((qstricmp(p, "AJEC") == 0) || - (qstricmp(p, "eucJP") == 0) || - (qstricmp(p, "ujis") == 0) || + if ((tqstricmp(p, "AJEC") == 0) || + (tqstricmp(p, "eucJP") == 0) || + (tqstricmp(p, "ujis") == 0) || (simpleHeuristicNameMatch(p, "eucJP") > 0) || (simpleHeuristicNameMatch(p, "x-euc-jp") > 0)) { return score + 4; } // there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC // so "euc" may or may not be Japanese EUC. - if (qstricmp(p, "euc") == 0 && ja) { + if (tqstricmp(p, "euc") == 0 && ja) { return score + 4; } } diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp index 547c00e80..433f4b8bd 100644 --- a/src/codecs/qeuckrcodec.cpp +++ b/src/codecs/qeuckrcodec.cpp @@ -212,11 +212,11 @@ int TQEucKrCodec::heuristicNameMatch(const char* hint) const { int score = 0; bool ko = FALSE; - if (qstrnicmp(hint, "ko_KR", 5) == 0 || - qstrnicmp(hint, "korean", 5) == 0) { + if (tqstrnicmp(hint, "ko_KR", 5) == 0 || + tqstrnicmp(hint, "korean", 5) == 0) { score += 3; ko = TRUE; - } else if (qstrnicmp(hint, "ko", 2) == 0) { + } else if (tqstrnicmp(hint, "ko", 2) == 0) { score += 2; ko = TRUE; } @@ -231,10 +231,10 @@ int TQEucKrCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if (qstricmp(p, "eucKR") == 0) { + if (tqstricmp(p, "eucKR") == 0) { return score + 4; } - else if (qstricmp(p, "euc") == 0 && ko) { + else if (tqstricmp(p, "euc") == 0 && ko) { return score + 4; } } diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/qfontcncodec.cpp index 378dd4300..f4d5fc327 100644 --- a/src/codecs/qfontcncodec.cpp +++ b/src/codecs/qfontcncodec.cpp @@ -55,20 +55,20 @@ int TQFontGb2312Codec::heuristicContentMatch(const char *, int) const TQFontGb2312Codec::TQFontGb2312Codec() { - //qDebug("TQFontGb2312Codec::TQFontGb2312Codec()"); + //tqDebug("TQFontGb2312Codec::TQFontGb2312Codec()"); } const char* TQFontGb2312Codec::name() const { - //qDebug("TQFontGb2312Codec::name() = \"gb2312.1980-0\""); + //tqDebug("TQFontGb2312Codec::name() = \"gb2312.1980-0\""); return "gb2312.1980-0"; } int TQFontGb2312Codec::mibEnum() const { - //qDebug("TQFontGb2312Codec::mibEnum() = 57"); + //tqDebug("TQFontGb2312Codec::mibEnum() = 57"); return 57; } @@ -93,7 +93,7 @@ TQCString TQFontGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut ) con uchar *rdata = (uchar *) result.data(); const TQChar *ucp = uc.unicode(); - //qDebug("TQFontGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQFontGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); for ( int i = 0; i < lenInOut; i++ ) { TQChar ch(*ucp++); uchar buf[8]; @@ -137,7 +137,7 @@ bool TQFontGb2312Codec::canEncode( TQChar ch ) const { uchar buf[4]; int len = qt_UnicodeToGbk( ch.unicode(), buf ); - //qDebug("TQFontGb2312Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); + //tqDebug("TQFontGb2312Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); return ( len == 2 && buf[0] > 0xa0 && buf[1] > 0xa0 ); } @@ -152,29 +152,29 @@ int TQFontGbkCodec::heuristicContentMatch(const char *, int) const int TQFontGbkCodec::heuristicNameMatch(const char* hint) const { - //qDebug("TQFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); - return ( qstricmp(hint, "gbk-0") == 0 || - qstricmp(hint, "gb18030.2000-0") == 0 ) + //tqDebug("TQFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); + return ( tqstricmp(hint, "gbk-0") == 0 || + tqstricmp(hint, "gb18030.2000-0") == 0 ) ? 13 : 0; } TQFontGbkCodec::TQFontGbkCodec() { - //qDebug("TQFontGbkCodec::TQFontGbkCodec()"); + //tqDebug("TQFontGbkCodec::TQFontGbkCodec()"); } const char* TQFontGbkCodec::name() const { - //qDebug("TQFontGbkCodec::name() = \"gbk-0\""); + //tqDebug("TQFontGbkCodec::name() = \"gbk-0\""); return "gbk-0"; } int TQFontGbkCodec::mibEnum() const { - //qDebug("TQFontGbkCodec::mibEnum() = -113"); + //tqDebug("TQFontGbkCodec::mibEnum() = -113"); return -113; } @@ -199,7 +199,7 @@ TQCString TQFontGbkCodec::fromUnicode(const TQString& uc, int& lenInOut ) const uchar *rdata = (uchar *) result.data(); const TQChar *ucp = uc.unicode(); - //qDebug("TQFontGbkCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQFontGbkCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); for ( int i = 0; i < lenInOut; i++ ) { TQChar ch(*ucp++); uchar buf[8]; @@ -236,7 +236,7 @@ bool TQFontGbkCodec::canEncode( TQChar ch ) const return TRUE; uchar buf[4]; int len = qt_UnicodeToGbk( ch.unicode(), buf ); - //qDebug("TQFontGbkCodec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); + //tqDebug("TQFontGbkCodec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); return ( len == 2 ); } @@ -250,20 +250,20 @@ int TQFontGb18030_0Codec::heuristicContentMatch(const char *, int) const TQFontGb18030_0Codec::TQFontGb18030_0Codec() { - //qDebug("TQFontGb18030_0Codec::TQFontGb18030_0Codec()"); + //tqDebug("TQFontGb18030_0Codec::TQFontGb18030_0Codec()"); } const char* TQFontGb18030_0Codec::name() const { - //qDebug("TQFontGb18030_0Codec::name() = \"gb18030-0\""); + //tqDebug("TQFontGb18030_0Codec::name() = \"gb18030-0\""); return "gb18030-0"; } int TQFontGb18030_0Codec::mibEnum() const { - //qDebug("TQFontGb18030_0Codec::mibEnum() = -114"); + //tqDebug("TQFontGb18030_0Codec::mibEnum() = -114"); return -114; } @@ -288,7 +288,7 @@ TQCString TQFontGb18030_0Codec::fromUnicode(const TQString& uc, int& lenInOut ) uchar *rdata = (uchar *) result.data(); const TQChar *ucp = uc.unicode(); - //qDebug("TQFontGb18030_0Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQFontGb18030_0Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); for ( int i = 0; i < lenInOut; i++ ) { TQChar ch(*ucp++); if (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0)) { @@ -317,7 +317,7 @@ void TQFontGb18030_0Codec::fromUnicode(const TQChar *in, unsigned short *out, in bool TQFontGb18030_0Codec::canEncode( TQChar ch ) const { - //qDebug("TQFontGb18030_0Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); + //tqDebug("TQFontGb18030_0Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); return (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0)); } diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/qfonthkcodec.cpp index 6d53bc6fe..954d53ea1 100644 --- a/src/codecs/qfonthkcodec.cpp +++ b/src/codecs/qfonthkcodec.cpp @@ -54,29 +54,29 @@ int TQFontBig5hkscsCodec::heuristicContentMatch(const char *, int) const int TQFontBig5hkscsCodec::heuristicNameMatch(const char* hint) const { - //qDebug("TQFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); - return ( qstricmp(hint, "big5hkscs-0") == 0 || - qstricmp(hint, "hkscs-1") == 0 ) + //tqDebug("TQFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); + return ( tqstricmp(hint, "big5hkscs-0") == 0 || + tqstricmp(hint, "hkscs-1") == 0 ) ? 13 : 0; } TQFontBig5hkscsCodec::TQFontBig5hkscsCodec() { - //qDebug("TQFontBig5hkscsCodec::TQFontBig5hkscsCodec()"); + //tqDebug("TQFontBig5hkscsCodec::TQFontBig5hkscsCodec()"); } const char* TQFontBig5hkscsCodec::name() const { - //qDebug("TQFontBig5hkscsCodec::name() = \"big5hkscs-0\""); + //tqDebug("TQFontBig5hkscsCodec::name() = \"big5hkscs-0\""); return "big5hkscs-0"; } int TQFontBig5hkscsCodec::mibEnum() const { - //qDebug("TQFontBig5hkscsCodec::mibEnum() = -2101"); + //tqDebug("TQFontBig5hkscsCodec::mibEnum() = -2101"); return -2101; } @@ -97,7 +97,7 @@ TQFontBig5hkscsCodec::characterFromUnicode(const TQString &str, int pos) const TQCString TQFontBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut ) const { - //qDebug("TQFontBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQFontBig5hkscsCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); TQCString result(lenInOut * 2 + 1); uchar *rdata = (uchar *) result.data(); const TQChar *ucp = uc.unicode(); @@ -151,7 +151,7 @@ void TQFontBig5hkscsCodec::fromUnicode(const TQChar *in, unsigned short *out, in bool TQFontBig5hkscsCodec::canEncode( TQChar ch ) const { - //qDebug("TQFontBig5hkscsCodec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); + //tqDebug("TQFontBig5hkscsCodec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); uchar c[2]; return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 ); } diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/qfonttwcodec.cpp index 554fcd771..7fe3f80d3 100644 --- a/src/codecs/qfonttwcodec.cpp +++ b/src/codecs/qfonttwcodec.cpp @@ -54,29 +54,29 @@ int TQFontBig5Codec::heuristicContentMatch(const char *, int) const int TQFontBig5Codec::heuristicNameMatch(const char* hint) const { - //qDebug("TQFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); - return ( qstricmp(hint, "big5-0") == 0 || - qstricmp(hint, "big5.eten-0") == 0 ) + //tqDebug("TQFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); + return ( tqstricmp(hint, "big5-0") == 0 || + tqstricmp(hint, "big5.eten-0") == 0 ) ? 13 : 0; } TQFontBig5Codec::TQFontBig5Codec() { - //qDebug("TQFontBig5Codec::TQFontBig5Codec()"); + //tqDebug("TQFontBig5Codec::TQFontBig5Codec()"); } const char* TQFontBig5Codec::name() const { - //qDebug("TQFontBig5Codec::name() = \"big5-0\""); + //tqDebug("TQFontBig5Codec::name() = \"big5-0\""); return "big5-0"; } int TQFontBig5Codec::mibEnum() const { - //qDebug("TQFontBig5Codec::mibEnum() = -2026"); + //tqDebug("TQFontBig5Codec::mibEnum() = -2026"); return -2026; } @@ -97,7 +97,7 @@ unsigned short TQFontBig5Codec::characterFromUnicode(const TQString &str, int po TQCString TQFontBig5Codec::fromUnicode(const TQString& uc, int& lenInOut ) const { - //qDebug("TQFontBig5Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQFontBig5Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); TQCString result(lenInOut * 2 + 1); uchar *rdata = (uchar *) result.data(); const TQChar *ucp = uc.unicode(); @@ -152,7 +152,7 @@ void TQFontBig5Codec::fromUnicode(const TQChar *in, unsigned short *out, int len bool TQFontBig5Codec::canEncode( TQChar ch ) const { - //qDebug("TQFontBig5Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); + //tqDebug("TQFontBig5Codec::canEncode( TQChar ch = %02X%02X )", ch.row(), ch.cell()); uchar c[2]; return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 && c[0] >= 0xa1 && c[0] <= 0xf9 ); diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp index 74f833362..8ed96fc74 100644 --- a/src/codecs/qgb18030codec.cpp +++ b/src/codecs/qgb18030codec.cpp @@ -161,7 +161,7 @@ TQGb18030Codec::TQGb18030Codec() /*! \reimp */ const char* TQGb18030Codec::name() const { - //qDebug("TQGb18030Codec::name() = \"GB18030\""); + //tqDebug("TQGb18030Codec::name() = \"GB18030\""); return "GB18030"; } @@ -179,7 +179,7 @@ TQCString TQGb18030Codec::fromUnicode(const TQString& uc, int& lenInOut) const TQCString rstr(rlen); uchar* cursor = (uchar*)rstr.data(); - //qDebug("TQGb18030Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQGb18030Codec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); for (int i=0; i<l; i++) { TQChar ch = uc[i]; int len; @@ -231,7 +231,7 @@ TQString TQGb18030Codec::toUnicode(const char* chars, int len) const TQString result; int clen; - //qDebug("TQGb18030Codec::toUnicode(const char* chars, int len = %d)", len); + //tqDebug("TQGb18030Codec::toUnicode(const char* chars, int len = %d)", len); for (int i=0; i<len; ) { uchar ch = chars[i]; @@ -274,8 +274,8 @@ int TQGb18030Codec::heuristicNameMatch(const char* hint) const { int score = 0; bool zh = FALSE; - //qDebug("TQGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); - if (qstrnicmp(hint, "zh_CN", 5) == 0){ + //tqDebug("TQGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); + if (tqstrnicmp(hint, "zh_CN", 5) == 0){ score += 10; zh = TRUE; } @@ -289,7 +289,7 @@ int TQGb18030Codec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if (qstricmp(p, "GB18030") == 0) + if (tqstricmp(p, "GB18030") == 0) return score + 14; } return TQTextCodec::heuristicNameMatch(hint); @@ -299,7 +299,7 @@ int TQGb18030Codec::heuristicNameMatch(const char* hint) const int TQGb18030Codec::heuristicContentMatch(const char* chars, int len) const { int score = 0; - //qDebug("TQGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len); + //tqDebug("TQGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len); for (int i=0; i<len; i++) { uchar ch = chars[i]; // No nulls allowed. @@ -351,7 +351,7 @@ public: TQString toUnicode(const char* chars, int len) { TQString result; - //qDebug("TQGb18030Decoder::toUnicode(const char* chars, int len = %d)", len); + //tqDebug("TQGb18030Decoder::toUnicode(const char* chars, int len = %d)", len); for (int i=0; i<len; i++) { uchar ch = chars[i]; switch (nbuf) { @@ -433,7 +433,7 @@ public: /*! \reimp */ TQTextDecoder* TQGb18030Codec::makeDecoder() const { - //qDebug("TQGb18030Codec::makeDecoder()"); + //tqDebug("TQGb18030Codec::makeDecoder()"); return new TQGb18030Decoder(); } @@ -480,15 +480,15 @@ int TQGbkCodec::heuristicNameMatch(const char* hint) const { #if 0 // these are needed so that the X11 fonts behave correctly. - if (qstricmp (hint, "gbk-0") == 0 || - qstricmp (hint, "gb18030.2000-0") == 0) + if (tqstricmp (hint, "gbk-0") == 0 || + tqstricmp (hint, "gb18030.2000-0") == 0) return 13; #endif int score = 0; bool zh = FALSE; - //qDebug("TQGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); - if (qstrnicmp(hint, "zh_CN", 5) == 0){ + //tqDebug("TQGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint); + if (tqstrnicmp(hint, "zh_CN", 5) == 0){ score += 10; zh = TRUE; } @@ -502,7 +502,7 @@ int TQGbkCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if (qstricmp(p, "GBK") == 0) + if (tqstricmp(p, "GBK") == 0) return score + 6; } return TQTextCodec::heuristicNameMatch(hint); @@ -511,7 +511,7 @@ int TQGbkCodec::heuristicNameMatch(const char* hint) const /*! \reimp */ int TQGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const { - //qDebug("TQGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)"); + //tqDebug("TQGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)"); return 0; } @@ -526,7 +526,7 @@ public: { TQString result; - //qDebug("TQGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); + //tqDebug("TQGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len); for (int i=0; i<len; i++) { uchar ch = chars[i]; switch (nbuf) { @@ -570,7 +570,7 @@ public: /*! \reimp */ TQTextDecoder* TQGbkCodec::makeDecoder() const { - //qDebug("TQGbkCodec::makeDecoder()"); + //tqDebug("TQGbkCodec::makeDecoder()"); return new TQGbkDecoder(); } @@ -582,7 +582,7 @@ TQCString TQGbkCodec::fromUnicode(const TQString& uc, int& lenInOut) const TQCString rstr(rlen); uchar* cursor = (uchar*)rstr.data(); - //qDebug("TQGbkCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); + //tqDebug("TQGbkCodec::fromUnicode(const TQString& uc, int& lenInOut = %d)", lenInOut); for (int i=0; i<l; i++) { TQChar ch = uc[i]; uchar buf[2]; @@ -610,7 +610,7 @@ TQString TQGbkCodec::toUnicode(const char* chars, int len) const TQString result; int clen; - //qDebug("TQGbkCodec::toUnicode(const char* chars, int len = %d)", len); + //tqDebug("TQGbkCodec::toUnicode(const char* chars, int len = %d)", len); for (int i=0; i<len; ) { uchar ch = chars[i]; @@ -681,8 +681,8 @@ int TQGb2312Codec::heuristicNameMatch(const char* hint) const { int score = 0; bool zh = FALSE; - //qDebug("TQGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); - if (qstrnicmp(hint, "zh_CN", 5) == 0){ + //tqDebug("TQGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint); + if (tqstrnicmp(hint, "zh_CN", 5) == 0){ score += 10; zh = TRUE; } @@ -696,13 +696,13 @@ int TQGb2312Codec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if (qstricmp(p, "GB2312") == 0 || - qstricmp(p, "hp15cn") == 0) + if (tqstricmp(p, "GB2312") == 0 || + tqstricmp(p, "hp15cn") == 0) return score + 7; - else if (qstricmp(p, "eucCN") == 0) + else if (tqstricmp(p, "eucCN") == 0) return score + 4; // there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC - else if (qstricmp(p, "euc") == 0 && zh) + else if (tqstricmp(p, "euc") == 0 && zh) return score + 4; } return TQTextCodec::heuristicNameMatch(hint); @@ -711,7 +711,7 @@ int TQGb2312Codec::heuristicNameMatch(const char* hint) const /*! \reimp */ int TQGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const { - //qDebug("TQGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)"); + //tqDebug("TQGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)"); return 0; } @@ -725,7 +725,7 @@ public: TQString toUnicode(const char* chars, int len) { TQString result; - //qDebug("TQGb2312Decoder::toUnicode(const char* chars, int len = %d)", len); + //tqDebug("TQGb2312Decoder::toUnicode(const char* chars, int len = %d)", len); for (int i=0; i<len; i++) { uchar ch = chars[i]; switch (nbuf) { @@ -769,7 +769,7 @@ public: /*! \reimp */ TQTextDecoder* TQGb2312Codec::makeDecoder() const { - //qDebug("TQGb2312Codec::makeDecoder()"); + //tqDebug("TQGb2312Codec::makeDecoder()"); return new TQGb2312Decoder(); } @@ -781,7 +781,7 @@ TQCString TQGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut) const TQCString rstr(rlen); uchar* cursor = (uchar*)rstr.data(); - //qDebug("TQGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut = %d) const", lenInOut); + //tqDebug("TQGb2312Codec::fromUnicode(const TQString& uc, int& lenInOut = %d) const", lenInOut); for (int i=0; i<l; i++) { TQChar ch = uc[i]; uchar buf[2]; @@ -810,7 +810,7 @@ TQString TQGb2312Codec::toUnicode(const char* chars, int len) const TQString result; int clen; - //qDebug("TQGb2312Codec::toUnicode(const char* chars, int len = %d)", len); + //tqDebug("TQGb2312Codec::toUnicode(const char* chars, int len = %d)", len); for (int i=0; i<len; ) { uchar ch = chars[i]; diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp index 5f5afbb9b..9f125a33d 100644 --- a/src/codecs/qjiscodec.cpp +++ b/src/codecs/qjiscodec.cpp @@ -387,17 +387,17 @@ const char* TQJisCodec::mimeName() const /*! \internal */ int TQJisCodec::heuristicNameMatch(const char* hint) const { - if ( qstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 ) + if ( tqstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 ) return 10000; if ( simpleHeuristicNameMatch( "ISO-2022-JP-2", hint ) > 0 ) return 10; int score = 0; bool ja = FALSE; - if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) { + if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) { score += 3; ja = TRUE; - } else if (qstrnicmp(hint, "ja", 2) == 0) { + } else if (tqstrnicmp(hint, "ja", 2) == 0) { score += 2; ja = TRUE; } @@ -412,8 +412,8 @@ int TQJisCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if ((qstricmp(p, "JIS") == 0) || - (qstricmp(p, "JIS7") == 0) || + if ((tqstricmp(p, "JIS") == 0) || + (tqstricmp(p, "JIS7") == 0) || (simpleHeuristicNameMatch("ISO-2022-JP", p) > 0)) { return score + 4; } diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index 1a6c34aea..e3b08f8fa 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -778,32 +778,32 @@ TQJpUnicodeConv *TQJpUnicodeConv::newConverter(int rule) s = env.mid(i, j - i).stripWhiteSpace(); i = j + 1; } - if (qstricmp(s, "unicode-0.9") == 0) { + if (tqstricmp(s, "unicode-0.9") == 0) { rule = (rule & 0xff00) | Unicode; - } else if (qstricmp(s, "unicode-0201") == 0) { + } else if (tqstricmp(s, "unicode-0201") == 0) { rule = (rule & 0xff00) | Unicode_JISX0201; - } else if (qstricmp(s, "unicode-ascii") == 0) { + } else if (tqstricmp(s, "unicode-ascii") == 0) { rule = (rule & 0xff00) | Unicode_ASCII; - } else if (qstricmp(s, "jisx0221-1995") == 0) { + } else if (tqstricmp(s, "jisx0221-1995") == 0) { rule = (rule & 0xff00) | JISX0221_JISX0201; - } else if ((qstricmp(s, "open-0201") == 0) || - (qstricmp(s, "open-19970715-0201") == 0)) { + } else if ((tqstricmp(s, "open-0201") == 0) || + (tqstricmp(s, "open-19970715-0201") == 0)) { rule = (rule & 0xff00) | JISX0221_JISX0201; - } else if ((qstricmp(s, "open-ascii") == 0) || - (qstricmp(s, "open-19970715-ascii") == 0)) { + } else if ((tqstricmp(s, "open-ascii") == 0) || + (tqstricmp(s, "open-19970715-ascii") == 0)) { rule = (rule & 0xff00) | JISX0221_ASCII; - } else if ((qstricmp(s, "open-ms") == 0) || - (qstricmp(s, "open-19970715-ms") == 0)) { + } else if ((tqstricmp(s, "open-ms") == 0) || + (tqstricmp(s, "open-19970715-ms") == 0)) { rule = (rule & 0xff00) | Microsoft_CP932; - } else if (qstricmp(s, "cp932") == 0) { + } else if (tqstricmp(s, "cp932") == 0) { rule = (rule & 0xff00) | Microsoft_CP932; - } else if (qstricmp(s, "jdk1.1.7") == 0) { + } else if (tqstricmp(s, "jdk1.1.7") == 0) { rule = (rule & 0xff00) | Sun_JDK117; - } else if (qstricmp(s, "nec-vdc") == 0) { + } else if (tqstricmp(s, "nec-vdc") == 0) { rule = rule | NEC_VDC; - } else if (qstricmp(s, "ibm-vdc") == 0) { + } else if (tqstricmp(s, "ibm-vdc") == 0) { rule = rule | IBM_VDC; - } else if (qstricmp(s, "udc") == 0) { + } else if (tqstricmp(s, "udc") == 0) { rule = rule | UDC; } } diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp index fa1585ec8..42917b286 100644 --- a/src/codecs/qrtlcodec.cpp +++ b/src/codecs/qrtlcodec.cpp @@ -217,7 +217,7 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int case TQChar::DirL: if ( runDir != TQChar::DirL && runDir != TQChar::DirON ) { out += run( str, from, pos, runDir ); - qDebug( "out = %s", out.latin1() ); + tqDebug( "out = %s", out.latin1() ); from = pos; } runDir = TQChar::DirL; @@ -233,7 +233,7 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int case TQChar::DirEN: if ( runDir != TQChar::DirR && runDir != TQChar::DirON ) { out += run( str, from, pos, runDir ); - qDebug( "out = %s", out.latin1() ); + tqDebug( "out = %s", out.latin1() ); from = pos; } runDir = TQChar::DirR; @@ -243,7 +243,7 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int pos++; } out += run( str, from, pos, runDir ); - qDebug( "out = %s", out.latin1() ); + tqDebug( "out = %s", out.latin1() ); // second reversing for numbers TQString in = out; out = ""; @@ -259,7 +259,7 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int case TQChar::DirR: if ( runDir == TQChar::DirEN && runDir != TQChar::DirON ) { out += run( in, from, pos, TQChar::DirR ); //DirR ensures reversing - qDebug( "out = %s", out.latin1() ); + tqDebug( "out = %s", out.latin1() ); runDir = TQChar::DirR; from = pos; } @@ -269,7 +269,7 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int case TQChar::DirEN: if ( runDir != TQChar::DirEN && runDir != TQChar::DirON ) { out += in.mid(from, pos-from+1); - qDebug( "out = %s", out.latin1() ); + tqDebug( "out = %s", out.latin1() ); from = pos; } runDir = TQChar::DirEN; @@ -437,7 +437,7 @@ static TQString visualOrder(TQString logical, TQChar::Direction basicDir) } int i; for (i = 0; i < nitems; ++i) { - //qDebug("item %d bidiLevel=%d", i, e.items[i].analysis.bidiLevel); + //tqDebug("item %d bidiLevel=%d", i, e.items[i].analysis.bidiLevel); levels[i] = e.items[i].analysis.bidiLevel; } e.bidiReorder(nitems, levels, visualOrder); diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp index 9d2df5109..7a2e0c494 100644 --- a/src/codecs/qsjiscodec.cpp +++ b/src/codecs/qsjiscodec.cpp @@ -249,10 +249,10 @@ int TQSjisCodec::heuristicNameMatch(const char* hint) const { int score = 0; bool ja = FALSE; - if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) { + if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) { score += 3; ja = TRUE; - } else if (qstrnicmp(hint, "ja", 2) == 0) { + } else if (tqstrnicmp(hint, "ja", 2) == 0) { score += 2; ja = TRUE; } @@ -267,9 +267,9 @@ int TQSjisCodec::heuristicNameMatch(const char* hint) const p = hint; } if (p) { - if ((qstricmp(p, "mscode") == 0) || - (qstricmp(p, "PCK") == 0) || - (qstricmp(p, "SJIS") == 0) || + if ((tqstricmp(p, "mscode") == 0) || + (tqstricmp(p, "PCK") == 0) || + (tqstricmp(p, "SJIS") == 0) || (simpleHeuristicNameMatch(p, "ShiftJIS") > 0) || (simpleHeuristicNameMatch(p, "x-sjis") > 0)) { return score + 4; diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index c03529df2..5f962118f 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -122,8 +122,8 @@ void TQTextCodec::deleteAllCodecs() return; #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &all ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &all ) : 0 ); if ( !all ) return; #endif // QT_THREAD_SUPPORT @@ -152,8 +152,8 @@ static inline void setup() if ( all ) return; #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &all ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &all ) : 0 ); if ( all ) return; #endif // QT_THREAD_SUPPORT @@ -443,7 +443,7 @@ TQTextCodec::TQTextCodec() TQTextCodec::~TQTextCodec() { if ( !destroying_is_ok ) - qWarning("TQTextCodec::~TQTextCodec() called by application"); + tqWarning("TQTextCodec::~TQTextCodec() called by application"); if ( all ) all->remove( this ); } @@ -503,7 +503,7 @@ static TQString lettersAndNumbers( const char * input ) int TQTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint) { // 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 tqstrlen( hint ); // if the letters and numbers are the same, we have an "almost" @@ -667,7 +667,7 @@ public: // character buf[nbuf++] = *chars; if (nbuf + 1 == sizeof buf) { - qWarning("TQWindowsLocalDecoder: exceeded max internal buffer size"); + tqWarning("TQWindowsLocalDecoder: exceeded max internal buffer size"); nbuf = 0; } } @@ -793,7 +793,7 @@ static TQTextCodec * ru_RU_hack( const char * i ) { } else { // something else again... let's assume... *throws dice* ru_RU_codec = TQTextCodec::codecForName( "KOI8-R" ); - qWarning( "TQTextCodec: using KOI8-R, probe failed (%02x %02x %s)", + tqWarning( "TQTextCodec: using KOI8-R, probe failed (%02x %02x %s)", koi8r, latin5, i ); } setlocale( LC_CTYPE, origlocale.data() ); @@ -1297,15 +1297,15 @@ public: char comm='%'; bool incmap = FALSE; 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; - else if (0==qstrnicmp(line,"<escape_char> ",14)) + else if (0==tqstrnicmp(line,"<escape_char> ",14)) esc = line[14]; - else if (0==qstrnicmp(line,"<comment_char> ",15)) + else if (0==tqstrnicmp(line,"<comment_char> ",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); - } else if (0==qstrnicmp(line,"CHARMAP",7)) { + } else if (0==tqstrnicmp(line,"CHARMAP",7)) { if (!from_unicode_page) { from_unicode_page = new char*[256]; for (int i=0; i<256; i++) @@ -1315,7 +1315,7 @@ public: to_unicode = new ushort[256]; } incmap = TRUE; - } else if (0==qstrnicmp(line,"END CHARMAP",11)) + } else if (0==tqstrnicmp(line,"END CHARMAP",11)) break; else if (incmap) { char* cursor = line; @@ -1395,7 +1395,7 @@ public: } mb[nmb++] = 0; from_unicode_page_multiByte[ch.row()][ch.cell()] - = qstrdup(mb); + = tqstrdup(mb); *mb_unicode = unicode; } else { from_unicode_page[ch.row()][ch.cell()] = (char)byte; @@ -2442,7 +2442,7 @@ int TQSimpleTextCodec::mibEnum() const int TQSimpleTextCodec::heuristicNameMatch(const char* hint) const { - if ( qstricmp( hint, mimeName() ) == 0 ) + if ( tqstricmp( hint, mimeName() ) == 0 ) return 10000; // return a large value if ( hint[0]=='k' ) { TQCString lhint = TQCString(hint).lower(); @@ -2802,18 +2802,18 @@ static void setupLocaleMapper() // First part is getting that locale name. First try setlocale() which // definitely knows it, but since we cannot fully trust it, get ready // to fall back to environment variables. - char * ctype = qstrdup( setlocale( LC_CTYPE, 0 ) ); + char * ctype = tqstrdup( setlocale( LC_CTYPE, 0 ) ); // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG // environment variables. - char * lang = qstrdup( getenv("LC_ALL") ); + char * lang = tqstrdup( getenv("LC_ALL") ); if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) { if ( lang ) delete [] lang; - lang = qstrdup( getenv("LC_CTYPE") ); + lang = tqstrdup( getenv("LC_CTYPE") ); } if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) { if ( lang ) delete [] lang; - lang = qstrdup( getenv("LANG") ); + lang = tqstrdup( getenv("LANG") ); } // Now try these in order: @@ -2905,7 +2905,7 @@ static void realSetup() { #if defined(QT_CHECK_STATE) if ( destroying_is_ok ) - qWarning( "TQTextCodec: creating new codec during codec cleanup!" ); + tqWarning( "TQTextCodec: creating new codec during codec cleanup!" ); #endif all = new TQValueList<TQTextCodec*>; diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp index df9757e28..aad0ac2b4 100644 --- a/src/codecs/qtextcodecfactory.cpp +++ b/src/codecs/qtextcodecfactory.cpp @@ -65,8 +65,8 @@ static void create_manager() #ifdef QT_THREAD_SUPPORT // protect manager creation - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &manager ) : 0); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &manager ) : 0); // we check the manager pointer again to make sure that another thread // has not created the manager before us. diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp index 87fc18b3f..e57f4fd70 100644 --- a/src/codecs/qtsciicodec.cpp +++ b/src/codecs/qtsciicodec.cpp @@ -183,7 +183,7 @@ int TQTsciiCodec::heuristicNameMatch(const char* hint) const p++; else p = hint; - if (qstricmp(p, "TSCII") == 0) + if (tqstricmp(p, "TSCII") == 0) return 4; return TQTextCodec::heuristicNameMatch(hint); } diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h index 11b79fc3f..50522e813 100644 --- a/src/dialogs/ntqmessagebox.h +++ b/src/dialogs/ntqmessagebox.h @@ -209,13 +209,13 @@ private: // Disabled copy constructor and operator= * } */ #define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ -TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ +TQString sq=TQString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !tqApp){ int c=0; new \ TQApplication(argc,argv);} TQString s = TQApplication::tr("Executable '%1' requires TQt "\ "%2, found TQt %3.").arg(TQString::fromLatin1(tqAppName())).arg(TQString::fromLatin1(\ -str)).arg(TQString::fromLatin1(qVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\ -"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); qFatal(s.ascii()); }} +str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQApplication::tr(\ +"Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }} #endif // QT_NO_MESSAGEBOX diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index d365e96f7..fada75546 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -366,7 +366,7 @@ void TQWellArray::setCellBrush( int row, int col, const TQBrush &b ) d->brush[row*numCols()+col] = b; #ifdef QT_CHECK_RANGE else - qWarning( "TQWellArray::setCellBrush( %d, %d ) out of range", row, col ); + tqWarning( "TQWellArray::setCellBrush( %d, %d ) out of range", row, col ); #endif } @@ -471,7 +471,7 @@ TQRgb TQColorDialog::customColor( int i ) initRGB(); if ( i < 0 || i >= customCount() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQColorDialog::customColor() index %d out of range", i ); + tqWarning( "TQColorDialog::customColor() index %d out of range", i ); #endif i = 0; } @@ -486,7 +486,7 @@ void TQColorDialog::setCustomColor( int i, TQRgb c ) initRGB(); if ( i < 0 || i >= customCount() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQColorDialog::setCustomColor() index %d out of range", i ); + tqWarning( "TQColorDialog::setCustomColor() index %d out of range", i ); #endif return; } @@ -503,7 +503,7 @@ void TQColorDialog::setStandardColor( int i, TQRgb c ) initRGB(); if ( i < 0 || i >= 6*8 ) { #ifdef QT_CHECK_RANGE - qWarning( "TQColorDialog::setStandardColor() index %d out of range", i ); + tqWarning( "TQColorDialog::setStandardColor() index %d out of range", i ); #endif return; } diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index a25ad609f..90974de05 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -418,7 +418,7 @@ void TQDialog::hideSpecial() int TQDialog::exec() { if ( in_loop ) { - qWarning( "TQDialog::exec: Recursive call detected" ); + tqWarning( "TQDialog::exec: Recursive call detected" ); return -1; } diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 70e670689..e883fdc64 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -95,7 +95,7 @@ message() slot, or connect signals to it. \i For developers. In this context the static qtHandler() installs a message handler using qInstallMsgHandler() and creates a TQErrorMessage -that displays qDebug(), qWarning() and qFatal() messages. +that displays tqDebug(), tqWarning() and tqFatal() messages. \endlist In both cases TQErrorMessage will queue pending messages, and display @@ -224,7 +224,7 @@ TQErrorMessage * TQErrorMessage::qtHandler() { if ( !qtMessageHandler ) { qtMessageHandler = new TQErrorMessage( 0, "automatic message handler" ); - qAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up + tqAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up #ifndef QT_NO_WIDGET_TOPEXTRA if ( tqApp->mainWidget() ) qtMessageHandler->setCaption( tqApp->mainWidget()->caption() ); diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 019d3d56c..53b030153 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -529,8 +529,8 @@ static void resolveLibs() if ( !triedResolve ) { #ifdef QT_THREAD_SUPPORT // protect initialization - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &triedResolve ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &triedResolve ) : 0 ); // check triedResolve again, since another thread may have already // done the initialization if ( triedResolve ) { @@ -3404,8 +3404,8 @@ void TQFileDialog::rereadDir() \sa selectedFilter() */ -extern bool qt_resolve_symlinks; // defined in qapplication.cpp -bool Q_EXPORT qt_use_native_dialogs = TRUE; +extern bool tqt_resolve_symlinks; // defined in qapplication.cpp +bool Q_EXPORT tqt_use_native_dialogs = TRUE; /*! This is a convenience static function that returns an existing file @@ -3457,8 +3457,8 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, TQString *selectedFilter, bool resolveSymlinks ) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -3494,15 +3494,15 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, false ).first(); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetOpenFileNames(filter, startWith.isEmpty() ? 0 : workingDirectory, @@ -3534,7 +3534,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -3588,8 +3588,8 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, TQString *selectedFilter, bool resolveSymlinks) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -3619,15 +3619,15 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, *workingDirectory = ::toRootIfNotExists( TQDir::currentDirPath() ); #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetSaveFileName( initialSelection, filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetSaveFileName(initialSelection, filter, startWith.isEmpty() ? 0 : workingDirectory, parent, name, @@ -3659,7 +3659,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -4504,8 +4504,8 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, bool dirOnly, bool resolveSymlinks) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; makeVariables(); TQString wd; @@ -4520,7 +4520,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, initialDir = dir; } else initialDir = TQString::null; - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getExistingDirectory( initialDir, parent, name, caption ); #elif defined(Q_WS_WIN) TQString initialDir; @@ -4530,7 +4530,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, initialDir = dir; } else initialDir = TQString::null; - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle && dirOnly ) return winGetExistingDirectory( initialDir, parent, name, caption ); #endif #if defined(Q_WS_MAC) @@ -4540,7 +4540,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, if (TQFileInfo(u.path()).isDir()) initialDir = (TQString *)&dir; } - if( qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if( tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) return qt_mac_precomposeFileName(macGetOpenFileNames("", initialDir, parent, name, caption, 0, FALSE, TRUE).first()); @@ -4610,7 +4610,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir, if ( !result.isEmpty() && result.right( 1 ) != "/" ) result += "/"; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return result; } @@ -5664,8 +5664,8 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, TQString *selectedFilter, bool resolveSymlinks ) { - bool save_qt_resolve_symlinks = qt_resolve_symlinks; - qt_resolve_symlinks = resolveSymlinks; + bool save_qt_resolve_symlinks = tqt_resolve_symlinks; + tqt_resolve_symlinks = resolveSymlinks; TQStringList filters; if ( !filter.isEmpty() ) @@ -5687,13 +5687,13 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, } #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); #elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) + if ( tqt_use_native_dialogs && tqApp->style().styleHint( TQStyle::SH_GUIStyle ) == WindowsStyle ) return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); #elif defined(Q_WS_MAC) - if (qt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) + if (tqt_use_native_dialogs && (tqApp->style().inherits(TQMAC_DEFAULT_STYLE) || tqApp->style().inherits("TQMacStyle"))) { TQStringList sl = macGetOpenFileNames(filter, dir.isEmpty() ? 0 : workingDirectory, parent, name, caption, selectedFilter); @@ -5730,7 +5730,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter, } delete dlg; - qt_resolve_symlinks = save_qt_resolve_symlinks; + tqt_resolve_symlinks = save_qt_resolve_symlinks; return lst; } diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp index 48ecb3d61..2dcf7b530 100644 --- a/src/dialogs/qfontdialog.cpp +++ b/src/dialogs/qfontdialog.cpp @@ -391,13 +391,13 @@ TQFont TQFontDialog::getFont( bool *ok, TQWidget *parent,const char* name) return getFont( ok, 0, parent, name ); } -extern bool qt_use_native_dialogs; +extern bool tqt_use_native_dialogs; TQFont TQFontDialog::getFont( bool *ok, const TQFont *def, TQWidget *parent, const char* name) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::getFont( ok, def, parent, name ); #endif TQFont result; diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp index 7b285da97..905a6da00 100644 --- a/src/dialogs/qinputdialog.cpp +++ b/src/dialogs/qinputdialog.cpp @@ -231,7 +231,7 @@ void TQInputDialog::setType( Type t ) break; default: #if defined(QT_CHECK_STATE) - qWarning( "TQInputDialog::setType: Invalid type" ); + tqWarning( "TQInputDialog::setType: Invalid type" ); #endif break; } diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index 96aabc066..b27ce1a82 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -61,7 +61,7 @@ #include "private/qtkdeintegration_x11_p.h" #endif -extern bool qt_use_native_dialogs; +extern bool tqt_use_native_dialogs; // Internal class - don't touch @@ -614,7 +614,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) if ( (button2 && !button1) || (button1 && !button0) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMessageBox: Inconsistent button parameters" ); + tqWarning( "TQMessageBox: Inconsistent button parameters" ); #endif button0 = button1 = button2 = 0; } @@ -634,7 +634,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) if ( (b & Default) ) { if ( mbd->defButton >= 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMessageBox: There can be at most one " + tqWarning( "TQMessageBox: There can be at most one " "default button" ); #endif } else { @@ -644,7 +644,7 @@ void TQMessageBox::init( int button0, int button1, int button2 ) if ( (b & Escape) ) { if ( mbd->escButton >= 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMessageBox: There can be at most one " + tqWarning( "TQMessageBox: There can be at most one " "escape button" ); #endif } else { @@ -657,13 +657,13 @@ void TQMessageBox::init( int button0, int button1, int button2 ) b = Ok; } else if ( b < 0 || b > LastButton ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMessageBox: Invalid button specifier" ); + tqWarning( "TQMessageBox: Invalid button specifier" ); #endif b = Ok; } else { if ( i > 0 && mbd->button[i-1] == 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMessageBox: Inconsistent button parameters; " + tqWarning( "TQMessageBox: Inconsistent button parameters; " "button %d defined but not button %d", i+1, i ); #endif @@ -1121,7 +1121,7 @@ int TQMessageBox::information( TQWidget *parent, int button0, int button1, int button2 ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::information( parent, caption, text, button0, button1, button2 ); #endif TQMessageBox *mb = new TQMessageBox( caption, text, Information, @@ -1172,7 +1172,7 @@ int TQMessageBox::question( TQWidget *parent, int button0, int button1, int button2 ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::question( parent, caption, text, button0, button1, button2 ); #endif TQMessageBox *mb = new TQMessageBox( caption, text, Question, @@ -1224,7 +1224,7 @@ int TQMessageBox::warning( TQWidget *parent, int button0, int button1, int button2 ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::warning( parent, caption, text, button0, button1, button2 ); #endif TQMessageBox *mb = new TQMessageBox( caption, text, Warning, @@ -1276,7 +1276,7 @@ int TQMessageBox::critical( TQWidget *parent, int button0, int button1, int button2 ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::critical( parent, caption, text, button0, button1, button2 ); #endif TQMessageBox *mb = new TQMessageBox( caption, text, Critical, @@ -1427,7 +1427,7 @@ int TQMessageBox::information( TQWidget *parent, const TQString &caption, int escapeButtonNumber ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::information( parent, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); #endif @@ -1474,7 +1474,7 @@ int TQMessageBox::question( TQWidget *parent, const TQString &caption, int escapeButtonNumber ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::question( parent, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); #endif @@ -1523,7 +1523,7 @@ int TQMessageBox::warning( TQWidget *parent, const TQString &caption, int escapeButtonNumber ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::warning( parent, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); #endif @@ -1568,7 +1568,7 @@ int TQMessageBox::critical( TQWidget *parent, const TQString &caption, int escapeButtonNumber ) { #if defined(Q_WS_X11) - if ( qt_use_native_dialogs && TQKDEIntegration::enabled()) + if ( tqt_use_native_dialogs && TQKDEIntegration::enabled()) return TQKDEIntegration::critical( parent, caption, text, button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); #endif diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index f46d1a5e6..57eb2d0fe 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -404,7 +404,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) j++; // that's our default printer defaultPrinter = - qstrdup( printerDesc.mid( i, j-i ).ascii() ); + tqstrdup( printerDesc.mid( i, j-i ).ascii() ); printerName = ""; printerDesc = ""; } else if ( printerName == TQString::fromLatin1("_all") ) { @@ -807,7 +807,7 @@ static char * parseCupsOutput( TQListView * printers ) perhapsAddPrinter( printers, d[n].name, TQPrintDialog::tr("Unknown Location"), 0 ); if ( d[n].is_default && !defaultPrinter ) - defaultPrinter = qstrdup( d[n].instance ); + defaultPrinter = tqstrdup( d[n].instance ); n++; } } @@ -977,7 +977,7 @@ void TQPrintDialog::setGlobalPrintDialog( TQPrintDialog *pd ) if ( oldPd ) delete oldPd; else - qAddPostRoutine( qpd_cleanup_globaldialog ); + tqAddPostRoutine( qpd_cleanup_globaldialog ); globalPrintDialog->adjustSize(); } @@ -1375,7 +1375,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w ) #ifndef QT_NO_WIDGET_TOPEXTRA globalPrintDialog->setCaption( TQPrintDialog::tr( "Setup Printer" ) ); #endif - qAddPostRoutine( qpd_cleanup_globaldialog ); + tqAddPostRoutine( qpd_cleanup_globaldialog ); globalPrintDialog->setPrinter( p, TRUE ); globalPrintDialog->adjustSize(); } else { diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index fe5168a03..87560add1 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -456,7 +456,7 @@ void TQProgressDialog::setBar( TQProgressBar *bar ) { if ( progress() > 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQProgrssDialog::setBar: Cannot set a new progress bar " + tqWarning( "TQProgrssDialog::setBar: Cannot set a new progress bar " "while the old one is active" ); #endif } diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp index 8ab1d13c2..30720e831 100644 --- a/src/dialogs/qwizard.cpp +++ b/src/dialogs/qwizard.cpp @@ -264,7 +264,7 @@ void TQWizard::addPage( TQWidget * page, const TQString & title ) return; if ( d->page( page ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQWizard::addPage(): already added %s/%s to %s/%s", + tqWarning( "TQWizard::addPage(): already added %s/%s to %s/%s", page->className(), page->name(), className(), name() ); #endif @@ -293,7 +293,7 @@ void TQWizard::insertPage( TQWidget * page, const TQString & title, int index ) return; if ( d->page( page ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQWizard::insertPage(): already added %s/%s to %s/%s", + tqWarning( "TQWizard::insertPage(): already added %s/%s to %s/%s", page->className(), page->name(), className(), name() ); #endif diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp index a14684b0c..8d1422120 100644 --- a/src/iconview/qiconview.cpp +++ b/src/iconview/qiconview.cpp @@ -6223,7 +6223,7 @@ void TQIconView::updateItemContainer( TQIconViewItem *item ) if ( !c ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQIconViewItem::updateItemContainer(): No fitting container found!" ); + tqWarning( "TQIconViewItem::updateItemContainer(): No fitting container found!" ); #endif return; } diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp index e0264697f..7f743d76f 100644 --- a/src/inputmethod/qinputcontextfactory.cpp +++ b/src/inputmethod/qinputcontextfactory.cpp @@ -64,8 +64,8 @@ static void create_manager() #ifdef QT_THREAD_SUPPORT // protect manager creation - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &manager ) : 0); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &manager ) : 0); // we check the manager pointer again to make sure that another thread // has not created the manager before us. diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index b2e511871..604f5984c 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -147,12 +147,12 @@ typedef struct _XGC *GC; typedef struct _XRegion *Region; typedef unsigned long WId; -Q_EXPORT Display *qt_xdisplay(); -Q_EXPORT int qt_xscreen(); -Q_EXPORT WId qt_xrootwin(); // ### REMOVE 4.0 -Q_EXPORT WId qt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 -Q_EXPORT GC qt_xget_readonly_gc( int scrn, bool monochrome ); -Q_EXPORT GC qt_xget_temp_gc( int scrn, bool monochrome ); +Q_EXPORT Display *tqt_xdisplay(); +Q_EXPORT int tqt_xscreen(); +Q_EXPORT WId tqt_xrootwin(); // ### REMOVE 4.0 +Q_EXPORT WId tqt_xrootwin( int scrn ); // ### 4.0 add default arg of -1 +Q_EXPORT GC tqt_xget_readonly_gc( int scrn, bool monochrome ); +Q_EXPORT GC tqt_xget_temp_gc( int scrn, bool monochrome ); Q_EXPORT const char *tqAppClass(); // get application class @@ -185,8 +185,8 @@ Q_EXPORT const char *tqAppName(); // get application name // Misc functions typedef void (*TQtCleanUpFunction)(); -Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction ); -Q_EXPORT void qRemovePostRoutine( TQtCleanUpFunction ); +Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction ); +Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction ); #if !defined(QT_CLEAN_NAMESPACE) // source compatibility with TQt 2.x diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp index bf1851991..b0f0e8beb 100644 --- a/src/kernel/qabstractlayout.cpp +++ b/src/kernel/qabstractlayout.cpp @@ -606,7 +606,7 @@ TQLayout::TQLayout( TQWidget *parent, int margin, int spacing, const char *name init(); if ( parent ) { if ( parent->layout() ) { - qWarning( "TQLayout \"%s\" added to %s \"%s\", which already has a" + tqWarning( "TQLayout \"%s\" added to %s \"%s\", which already has a" " layout", TQObject::name(), parent->className(), parent->name() ); parent->removeChild( this ); @@ -1063,7 +1063,7 @@ void TQLayout::addChildLayout( TQLayout *l ) { if ( l->parent() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQLayout::addChildLayout: layout already has a parent" ); + tqWarning( "TQLayout::addChildLayout: layout already has a parent" ); #endif return; } @@ -1189,7 +1189,7 @@ bool TQLayout::activate() TQWidget *mw = mainWidget(); if (!mw) { #if defined( QT_CHECK_NULL ) - qWarning( "TQLayout::activate: %s \"%s\" does not have a main widget", + tqWarning( "TQLayout::activate: %s \"%s\" does not have a main widget", TQObject::className(), TQObject::name() ); #endif return FALSE; diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp index 5e34f6ce0..3f7619916 100644 --- a/src/kernel/qaccel.cpp +++ b/src/kernel/qaccel.cpp @@ -210,7 +210,7 @@ static bool qt_accel_no_shortcuts = TRUE; #else static bool qt_accel_no_shortcuts = FALSE; #endif -void Q_EXPORT qt_setAccelAutoShortcuts(bool b) { qt_accel_no_shortcuts = b; } +void Q_EXPORT tqt_setAccelAutoShortcuts(bool b) { qt_accel_no_shortcuts = b; } /* \internal @@ -576,7 +576,7 @@ TQAccel::TQAccel( TQWidget *parent, const char *name ) d->watch = parent; #if defined(QT_CHECK_NULL) if ( !d->watch ) - qWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); + tqWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); #endif } @@ -594,7 +594,7 @@ TQAccel::TQAccel( TQWidget* watch, TQObject *parent, const char *name ) d->watch = watch; #if defined(QT_CHECK_NULL) if ( !d->watch ) - qWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); + tqWarning( "TQAccel: An accelerator must have a parent or a watch widget" ); #endif } diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp index fdf7e93b7..d87b8e689 100644 --- a/src/kernel/qaccessible.cpp +++ b/src/kernel/qaccessible.cpp @@ -385,7 +385,7 @@ TQRESULT TQAccessible::queryAccessibleInterface( TQObject *object, TQAccessibleI if ( !qAccessibleManager ) { qAccessibleManager = new TQPluginManager<TQAccessibleFactoryInterface>( IID_QAccessibleFactory, TQApplication::libraryPaths(), "/accessible" ); if ( !cleanupAdded ) { - qAddPostRoutine( qAccessibleCleanup ); + tqAddPostRoutine( qAccessibleCleanup ); cleanupAdded = TRUE; } } @@ -652,7 +652,7 @@ TQAccessibleObject::TQAccessibleObject( TQObject *object ) if ( !qAccessibleInterface ) { qAccessibleInterface = new AccessibleCache; if ( !cleanupAdded ) { - qAddPostRoutine( qAccessibleCleanup ); + tqAddPostRoutine( qAccessibleCleanup ); cleanupAdded = TRUE; } } @@ -703,7 +703,7 @@ TQObject *TQAccessibleObject::object() const { #if defined(QT_CHECK_RANGE) if ( !isValid() ) - qWarning( "TQAccessibleInterface is invalid. Crash pending..." ); + tqWarning( "TQAccessibleInterface is invalid. Crash pending..." ); #endif return object_; } diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index 149048905..8cc05071f 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -351,8 +351,8 @@ int TQApplication::mouse_double_click_time = 400; // mouse dbl click limit int TQApplication::wheel_scroll_lines = 3; // number of lines to scroll #endif bool qt_is_gui_used; -bool Q_EXPORT qt_resolve_symlinks = TRUE; -bool Q_EXPORT qt_tab_all_widgets = TRUE; +bool Q_EXPORT tqt_resolve_symlinks = TRUE; +bool Q_EXPORT tqt_tab_all_widgets = TRUE; TQRect qt_maxWindowRect; static int drag_time = 500; static int drag_distance = 4; @@ -377,7 +377,7 @@ int TQApplication::composedUnicode = 0; TQMutex *TQApplication::qt_mutex = 0; static TQMutex *postevent_mutex = 0; static TQt::HANDLE qt_application_thread_id = 0; -Q_EXPORT TQt::HANDLE qt_get_application_thread_id() +Q_EXPORT TQt::HANDLE tqt_get_application_thread_id() { return qt_application_thread_id; } @@ -438,12 +438,12 @@ static TQVFuncList *postRList = 0; // list of post routines void init_ptr() { global_ptr = new int[100]; // allocate data - qAddPostRoutine( cleanup_ptr ); // delete later + tqAddPostRoutine( cleanup_ptr ); // delete later } \endcode Note that for an application- or module-wide cleanup, - qAddPostRoutine() is often not suitable. People have a tendency to + tqAddPostRoutine() is often not suitable. People have a tendency to make such modules dynamically loaded, and then unload those modules long before the TQApplication destructor is called, for example. @@ -477,7 +477,7 @@ static TQVFuncList *postRList = 0; // list of post routines to clean up the module's data at the exact right moment. */ -Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction p) +Q_EXPORT void tqAddPostRoutine( TQtCleanUpFunction p) { if ( !postRList ) { postRList = new TQVFuncList; @@ -487,7 +487,7 @@ Q_EXPORT void qAddPostRoutine( TQtCleanUpFunction p) } -Q_EXPORT void qRemovePostRoutine( TQtCleanUpFunction p ) +Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p ) { if ( !postRList ) return; TQVFuncList::Iterator it = postRList->begin(); @@ -862,7 +862,7 @@ TQApplication::TQApplication( Display* dpy, HANDLE visual, HANDLE colormap ) if ( ! dpy ) { #ifdef QT_CHECK_STATE - qWarning( "TQApplication: invalid Display* argument." ); + tqWarning( "TQApplication: invalid Display* argument." ); #endif // QT_CHECK_STATE qt_init( &aargc, aargv, GuiClient ); @@ -903,7 +903,7 @@ TQApplication::TQApplication(Display *dpy, int argc, char **argv, if ( ! dpy ) { #ifdef QT_CHECK_STATE - qWarning( "TQApplication: invalid Display* argument." ); + tqWarning( "TQApplication: invalid Display* argument." ); #endif // QT_CHECK_STATE qt_init( &argc, argv, GuiClient ); @@ -933,7 +933,7 @@ void TQApplication::init_precmdline() #endif #if defined(QT_CHECK_STATE) if ( tqApp ) - qWarning( "TQApplication: There should be max one application object" ); + tqWarning( "TQApplication: There should be max one application object" ); #endif tqApp = (TQApplication*)this; } @@ -1106,7 +1106,7 @@ TQApplication::~TQApplication() is_app_running = FALSE; if ( widgetCount ) { - qDebug( "Widgets left: %i Max widgets: %i \n", TQWidget::instanceCounter, TQWidget::maxInstances ); + tqDebug( "Widgets left: %i Max widgets: %i \n", TQWidget::instanceCounter, TQWidget::maxInstances ); } #ifndef QT_NO_SESSIONMANAGER delete session_manager; @@ -1214,7 +1214,7 @@ TQStyle& TQApplication::style() if ( app_style ) return *app_style; if ( !qt_is_gui_used ) - qFatal( "No style available in non-gui applications!" ); + tqFatal( "No style available in non-gui applications!" ); #if defined(Q_WS_X11) if(!qt_style_override) @@ -1262,7 +1262,7 @@ TQStyle& TQApplication::style() && !(app_style = TQStyleFactory::create( TQStyleFactory::keys()[0] ) ) #endif ) - qFatal( "No %s style available!", style.latin1() ); + tqFatal( "No %s style available!", style.latin1() ); } TQPalette app_pal_copy ( *app_pal ); @@ -1500,7 +1500,7 @@ void TQApplication::setColorSpec( int spec ) { #if defined(QT_CHECK_STATE) if ( tqApp ) { - qWarning( "TQApplication::setColorSpec: This function must be " + tqWarning( "TQApplication::setColorSpec: This function must be " "called before the TQApplication object is created" ); } #endif @@ -1723,7 +1723,7 @@ TQStringList TQApplication::libraryPaths() { if ( !app_libpaths ) { app_libpaths = new TQStringList; - TQString installPathPlugins = TQString::fromLocal8Bit(qInstallPathPlugins()); + TQString installPathPlugins = TQString::fromLocal8Bit(tqInstallPathPlugins()); if ( TQFile::exists(installPathPlugins) ) { #ifdef Q_WS_WIN installPathPlugins.replace('\\', '/'); @@ -1742,7 +1742,7 @@ TQStringList TQApplication::libraryPaths() #endif if (!app_location.isEmpty()) { app_location.truncate( app_location.findRev( '/' ) ); - if ( app_location != qInstallPathPlugins() && TQFile::exists( app_location ) ) + if ( app_location != tqInstallPathPlugins() && TQFile::exists( app_location ) ) app_libpaths->append( app_location ); } } @@ -1822,7 +1822,7 @@ TQPalette TQApplication::palette(const TQWidget* w) { #if defined(QT_CHECK_STATE) if ( !tqApp ) - qWarning( "TQApplication::palette: This function can only be " + tqWarning( "TQApplication::palette: This function can only be " "called after the TQApplication object has been created" ); #endif if ( !app_pal ) { @@ -2319,7 +2319,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e ) if ( receiver == 0 ) { // serious error #if defined(QT_CHECK_NULL) - qWarning( "TQApplication::notify: Unexpected null receiver" ); + tqWarning( "TQApplication::notify: Unexpected null receiver" ); #endif return FALSE; } @@ -3098,7 +3098,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event ) { if ( receiver == 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQApplication::postEvent: Unexpected null receiver" ); + tqWarning( "TQApplication::postEvent: Unexpected null receiver" ); #endif delete event; return; @@ -3412,7 +3412,7 @@ void TQApplication::removePostedEvent( TQEvent * event ) if ( !globalPostedEvents ) { #if defined(QT_DEBUG) - qDebug( "TQApplication::removePostedEvent: %p %d is posted: impossible", + tqDebug( "TQApplication::removePostedEvent: %p %d is posted: impossible", (void*)event, event->type() ); return; #endif @@ -3493,7 +3493,7 @@ void TQApplication::removePostedEvent( TQEvent * event ) n = "<other>"; break; } - qWarning("TQEvent: Warning: %s event deleted while posted to %s %s", + tqWarning("TQEvent: Warning: %s event deleted while posted to %s %s", n, pe->receiver ? pe->receiver->className() : "null", pe->receiver ? pe->receiver->name() : "object" ); diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h index 400ad84be..ae7568b8e 100644 --- a/src/kernel/qapplication_p.h +++ b/src/kernel/qapplication_p.h @@ -65,7 +65,7 @@ class TQKeyEvent; class TQMouseEvent; class TQWheelEvent; -extern Q_EXPORT bool qt_modal_state(); +extern Q_EXPORT bool tqt_modal_state(); extern Q_EXPORT void qt_enter_modal( TQWidget* ); extern Q_EXPORT void qt_leave_modal( TQWidget* ); diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index 72e29b148..ccb02c735 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -131,7 +131,7 @@ extern "C" Bool XftInitFtLibrary(void); extern "C" char *_Xsetlocale(int category, const char *locale); char *_Xsetlocale(int category, const char *locale) { - //qDebug("_Xsetlocale(%d,%s),category,locale"); + //tqDebug("_Xsetlocale(%d,%s),category,locale"); return setlocale(category,locale); } # endif // setlocale @@ -217,9 +217,9 @@ static GC* app_gc_tmp = 0; // temporary GC static GC* app_gc_ro_m = 0; // read-only GC (monochrome) static GC* app_gc_tmp_m = 0; // temporary GC (monochrome) // symbols needed by extern TQXEmbed class -Q_EXPORT Atom qt_wm_protocols = 0; // window manager protocols -Q_EXPORT Atom qt_wm_delete_window = 0; // delete window protocol -Q_EXPORT Atom qt_wm_take_focus = 0; // take focus window protocol +Q_EXPORT Atom tqt_wm_protocols = 0; // window manager protocols +Q_EXPORT Atom tqt_wm_delete_window = 0; // delete window protocol +Q_EXPORT Atom tqt_wm_take_focus = 0; // take focus window protocol Atom qt_qt_scrolldone = 0; // scroll synchronization Atom qt_net_wm_context_help = 0; // context help @@ -230,15 +230,15 @@ Atom qt_xa_clipboard = 0; Atom qt_selection_property = 0; Atom qt_clipboard_sentinel = 0; Atom qt_selection_sentinel = 0; -Q_EXPORT Atom qt_wm_state = 0; +Q_EXPORT Atom tqt_wm_state = 0; Atom qt_wm_change_state = 0; static Atom qt_settings_timestamp = 0; // TQt >=3 settings timestamp static Atom qt_input_encoding = 0; // TQt desktop properties static Atom qt_resource_manager = 0; // X11 Resource manager Atom qt_sizegrip = 0; // sizegrip Atom qt_wm_client_leader = 0; -Q_EXPORT Atom qt_window_role = 0; -Q_EXPORT Atom qt_sm_client_id = 0; +Q_EXPORT Atom tqt_window_role = 0; +Q_EXPORT Atom tqt_sm_client_id = 0; Atom qt_xa_motif_wm_hints = 0; Atom qt_cde_running = 0; Atom qt_twin_running = 0; @@ -331,7 +331,7 @@ static int xrandr_eventbase; // TRUE if TQt is compiled w/ XRender support and XRender exists on the connected // Display -Q_EXPORT bool qt_use_xrender = FALSE; +Q_EXPORT bool tqt_use_xrender = FALSE; #ifndef QT_NO_XSYNC // True if SYNC extension exists on the connected display @@ -350,7 +350,7 @@ static long qt_mode_switch_remove_mask = 0; // flags for extensions for special Languages, currently only for RTL languages static bool qt_use_rtl_extensions = FALSE; -Q_EXPORT bool qt_hebrew_keyboard_hack = FALSE; +Q_EXPORT bool tqt_hebrew_keyboard_hack = FALSE; static Window mouseActWindow = 0; // window where mouse is static int mouseButtonPressed = 0; // last mouse button pressed @@ -406,10 +406,10 @@ static uint appliedstamp = 0; typedef int (*QX11EventFilter) (XEvent*); -QX11EventFilter qt_set_x11_event_filter(QX11EventFilter filter); +QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter); static QX11EventFilter qt_x11_event_filter = 0; -Q_EXPORT QX11EventFilter qt_set_x11_event_filter(QX11EventFilter filter) +Q_EXPORT QX11EventFilter tqt_set_x11_event_filter(QX11EventFilter filter) { QX11EventFilter old_filter = qt_x11_event_filter; qt_x11_event_filter = filter; @@ -436,8 +436,8 @@ static XIMStyle xim_default_style = XIMPreeditCallbacks | XIMStatusNothing; int qt_ximComposingKeycode=0; TQTextCodec * qt_input_mapper = 0; -Q_EXPORT Time qt_x_time = CurrentTime; -Q_EXPORT Time qt_x_user_time = CurrentTime; +Q_EXPORT Time tqt_x_time = CurrentTime; +Q_EXPORT Time tqt_x_user_time = CurrentTime; extern bool qt_check_clipboard_sentinel(); //def in qclipboard_x11.cpp extern bool qt_check_selection_sentinel(); //def in qclipboard_x11.cpp @@ -497,7 +497,7 @@ extern bool qt_app_has_font; static bool qt_x11_cmdline_font = false; -extern bool qt_resolve_symlinks; // from qapplication.cpp +extern bool tqt_resolve_symlinks; // from qapplication.cpp // Paint event clipping magic extern void qt_set_paintevent_clipping( TQPaintDevice* dev, const TQRegion& region); @@ -520,7 +520,7 @@ void qt_deferred_map_add( TQWidget* w) { if ( !deferred_map_list ) { deferred_map_list = new TQPtrList<TQWidget>; - qAddPostRoutine( qt_deferred_map_cleanup ); + tqAddPostRoutine( qt_deferred_map_cleanup ); } deferred_map_list->append( w ); } @@ -788,7 +788,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err ) char errstr[256]; XGetErrorText( dpy, err->error_code, errstr, 256 ); - qWarning( "X Error: %s %d\n" + tqWarning( "X Error: %s %d\n" " Major opcode: %d\n" " Minor opcode: %d\n" " Resource id: 0x%lx", @@ -806,7 +806,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err ) static int qt_xio_errhandler( Display * ) { - qWarning( "%s: Fatal IO error: client killed", appName ); + tqWarning( "%s: Fatal IO error: client killed", appName ); tqApp = 0; exit( 1 ); //### give the application a chance for a proper shutdown instead, @@ -866,7 +866,7 @@ static void qt_x11_process_intern_atoms() while( it.current() ) { res[i] = 0; resp[i] = it.current(); - names[i] = qstrdup(it.currentKey()); + names[i] = tqstrdup(it.currentKey()); i++; ++it; } @@ -1105,7 +1105,7 @@ bool TQApplication::x11_apply_settings() qt_broken_wm = settings.readBoolEntry("/qt/brokenWindowManager", qt_broken_wm); - qt_resolve_symlinks = + tqt_resolve_symlinks = settings.readBoolEntry("/qt/resolveSymlinks", TRUE); qt_use_rtl_extensions = @@ -1184,7 +1184,7 @@ static void qt_set_input_encoding() qt_input_mapper = TQTextCodec::codecForLocale(); } else { - if ( !qstricmp( data, "locale" ) ) + if ( !tqstricmp( data, "locale" ) ) qt_input_mapper = TQTextCodec::codecForLocale(); else qt_input_mapper = TQTextCodec::codecForName( data ); @@ -1562,7 +1562,7 @@ void qt_x11_create_wm_client_leader() TQCString session = tqApp->sessionId().latin1(); if ( !session.isEmpty() ) { XChangeProperty( TQPaintDevice::x11AppDisplay(), - qt_x11_wm_client_leader, qt_sm_client_id, + qt_x11_wm_client_leader, tqt_sm_client_id, XA_STRING, 8, PropModeReplace, (unsigned char *)session.data(), session.length() ); } @@ -1658,11 +1658,11 @@ void qt_init_internal( int *argcptr, char **argv, appDpy = display; // Set application name and class - appName = qstrdup( "TQt-subapplication" ); + appName = tqstrdup( "TQt-subapplication" ); char *app_class = 0; if (argv) { const char* p = strrchr( argv[0], '/' ); - app_class = qstrdup(p ? p + 1 : argv[0]); + app_class = tqstrdup(p ? p + 1 : argv[0]); if (app_class[0]) app_class[0] = toupper(app_class[0]); } @@ -1686,7 +1686,7 @@ void qt_init_internal( int *argcptr, char **argv, if (argv) { const char *p = strrchr( argv[0], '/' ); appName = p ? p + 1 : argv[0]; - app_class = qstrdup(appName); + app_class = tqstrdup(appName); if (app_class[0]) app_class[0] = toupper(app_class[0]); } @@ -1795,7 +1795,7 @@ void qt_init_internal( int *argcptr, char **argv, } if ( s == "gdb" ) { appNoGrab = TRUE; - qDebug( "TQt: gdb: -nograb added to command-line options.\n" + tqDebug( "TQt: gdb: -nograb added to command-line options.\n" "\t Use the -dograb option to enforce grabbing." ); } f.close(); @@ -1806,7 +1806,7 @@ void qt_init_internal( int *argcptr, char **argv, if( qt_is_gui_used ) { if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) { - qWarning( "%s: cannot connect to X server %s", appName, + tqWarning( "%s: cannot connect to X server %s", appName, XDisplayName(appDpyName) ); tqApp = 0; exit( 1 ); @@ -1846,7 +1846,7 @@ void qt_init_internal( int *argcptr, char **argv, int screen; TQString serverVendor( ServerVendor( appDpy) ); if (serverVendor.contains("XFree86") && VendorRelease(appDpy) < 40300000) - qt_hebrew_keyboard_hack = TRUE; + tqt_hebrew_keyboard_hack = TRUE; for ( screen = 0; screen < appScreenCount; ++screen ) { TQPaintDevice::x_appdepth_arr[ screen ] = DefaultDepth(appDpy, screen); @@ -2091,7 +2091,7 @@ void qt_init_internal( int *argcptr, char **argv, XRenderPictFormat *format = XRenderFindVisualFormat(appDpy, (Visual *) TQPaintDevice::x_appvisual); - qt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8); + tqt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8); } #endif // QT_NO_XRENDER @@ -2113,15 +2113,15 @@ void qt_init_internal( int *argcptr, char **argv, #if !defined(QT_NO_XFTFREETYPE) // defined in qfont_x11.cpp - extern bool qt_has_xft; + extern bool tqt_has_xft; #ifndef QT_XFT2 - if (!qt_use_xrender) - qt_has_xft = FALSE; + if (!tqt_use_xrender) + tqt_has_xft = FALSE; else #endif - qt_has_xft = XftInit(0) && XftInitFtLibrary(); + tqt_has_xft = XftInit(0) && XftInitFtLibrary(); - if (qt_has_xft) { + if (tqt_has_xft) { char *dpi_str = XGetDefault(appDpy, "Xft", "dpi"); if (dpi_str) { // use a custom DPI @@ -2272,7 +2272,7 @@ void qt_init_internal( int *argcptr, char **argv, devices = XListInputDevices( appDpy, &ndev); if ( devices == NULL ) { - qWarning( "Failed to get list of devices" ); + tqWarning( "Failed to get list of devices" ); ndev = -1; } dev = NULL; @@ -2305,7 +2305,7 @@ void qt_init_internal( int *argcptr, char **argv, ev_class = event_list_eraser; } if ( dev == NULL ) { - qWarning( "Failed to open device" ); + tqWarning( "Failed to open device" ); } else { if ( dev->num_classes > 0 ) { for ( ip = dev->classes, j = 0; j < devs->num_classes; @@ -2401,7 +2401,7 @@ void qt_init_internal( int *argcptr, char **argv, tqApp->setDefaultCodec(codec); } - qt_resolve_symlinks = + tqt_resolve_symlinks = settings.readBoolEntry("/qt/resolveSymlinks", TRUE); } } @@ -2605,7 +2605,7 @@ bool qt_wstate_iconified( WId winid ) int format; unsigned long length, after; uchar *data; - int r = XGetWindowProperty( appDpy, winid, qt_wm_state, 0, 2, + int r = XGetWindowProperty( appDpy, winid, tqt_wm_state, 0, 2, False, AnyPropertyType, &type, &format, &length, &after, &data ); bool iconic = FALSE; @@ -2628,23 +2628,23 @@ const char *tqAppClass() // get application class return appClass; } -Display *qt_xdisplay() // get current X display +Display *tqt_xdisplay() // get current X display { return appDpy; } -int qt_xscreen() // get current X screen +int tqt_xscreen() // get current X screen { return appScreen; } // ### REMOVE 4.0 -WId qt_xrootwin() // get X root window +WId tqt_xrootwin() // get X root window { return TQPaintDevice::x11AppRootWindow(); } -WId qt_xrootwin( int scrn ) // get X root window for screen +WId tqt_xrootwin( int scrn ) // get X root window for screen { return TQPaintDevice::x11AppRootWindow( scrn ); } @@ -2686,10 +2686,10 @@ static GC create_gc( int scrn, bool monochrome ) return gc; } -GC qt_xget_readonly_gc( int scrn, bool monochrome ) // get read-only GC +GC tqt_xget_readonly_gc( int scrn, bool monochrome ) // get read-only GC { if ( scrn < 0 || scrn >= appScreenCount ) { - qDebug("invalid screen %d %d", scrn, appScreenCount ); + tqDebug("invalid screen %d %d", scrn, appScreenCount ); TQWidget* bla = 0; bla->setName("hello"); } @@ -2710,10 +2710,10 @@ GC qt_xget_readonly_gc( int scrn, bool monochrome ) // get read-only GC return gc; } -GC qt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC +GC tqt_xget_temp_gc( int scrn, bool monochrome ) // get temporary GC { if ( scrn < 0 || scrn >= appScreenCount ) { - qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); + tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount ); TQWidget* bla = 0; bla->setName("hello"); } @@ -2773,7 +2773,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget ) #if defined(QT_CHECK_STATE) if ( mainWidget && mainWidget->parentWidget() && ! mainWidget->parentWidget()->isDesktop() ) - qWarning( "TQApplication::setMainWidget(): New main widget (%s/%s) " + tqWarning( "TQApplication::setMainWidget(): New main widget (%s/%s) " "has a parent!", mainWidget->className(), mainWidget->name() ); #endif @@ -3058,7 +3058,7 @@ TQWidget *TQApplication::widgetAt( int x, int y, bool child ) if ( !w ) { qt_ignore_badwindow(); - target = qt_x11_findClientWindow( target, qt_wm_state, TRUE ); + target = qt_x11_findClientWindow( target, tqt_wm_state, TRUE ); if (qt_badwindow() ) return 0; w = TQWidget::find( (WId)target ); @@ -3217,16 +3217,16 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl { TQETWidget *widget = (TQETWidget*)w; if ( event->xclient.format == 32 && event->xclient.message_type ) { - if ( event->xclient.message_type == qt_wm_protocols ) { + if ( event->xclient.message_type == tqt_wm_protocols ) { Atom a = event->xclient.data.l[0]; - if ( a == qt_wm_delete_window ) { + if ( a == tqt_wm_delete_window ) { if ( passive_only ) return 0; widget->translateCloseEvent(event); } - else if ( a == qt_wm_take_focus ) { + else if ( a == tqt_wm_take_focus ) { TQWidget * amw = activeModalWidget(); - if ( (ulong) event->xclient.data.l[1] > qt_x_time ) - qt_x_time = event->xclient.data.l[1]; + if ( (ulong) event->xclient.data.l[1] > tqt_x_time ) + tqt_x_time = event->xclient.data.l[1]; if ( amw && amw != widget ) { TQWidget* groupLeader = widget; while ( groupLeader && !groupLeader->testWFlags( TQt::WGroupLeader ) @@ -3299,29 +3299,29 @@ int TQApplication::x11ProcessEvent( XEvent* event ) switch ( event->type ) { case ButtonPress: ignoreNextMouseReleaseEvent = FALSE; - qt_x_user_time = event->xbutton.time; + tqt_x_user_time = event->xbutton.time; // fallthrough intended case ButtonRelease: - qt_x_time = event->xbutton.time; + tqt_x_time = event->xbutton.time; break; case MotionNotify: - qt_x_time = event->xmotion.time; + tqt_x_time = event->xmotion.time; break; case XKeyPress: - qt_x_user_time = event->xkey.time; + tqt_x_user_time = event->xkey.time; // fallthrough intended case XKeyRelease: - qt_x_time = event->xkey.time; + tqt_x_time = event->xkey.time; break; case PropertyNotify: - qt_x_time = event->xproperty.time; + tqt_x_time = event->xproperty.time; break; case EnterNotify: case LeaveNotify: - qt_x_time = event->xcrossing.time; + tqt_x_time = event->xcrossing.time; break; case SelectionClear: - qt_x_time = event->xselectionclear.time; + tqt_x_time = event->xselectionclear.time; break; default: break; @@ -3567,7 +3567,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) case XKeyRelease: { if ( keywidget && keywidget->isEnabled() ) { // should always exist - // qDebug( "sending key event" ); + // tqDebug( "sending key event" ); keywidget->translateKeyEvent( event, grabbed ); } break; @@ -3837,7 +3837,7 @@ bool TQApplication::x11EventFilter( XEvent * ) TQWidget *widget A modal widget *****************************************************************************/ -bool qt_modal_state() +bool tqt_modal_state() { return app_do_modal; } @@ -4474,22 +4474,22 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev ) } button = (XDeviceButtonEvent*)ev; /* - qDebug( "\n\nXInput Button Event" ); - qDebug( "serial:\t%d", button->serial ); - qDebug( "send_event:\t%d", button->send_event ); - qDebug( "display:\t%p", button->display ); - qDebug( "window:\t%d", button->window ); - qDebug( "deviceID:\t%d", button->deviceid ); - qDebug( "root:\t%d", button->root ); - qDebug( "subwindot:\t%d", button->subwindow ); - qDebug( "x:\t%d", button->x ); - qDebug( "y:\t%d", button->y ); - qDebug( "x_root:\t%d", button->x_root ); - qDebug( "y_root:\t%d", button->y_root ); - qDebug( "state:\t%d", button->state ); - qDebug( "button:\t%d", button->button ); - qDebug( "same_screen:\t%d", button->same_screen ); - qDebug( "time:\t%d", button->time ); + tqDebug( "\n\nXInput Button Event" ); + tqDebug( "serial:\t%d", button->serial ); + tqDebug( "send_event:\t%d", button->send_event ); + tqDebug( "display:\t%p", button->display ); + tqDebug( "window:\t%d", button->window ); + tqDebug( "deviceID:\t%d", button->deviceid ); + tqDebug( "root:\t%d", button->root ); + tqDebug( "subwindot:\t%d", button->subwindow ); + tqDebug( "x:\t%d", button->x ); + tqDebug( "y:\t%d", button->y ); + tqDebug( "x_root:\t%d", button->x_root ); + tqDebug( "y_root:\t%d", button->y_root ); + tqDebug( "state:\t%d", button->state ); + tqDebug( "button:\t%d", button->button ); + tqDebug( "same_screen:\t%d", button->same_screen ); + tqDebug( "time:\t%d", button->time ); */ curr = TQPoint( button->x, button->y ); } @@ -4675,7 +4675,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) TQEvent e(TQEvent::WindowStateChange); TQApplication::sendSpontaneousEvent(this, &e); } - } else if (event->xproperty.atom == qt_wm_state) { + } else if (event->xproperty.atom == tqt_wm_state) { // the widget frame strut should also be invalidated topData()->fleft = topData()->fright = topData()->ftop = topData()->fbottom = 0; fstrut_dirty = 1; @@ -4699,17 +4699,17 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) // TQPaintDevice::x11AppRootWindow(x11Screen())) check // above - e = XGetWindowProperty(appDpy, winId(), qt_wm_state, 0, 2, False, qt_wm_state, + e = XGetWindowProperty(appDpy, winId(), tqt_wm_state, 0, 2, False, tqt_wm_state, &ret, &format, &nitems, &after, &data ); - if (e == Success && ret == qt_wm_state && format == 32 && nitems > 0) { + if (e == Success && ret == tqt_wm_state && format == 32 && nitems > 0) { long *state = (long *) data; switch (state[0]) { case WithdrawnState: // if we are in the withdrawn state, we are free // to reuse this window provided we remove the // WM_STATE property (ICCCM 4.1.3.1) - XDeleteProperty(appDpy, winId(), qt_wm_state); + XDeleteProperty(appDpy, winId(), tqt_wm_state); // set the parent id to zero, so that show() will // work again @@ -5181,7 +5181,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, keyDict->setAutoDelete( FALSE ); textDict = new TQIntDict<void>( 13 ); textDict->setAutoDelete( FALSE ); - qAddPostRoutine( deleteKeyDicts ); + tqAddPostRoutine( deleteKeyDicts ); } TQWidget* tlw = topLevelWidget(); @@ -5891,7 +5891,7 @@ extern "C" { static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg) { return (event->type == ClientMessage && event->xclient.window == *(Window*)arg - && event->xclient.message_type == qt_wm_protocols + && event->xclient.message_type == tqt_wm_protocols && event->xclient.data.l[ 0 ] == qt_net_wm_sync_request ); } #endif @@ -6375,7 +6375,7 @@ static void sm_performSaveYourself( TQSessionManagerData* smd ) // generate a restart and discard command that makes sense TQStringList restart; restart << tqApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey; - if (qstricmp(tqAppName(), tqAppClass()) != 0) + if (tqstricmp(tqAppName(), tqAppClass()) != 0) restart << "-name" << tqAppName(); sm->setRestartCommand( restart ); TQStringList discard; @@ -6524,7 +6524,7 @@ TQSessionManager::TQSessionManager( TQApplication * app, TQString &id, TQString& TQString error = cerror; if (!smcConnection ) { - qWarning("Session management error: %s", error.latin1() ); + tqWarning("Session management error: %s", error.latin1() ); } else { sm_receiver = new TQSmSocketReceiver( IceConnectionNumber( SmcGetIceConnection( smcConnection ) ) ); diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp index 320e4bd4b..277a2e08f 100644 --- a/src/kernel/qasyncimageio.cpp +++ b/src/kernel/qasyncimageio.cpp @@ -304,7 +304,7 @@ public: gif_decoder_factory = new TQGIFFormatType; #endif qt_init_image_handlers(); - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); } } @@ -438,7 +438,7 @@ TQImageFormatType* TQImageDecoder::format( const char* name ) f; f = TQImageDecoderPrivate::factories->next()) { - if ( qstricmp(name,f->formatName())==0 ) + if ( tqstricmp(name,f->formatName())==0 ) return f; } return 0; diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp index 84912e1ff..0bccc14d8 100644 --- a/src/kernel/qasyncio.cpp +++ b/src/kernel/qasyncio.cpp @@ -187,7 +187,7 @@ bool TQDataSource::rewindable() const is TRUE, then the data source must take measures to allow the rewind() function to subsequently operate as described. If rewindable() is FALSE, the function should call TQDataSource::enableRewind(), which aborts with - a qFatal() error. + a tqFatal() error. For example, a network connection may choose to use a disk cache of input only if rewinding is enabled before the first buffer-full of @@ -196,7 +196,7 @@ bool TQDataSource::rewindable() const */ void TQDataSource::enableRewind( bool /* on */ ) { - qFatal( "Attempted to make unrewindable TQDataSource rewindable" ); + tqFatal( "Attempted to make unrewindable TQDataSource rewindable" ); } /*! @@ -205,7 +205,7 @@ void TQDataSource::enableRewind( bool /* on */ ) */ void TQDataSource::rewind() { - qFatal("Attempted to rewind unrewindable TQDataSource"); + tqFatal("Attempted to rewind unrewindable TQDataSource"); } /*! diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp index 32da6a764..77b1235e7 100644 --- a/src/kernel/qclipboard.cpp +++ b/src/kernel/qclipboard.cpp @@ -72,7 +72,7 @@ // Copy text from the clipboard (paste) TQString text = cb->text(TQClipboard::Clipboard); if ( !text.isNull() ) - qDebug( "The clipboard contains: " + text ); + tqDebug( "The clipboard contains: " + text ); // Copy text into the clipboard cb->setText( "This text can be pasted by other programs", diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index 32f428fcf..b80e86987 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -42,15 +42,15 @@ // #define TQCLIPBOARD_DEBUG_VERBOSE #ifdef TQCLIPBOARD_DEBUG -# define TQDEBUG qDebug +# define TQDEBUG tqDebug #else -# define TQDEBUG if (FALSE) qDebug +# define TQDEBUG if (FALSE) tqDebug #endif #ifdef TQCLIPBOARD_DEBUG_VERBOSE -# define VTQDEBUG qDebug +# define VTQDEBUG tqDebug #else -# define VTQDEBUG if (FALSE) qDebug +# define VTQDEBUG if (FALSE) tqDebug #endif #include "qplatformdefs.h" @@ -85,9 +85,9 @@ // from qapplication_x11.cpp typedef int (*QX11EventFilter) (XEvent*); -extern QX11EventFilter qt_set_x11_event_filter (QX11EventFilter filter); +extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter); -extern Time qt_x_time; // def. in qapplication_x11.cpp +extern Time tqt_x_time; // def. in qapplication_x11.cpp extern Time qt_x_incr; // def. in qapplication_x11.cpp extern Atom qt_xa_clipboard; extern Atom qt_selection_property; @@ -112,7 +112,7 @@ static int pending_timer_id = 0; static bool pending_clipboard_changed = FALSE; static bool pending_selection_changed = FALSE; -Q_EXPORT bool qt_qclipboard_bailout_hack = false; +Q_EXPORT bool tqt_qclipboard_bailout_hack = false; // event capture mechanism for qt_xclb_wait_for_event static bool waiting_for_data = FALSE; @@ -140,7 +140,7 @@ void setupOwner() return; owner = new TQWidget( 0, "internal clipboard owner" ); requestor = new TQWidget(0, "internal clipboard requestor"); - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); } static @@ -239,7 +239,7 @@ static TQClipboardData *clipboardData() if ( internalCbData == 0 ) { internalCbData = new TQClipboardData; TQ_CHECK_PTR( internalCbData ); - qAddPostRoutine( cleanupClipboardData ); + tqAddPostRoutine( cleanupClipboardData ); } return internalCbData; } @@ -261,7 +261,7 @@ static TQClipboardData *selectionData() if (internalSelData == 0) { internalSelData = new TQClipboardData; TQ_CHECK_PTR(internalSelData); - qAddPostRoutine(cleanupSelectionData); + tqAddPostRoutine(cleanupSelectionData); } return internalSelData; } @@ -306,7 +306,7 @@ static int qt_xclb_transation_event_handler(XEvent *event) */ static void qt_xclb_incr_timeout(void) { - qWarning("TQClipboard: timed out while sending data"); + tqWarning("TQClipboard: timed out while sending data"); while (transactions) delete *transactions->begin(); @@ -323,7 +323,7 @@ TQClipboardINCRTransaction::TQClipboardINCRTransaction(Window w, Atom p, Atom t, if (! transactions) { VTQDEBUG("TQClipboard: created INCR transaction map"); transactions = new TransactionMap; - prev_x11_event_filter = qt_set_x11_event_filter(qt_xclb_transation_event_handler); + prev_x11_event_filter = tqt_set_x11_event_filter(qt_xclb_transation_event_handler); incr_timer_id = TQApplication::clipboard()->startTimer(clipboard_timeout); } @@ -341,7 +341,7 @@ TQClipboardINCRTransaction::~TQClipboardINCRTransaction(void) VTQDEBUG("TQClipboard: no more INCR transations"); delete transactions; transactions = 0; - (void)qt_set_x11_event_filter(prev_x11_event_filter); + (void)tqt_set_x11_event_filter(prev_x11_event_filter); if (incr_timer_id != 0) { TQApplication::clipboard()->killTimer(incr_timer_id); @@ -482,19 +482,19 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, if (tqApp->eventLoop()->inherits("TQMotif")) { // yes yes, evil hack, we know if ( waiting_for_data ) - qFatal( "TQClipboard: internal error, qt_xclb_wait_for_event recursed" ); + tqFatal( "TQClipboard: internal error, qt_xclb_wait_for_event recursed" ); waiting_for_data = TRUE; has_captured_event = FALSE; capture_event_win = win; capture_event_type = type; - QX11EventFilter old_event_filter = qt_set_x11_event_filter(qt_xclb_event_filter); + QX11EventFilter old_event_filter = tqt_set_x11_event_filter(qt_xclb_event_filter); do { if ( XCheckTypedWindowEvent(dpy,win,type,event) ) { waiting_for_data = FALSE; - qt_set_x11_event_filter(old_event_filter); + tqt_set_x11_event_filter(old_event_filter); return TRUE; } @@ -510,13 +510,13 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, if ( has_captured_event ) { waiting_for_data = FALSE; *event = captured_event; - qt_set_x11_event_filter(old_event_filter); + tqt_set_x11_event_filter(old_event_filter); return TRUE; } } while ( started.msecsTo(now) < timeout ); waiting_for_data = FALSE; - qt_set_x11_event_filter(old_event_filter); + tqt_set_x11_event_filter(old_event_filter); return FALSE; } @@ -525,7 +525,7 @@ bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, do { if ( XCheckTypedWindowEvent(dpy,win,type,event) ) return TRUE; - if( qt_qclipboard_bailout_hack ) { + if( tqt_qclipboard_bailout_hack ) { XEvent dummy; selection_request_pending = false; if ( owner != NULL ) @@ -1061,7 +1061,7 @@ bool TQClipboard::event( TQEvent *e ) } } else { #ifdef QT_CHECK_STATE - qWarning("TQClipboard: Unknown SelectionClear event received."); + tqWarning("TQClipboard: Unknown SelectionClear event received."); #endif return FALSE; } @@ -1110,7 +1110,7 @@ bool TQClipboard::event( TQEvent *e ) d = clipboardData(); } else { #ifdef QT_CHECK_RANGE - qWarning("TQClipboard: unknown selection '%lx'", req->selection); + tqWarning("TQClipboard: unknown selection '%lx'", req->selection); #endif // QT_CHECK_RANGE XSendEvent(dpy, req->requestor, False, NoEventMask, &event); @@ -1119,7 +1119,7 @@ bool TQClipboard::event( TQEvent *e ) if (! d->source()) { #ifdef QT_CHECK_STATE - qWarning("TQClipboard: cannot transfer data, no data available"); + tqWarning("TQClipboard: cannot transfer data, no data available"); #endif // QT_CHECK_STATE XSendEvent(dpy, req->requestor, False, NoEventMask, &event); @@ -1190,7 +1190,7 @@ bool TQClipboard::event( TQEvent *e ) } else { #ifdef QT_CHECK_STATE - qWarning("TQClipboard: invalid data timestamp"); + tqWarning("TQClipboard: invalid data timestamp"); #endif // QT_CHECK_STATE } } else if (target == xa_targets) { @@ -1262,7 +1262,7 @@ TQClipboardWatcher::TQClipboardWatcher( TQClipboard::Mode mode ) #ifdef QT_CHECK_RANGE default: - qWarning( "TQClipboardWatcher: internal error, unknown clipboard mode" ); + tqWarning( "TQClipboardWatcher: internal error, unknown clipboard mode" ); break; #endif // QT_CHECK_RANGE } @@ -1285,7 +1285,7 @@ bool TQClipboardWatcher::empty() const #ifdef QT_CHECK_STATE if( win == requestor->winId()) { - qWarning( "TQClipboardWatcher::empty: internal error, app owns the selection" ); + tqWarning( "TQClipboardWatcher::empty: internal error, app owns the selection" ); return TRUE; } #endif // QT_CHECK_STATE @@ -1371,10 +1371,10 @@ TQByteArray TQClipboardWatcher::encodedData( const char* fmt ) const Atom fmtatom = 0; - if ( 0==qstricmp(fmt,"text/plain;charset=iso-8859-1") ) { + if ( 0==tqstricmp(fmt,"text/plain;charset=iso-8859-1") ) { // ICCCM section 2.6.2 says STRING is latin1 text fmtatom = XA_STRING; - } else if ( 0==qstricmp(fmt,"text/plain;charset=utf-8") ) { + } else if ( 0==tqstricmp(fmt,"text/plain;charset=utf-8") ) { // proprosed UTF8_STRING conversion type fmtatom = *qt_xdnd_str_to_atom( "UTF8_STRING" ); } else if ( 0==qstrcmp(fmt,"text/plain") ) { @@ -1432,7 +1432,7 @@ TQByteArray TQClipboardWatcher::getDataInFormat(Atom fmtatom) const XSelectInput(dpy, win, NoEventMask); // don't listen for any events XDeleteProperty(dpy, win, qt_selection_property); - XConvertSelection(dpy, atom, fmtatom, qt_selection_property, win, qt_x_time); + XConvertSelection(dpy, atom, fmtatom, qt_selection_property, win, tqt_x_time); XSync(dpy, FALSE); VTQDEBUG("TQClipboardWatcher::getDataInFormat: waiting for SelectionNotify event"); @@ -1476,7 +1476,7 @@ TQMimeSource* TQClipboard::data( Mode mode ) const default: #ifdef QT_CHECK_RANGE - qWarning( "TQClipboard::data: invalid mode '%d'", mode ); + tqWarning( "TQClipboard::data: invalid mode '%d'", mode ); #endif // QT_CHECK_RANGE return 0; } @@ -1526,7 +1526,7 @@ void TQClipboard::setData( TQMimeSource* src, Mode mode ) default: #ifdef QT_CHECK_RANGE - qWarning( "TQClipboard::data: invalid mode '%d'", mode ); + tqWarning( "TQClipboard::data: invalid mode '%d'", mode ); #endif // QT_CHECK_RANGE return; } @@ -1543,12 +1543,12 @@ void TQClipboard::setData( TQMimeSource* src, Mode mode ) newOwner = owner->winId(); d->setSource(src); - d->timestamp = qt_x_time; + d->timestamp = tqt_x_time; } Window prevOwner = XGetSelectionOwner( dpy, atom ); - // use qt_x_time, since d->timestamp == CurrentTime when clearing - XSetSelectionOwner(dpy, atom, newOwner, qt_x_time); + // use tqt_x_time, since d->timestamp == CurrentTime when clearing + XSetSelectionOwner(dpy, atom, newOwner, tqt_x_time); if ( mode == Selection ) emit selectionChanged(); @@ -1557,7 +1557,7 @@ void TQClipboard::setData( TQMimeSource* src, Mode mode ) if (XGetSelectionOwner(dpy, atom) != newOwner) { #ifdef QT_CHECK_STATE - qWarning("TQClipboard::setData: Cannot set X11 selection owner for %s", + tqWarning("TQClipboard::setData: Cannot set X11 selection owner for %s", qt_xdnd_atom_to_str(atom)); #endif // QT_CHECK_STATE diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp index a7f6b30ba..eb345bfd7 100644 --- a/src/kernel/qcolor.cpp +++ b/src/kernel/qcolor.cpp @@ -564,7 +564,7 @@ void TQColor::setNamedColor( const TQString &name ) d.d32.argb = Invalid; d.d32.pix = Dirt; #if defined(QT_CHECK_RANGE) - qWarning( "TQColor::setNamedColor: could not parse color '%s'", + tqWarning( "TQColor::setNamedColor: could not parse color '%s'", name.local8Bit().data() ); #endif } else { @@ -668,7 +668,7 @@ void TQColor::setHsv( int h, int s, int v ) { if ( h < -1 || (uint)s > 255 || (uint)v > 255 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQColor::setHsv: HSV parameters out of range" ); + tqWarning( "TQColor::setHsv: HSV parameters out of range" ); #endif return; } @@ -745,7 +745,7 @@ void TQColor::setRgb( int r, int g, int b ) { if ( (uint)r > 255 || (uint)g > 255 || (uint)b > 255 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQColor::setRgb: RGB parameter(s) out of range" ); + tqWarning( "TQColor::setRgb: RGB parameter(s) out of range" ); #endif return; } diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp index 680737ffc..5db1ffe18 100644 --- a/src/kernel/qcolor_p.cpp +++ b/src/kernel/qcolor_p.cpp @@ -728,7 +728,7 @@ static int __cdecl rgb_cmp( const void *d1, const void *d2 ) static int rgb_cmp( const void *d1, const void *d2 ) #endif { - return qstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name ); + return tqstricmp( ((RGBData *)d1)->name, ((RGBData *)d2)->name ); } #if defined(Q_C_CALLBACKS) diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp index 6be79b40b..67a3912fb 100644 --- a/src/kernel/qcolor_x11.cpp +++ b/src/kernel/qcolor_x11.cpp @@ -640,7 +640,7 @@ void TQColor::setSystemNamedColor( const TQString& name ) } } else if ( !color_init ) { #if defined(QT_CHECK_STATE) - qWarning( "TQColor::setSystemNamedColor: Cannot perform this operation " + tqWarning( "TQColor::setSystemNamedColor: Cannot perform this operation " "because TQApplication does not exist" ); #endif // set color to invalid @@ -737,7 +737,7 @@ int TQColor::enterAllocContext() init_context_stack(); if ( context_ptr+1 == MAX_CONTEXTS ) { #if defined(QT_CHECK_STATE) - qWarning( "TQColor::enterAllocContext: Context stack overflow" ); + tqWarning( "TQColor::enterAllocContext: Context stack overflow" ); #endif return 0; } @@ -759,7 +759,7 @@ void TQColor::leaveAllocContext() init_context_stack(); if ( context_ptr == 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQColor::leaveAllocContext: Context stack underflow" ); + tqWarning( "TQColor::leaveAllocContext: Context stack underflow" ); #endif return; } diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp index 12e7cc780..2a4cfd18d 100644 --- a/src/kernel/qcursor.cpp +++ b/src/kernel/qcursor.cpp @@ -165,7 +165,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c ) s << *c.bitmap() << *c.mask(); s << c.hotSpot(); #else - qWarning("No Image Cursor I/O"); + tqWarning("No Image Cursor I/O"); #endif } return s; @@ -189,7 +189,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c ) s >> bm >> bmm >> hot; c = TQCursor( bm, bmm, hot.x(), hot.y() ); #else - qWarning("No Image Cursor I/O"); + tqWarning("No Image Cursor I/O"); #endif } else { c.setShape( (int)shape ); // create cursor with shape diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp index 790ebafc7..39b603333 100644 --- a/src/kernel/qcursor_x11.cpp +++ b/src/kernel/qcursor_x11.cpp @@ -166,7 +166,7 @@ void TQCursor::initialize() for( shape = 0; shape <= LastCursor; shape++ ) cursorTable[shape].data = new TQCursorData( shape ); initialized = TRUE; - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); } @@ -234,7 +234,7 @@ void TQCursor::setBitmap( const TQBitmap &bitmap, const TQBitmap &mask, if ( bitmap.depth() != 1 || mask.depth() != 1 || bitmap.size() != mask.size() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQCursor: Cannot create bitmap cursor; invalid bitmap(s)" ); + tqWarning( "TQCursor: Cannot create bitmap cursor; invalid bitmap(s)" ); #endif TQCursor *c = &cursorTable[arrowCursorIdx]; c->data->ref(); @@ -825,7 +825,7 @@ void TQCursor::update() const #endif /* QT_USE_APPROXIMATE_CURSORS */ default: #if defined(QT_CHECK_RANGE) - qWarning( "TQCursor::update: Invalid cursor shape %d", d->cshape ); + tqWarning( "TQCursor::update: Invalid cursor shape %d", d->cshape ); #endif return; } diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index 149c2fe05..aeb025830 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -82,9 +82,9 @@ extern void qt_leave_modal( TQWidget *widget ); #endif extern Window qt_x11_findClientWindow( Window, Atom, bool ); -extern Atom qt_wm_state; -extern Time qt_x_time; -extern Time qt_x_user_time; +extern Atom tqt_wm_state; +extern Time tqt_x_time; +extern Time tqt_x_user_time; // this stuff is copied from qclb_x11.cpp @@ -460,7 +460,7 @@ void qt_xdnd_setup() { qt_x11_intern_atom( "QT_SELECTION", &qt_selection_property ); qt_x11_intern_atom( "INCR", &qt_incr_atom ); - qAddPostRoutine( qt_xdnd_cleanup ); + tqAddPostRoutine( qt_xdnd_cleanup ); } @@ -616,14 +616,14 @@ void qt_handle_xdnd_position( TQWidget *w, const XEvent * xe, bool passive ) } if ( l[0] != qt_xdnd_dragsource_xid ) { - //qDebug( "xdnd drag position from unexpected source (%08lx not %08lx)", + //tqDebug( "xdnd drag position from unexpected source (%08lx not %08lx)", // l[0], qt_xdnd_dragsource_xid ); return; } if (l[3] != 0) { // timestamp from the source - qt_xdnd_target_current_time = qt_x_user_time = l[3]; + qt_xdnd_target_current_time = tqt_x_user_time = l[3]; } XClientMessageEvent response; @@ -761,7 +761,7 @@ void qt_handle_xdnd_status( TQWidget * w, const XEvent * xe, bool /*passive*/ ) void qt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) { - //qDebug( "xdnd leave" ); + //tqDebug( "xdnd leave" ); if ( !qt_xdnd_current_widget || w->topLevelWidget() != qt_xdnd_current_widget->topLevelWidget() ) { return; // sanity @@ -780,7 +780,7 @@ void qt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) if ( l[0] != qt_xdnd_dragsource_xid ) { // This often happens - leave other-process window tquickly - //qDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", + //tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", //l[0], qt_xdnd_dragsource_xid ); qt_xdnd_current_widget = 0; return; @@ -839,17 +839,17 @@ void qt_handle_xdnd_drop( TQWidget *, const XEvent * xe, bool passive ) } const unsigned long *l = (const unsigned long *)xe->xclient.data.l; - //qDebug( "xdnd drop" ); + //tqDebug( "xdnd drop" ); if ( l[0] != qt_xdnd_dragsource_xid ) { - //qDebug( "xdnd drop from unexpected source (%08lx not %08lx", + //tqDebug( "xdnd drop from unexpected source (%08lx not %08lx", // l[0], qt_xdnd_dragsource_xid ); return; } if (l[2] != 0) { // update the "user time" from the timestamp in the event. - qt_xdnd_target_current_time = qt_x_user_time = l[2]; + qt_xdnd_target_current_time = tqt_x_user_time = l[2]; } if ( qt_xdnd_source_object ) @@ -910,7 +910,7 @@ void TQDragManager::timerEvent( TQTimerEvent* e ) Window root, child; int root_x, root_y, win_x, win_y; unsigned int mask; - XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ), + XQueryPointer( tqt_xdisplay(), tqt_xrootwin( qt_xdnd_current_screen ), &root, &child, &root_x, &root_y, &win_x, &win_y, &mask ); if( updateMode( (ButtonState)qt_x11_translateButtonState( mask ))) qt_xdnd_source_sameanswer = TQRect(); // force move @@ -956,7 +956,7 @@ bool qt_xdnd_another_movement() qt_xdnd_was_move = false; qt_xdnd_found = false; XEvent dummy; - XCheckIfEvent( qt_xdisplay(), &dummy, qt_xdnd_predicate, NULL ); + XCheckIfEvent( tqt_xdisplay(), &dummy, qt_xdnd_predicate, NULL ); return qt_xdnd_was_move; } @@ -1309,7 +1309,7 @@ void TQDragManager::move( const TQPoint & globalPos ) unsigned long n, a; WId *proxy_id; qt_ignore_badwindow(); - r = XGetWindowProperty( qt_xdisplay(), target, qt_xdnd_proxy, 0, + r = XGetWindowProperty( tqt_xdisplay(), target, qt_xdnd_proxy, 0, 1, False, XA_WINDOW, &type, &f,&n,&a,(uchar**)&proxy_id ); if ( ( r != Success ) || qt_badwindow() ) { proxy_target = target = 0; @@ -1317,7 +1317,7 @@ void TQDragManager::move( const TQPoint & globalPos ) proxy_target = *proxy_id; XFree(proxy_id); proxy_id = 0; - r = XGetWindowProperty( qt_xdisplay(), proxy_target, qt_xdnd_proxy, 0, + r = XGetWindowProperty( tqt_xdisplay(), proxy_target, qt_xdnd_proxy, 0, 1, False, XA_WINDOW, &type, &f,&n,&a,(uchar**)&proxy_id ); if ( ( r != Success ) || qt_badwindow() || !type || !proxy_id || *proxy_id != proxy_target ) { // Bogus @@ -1330,7 +1330,7 @@ void TQDragManager::move( const TQPoint & globalPos ) if ( proxy_target ) { int *tv; qt_ignore_badwindow(); - r = XGetWindowProperty( qt_xdisplay(), proxy_target, qt_xdnd_aware, 0, + r = XGetWindowProperty( tqt_xdisplay(), proxy_target, qt_xdnd_aware, 0, 1, False, AnyPropertyType, &type, &f,&n,&a,(uchar**)&tv ); if ( r != Success ) { target = 0; @@ -1400,7 +1400,7 @@ void TQDragManager::move( const TQPoint & globalPos ) move.data.l[0] = object->source()->winId(); move.data.l[1] = 0; // flags move.data.l[2] = (globalPos.x() << 16) + globalPos.y(); - move.data.l[3] = qt_x_time; + move.data.l[3] = tqt_x_time; move.data.l[4] = qtaction_to_xdndaction( global_requested_action ); if ( w ) @@ -1434,7 +1434,7 @@ void TQDragManager::drop() drop.message_type = qt_xdnd_drop; drop.data.l[0] = object->source()->winId(); drop.data.l[1] = 0; // flags - drop.data.l[2] = qt_x_time; + drop.data.l[2] = tqt_x_time; drop.data.l[3] = 0; drop.data.l[4] = 0; @@ -1509,7 +1509,7 @@ bool qt_xdnd_handle_badwindow() bool TQDropEvent::provides( const char *mimeType ) const { - if ( qt_motifdnd_active && qstrnicmp( mimeType, "text/", 5 ) == 0 ) + if ( qt_motifdnd_active && tqstrnicmp( mimeType, "text/", 5 ) == 0 ) return TRUE; int n=0; @@ -1519,7 +1519,7 @@ bool TQDropEvent::provides( const char *mimeType ) const if ( !f ) return FALSE; n++; - } while( qstricmp( mimeType, f ) ); + } while( tqstricmp( mimeType, f ) ); return TRUE; } @@ -1617,7 +1617,7 @@ static TQByteArray qt_xdnd_obtain_data( const char *format ) qt_xdnd_selection, nbytes, FALSE ); } else if ( type != *a ) { - // (includes None) qDebug( "TQt clipboard: unknown atom %ld", type); + // (includes None) tqDebug( "TQt clipboard: unknown atom %ld", type); } #if 0 // this needs to be matched by a qt_xdnd_target_data->clear() @@ -1781,7 +1781,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode ) qt_xdnd_deco->x11SetWindowTransient( dragSource->topLevelWidget()); tqApp->installEventFilter( this ); - qt_xdnd_source_current_time = qt_x_time; + qt_xdnd_source_current_time = tqt_x_time; XSetSelectionOwner( TQPaintDevice::x11AppDisplay(), qt_xdnd_selection, dragSource->topLevelWidget()->winId(), qt_xdnd_source_current_time ); diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index 66e1c66cb..47f298b7d 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -814,7 +814,7 @@ TQTextCodec* findcodec(const TQMimeSource* e) const char* f; int i; for ( i=0; (f=e->format(i)); i++ ) { - bool html = !qstrnicmp(f, "text/html", 9); + bool html = !tqstrnicmp(f, "text/html", 9); if (html) r = codecForHTML(TQCString(e->encodedData(f))); if (!r) @@ -833,7 +833,7 @@ TQTextCodec* findcodec(const TQMimeSource* e) TQByteArray TQTextDrag::encodedData(const char* mime) const { TQCString r; - if ( 0==qstrnicmp(mime,"text/",5) ) { + if ( 0==tqstrnicmp(mime,"text/",5) ) { TQCString m(mime); m = m.lower(); TQTextCodec *codec = qt_findcharset(m); @@ -872,7 +872,7 @@ bool TQTextDrag::canDecode( const TQMimeSource* e ) { const char* f; for (int i=0; (f=e->format(i)); i++) { - if ( 0==qstrnicmp(f,"text/",5) ) { + if ( 0==tqstrnicmp(f,"text/",5) ) { return findcodec(e) != 0; } } @@ -912,7 +912,7 @@ bool TQTextDrag::decode( const TQMimeSource* e, TQString& str, TQCString& subtyp const char* mime; for (int i=0; (mime = e->format(i)); i++) { - if ( 0==qstrnicmp(mime,"text/",5) ) { + if ( 0==tqstrnicmp(mime,"text/",5) ) { TQCString m(mime); m = m.lower(); int semi = m.find(';'); @@ -920,7 +920,7 @@ bool TQTextDrag::decode( const TQMimeSource* e, TQString& str, TQCString& subtyp semi = m.length(); TQCString foundst = m.mid(5,semi-5); if ( subtype.isNull() || foundst == subtype ) { - bool html = !qstrnicmp(mime, "text/html", 9); + bool html = !tqstrnicmp(mime, "text/html", 9); TQTextCodec* codec = 0; if (html) { TQByteArray bytes = e->encodedData(mime); @@ -1087,7 +1087,7 @@ const char * TQImageDrag::format(int i) const */ TQByteArray TQImageDrag::encodedData(const char* fmt) const { - if ( qstrnicmp( fmt, "image/", 6 )==0 ) { + if ( tqstrnicmp( fmt, "image/", 6 )==0 ) { TQCString f = fmt+6; TQByteArray data; TQBuffer w( data ); @@ -1233,7 +1233,7 @@ TQStoredDrag::TQStoredDrag( const char* mimeType, TQWidget * dragSource, const c TQDragObject(dragSource,name) { d = new TQStoredDragData(); - d->fmt = qstrdup(mimeType); + d->fmt = tqstrdup(mimeType); } /*! @@ -1278,7 +1278,7 @@ void TQStoredDrag::setEncodedData( const TQByteArray & encodedData ) */ TQByteArray TQStoredDrag::encodedData(const char* m) const { - if ( !qstricmp(m,d->fmt) ) + if ( !tqstricmp(m,d->fmt) ) return d->enc; else return TQByteArray(); @@ -1588,7 +1588,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri) if (!uri) return file; - if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri + if (0==tqstrnicmp(uri,"file:/",6)) // It is a local file uri uri += 6; else if (TQString(uri).find(":/") != -1) // It is a different scheme uri return file; diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp index d9505797b..8dfb93297 100644 --- a/src/kernel/qdrawutil.cpp +++ b/src/kernel/qdrawutil.cpp @@ -86,7 +86,7 @@ void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2, { if (!( p && lineWidth >= 0 && midLineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "qDrawShadeLine invalid parameters." ); + tqWarning( "qDrawShadeLine invalid parameters." ); #endif return; } @@ -209,7 +209,7 @@ void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h, return; if ( ! ( w > 0 && h > 0 && lineWidth >= 0 && midLineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "qDrawShadeRect(): Invalid parameters" ); + tqWarning( "qDrawShadeRect(): Invalid parameters" ); #endif return; } @@ -309,7 +309,7 @@ void qDrawShadePanel( TQPainter *p, int x, int y, int w, int h, return; if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "qDrawShadePanel() Invalid parameters." ); + tqWarning( "qDrawShadePanel() Invalid parameters." ); #endif } TQColor shade = g.dark(); @@ -538,7 +538,7 @@ void qDrawPlainRect( TQPainter *p, int x, int y, int w, int h, const TQColor &c, return; if ( !( w > 0 && h > 0 && lineWidth >= 0 ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "qDrawPlainRect() Invalid parameters." ); + tqWarning( "qDrawPlainRect() Invalid parameters." ); #endif } TQPen oldPen = p->pen(); @@ -948,7 +948,7 @@ void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool do #endif default: #if defined(QT_CHECK_RANGE) - qWarning( "qDrawArrow: Requested GUI style not supported" ); + tqWarning( "qDrawArrow: Requested GUI style not supported" ); #else ; #endif diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp index c01d8ad5f..4824f5717 100644 --- a/src/kernel/qeventloop.cpp +++ b/src/kernel/qeventloop.cpp @@ -101,7 +101,7 @@ TQEventLoop::TQEventLoop( TQObject *parent, const char *name ) { #if defined(QT_CHECK_STATE) if ( TQApplication::eventloop ) - qFatal( "TQEventLoop: there must be only one event loop object. \nConstruct it before TQApplication." ); + tqFatal( "TQEventLoop: there must be only one event loop object. \nConstruct it before TQApplication." ); // for now ;) #endif // QT_CHECK_STATE diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp index f7b829a91..1441b78c5 100644 --- a/src/kernel/qeventloop_unix.cpp +++ b/src/kernel/qeventloop_unix.cpp @@ -184,7 +184,7 @@ static void insertTimer( const TimerInfo *ti ) // insert timer info into list timerList->insert( index, ti ); // inserts sorted #if defined(QT_DEBUG) if ( dangerCount > 16 ) - qDebug( "TQObject: %d timers now exist for object %s::%s", + tqDebug( "TQObject: %d timers now exist for object %s::%s", dangerCount, ti->obj->className(), ti->obj->name() ); #endif } @@ -367,7 +367,7 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || sockfd >= FD_SETSIZE || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQSocketNotifier: Internal error" ); + tqWarning( "TQSocketNotifier: Internal error" ); #endif return; } @@ -399,7 +399,7 @@ void TQEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) #if defined(QT_CHECK_STATE) if ( p && p->fd == sockfd ) { static const char *t[] = { "read", "write", "exception" }; - qWarning( "TQSocketNotifier: Multiple socket notifiers for " + tqWarning( "TQSocketNotifier: Multiple socket notifiers for " "same socket %d and type %s", sockfd, t[type] ); } #endif @@ -419,7 +419,7 @@ void TQEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQSocketNotifier: Internal error" ); + tqWarning( "TQSocketNotifier: Internal error" ); #endif return; } @@ -456,7 +456,7 @@ void TQEventLoop::setSocketNotifierPending( TQSocketNotifier *notifier ) int type = notifier->type(); if ( sockfd < 0 || type < 0 || type > 2 || notifier == 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQSocketNotifier: Internal error" ); + tqWarning( "TQSocketNotifier: Internal error" ); #endif return; } diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp index 1e446bace..bada85fdd 100644 --- a/src/kernel/qeventloop_x11.cpp +++ b/src/kernel/qeventloop_x11.cpp @@ -170,8 +170,8 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) case ClientMessage: { // from qapplication_x11.cpp - extern Atom qt_wm_protocols; - extern Atom qt_wm_take_focus; + extern Atom tqt_wm_protocols; + extern Atom tqt_wm_take_focus; extern Atom qt_qt_scrolldone; // only keep the wm_take_focus and @@ -180,8 +180,8 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if ( event.xclient.format != 32 ) continue; - if ( event.xclient.message_type == qt_wm_protocols || - (Atom) event.xclient.data.l[0] == qt_wm_take_focus ) + if ( event.xclient.message_type == tqt_wm_protocols || + (Atom) event.xclient.data.l[0] == tqt_wm_take_focus ) break; if ( event.xclient.message_type == qt_qt_scrolldone ) break; @@ -337,7 +337,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if (ret == -1 && errno == EBADF) { // disable the invalid socket notifier static const char *t[] = { "Read", "Write", "Exception" }; - qWarning("TQSocketNotifier: invalid socket %d and type '%s', disabling...", + tqWarning("TQSocketNotifier: invalid socket %d and type '%s', disabling...", sn->fd, t[type]); sn->obj->setEnabled(FALSE); } diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index ed2555228..be0275151 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -63,9 +63,9 @@ // #define TQFONTCACHE_DEBUG #ifdef TQFONTCACHE_DEBUG -# define FC_DEBUG qDebug +# define FC_DEBUG tqDebug #else -# define FC_DEBUG if (FALSE) qDebug +# define FC_DEBUG if (FALSE) tqDebug #endif @@ -733,7 +733,7 @@ void TQFont::setPointSize( int pointSize ) if ( pointSize <= 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFont::setPointSize: Point size <= 0 (%d)", pointSize ); + tqWarning( "TQFont::setPointSize: Point size <= 0 (%d)", pointSize ); #endif return; @@ -758,7 +758,7 @@ void TQFont::setPointSizeFloat( float pointSize ) { if ( pointSize <= 0.0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFont::setPointSize: Point size <= 0 (%f)", pointSize ); + tqWarning( "TQFont::setPointSize: Point size <= 0 (%f)", pointSize ); #endif return; } @@ -795,7 +795,7 @@ void TQFont::setPixelSize( int pixelSize ) { if ( pixelSize <= 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize ); + tqWarning( "TQFont::setPixelSize: Pixel size <= 0 (%d)", pixelSize ); #endif return; } @@ -892,7 +892,7 @@ void TQFont::setWeight( int weight ) if ( weight < 0 || weight > 99 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFont::setWeight: Value out of range (%d)", weight ); + tqWarning( "TQFont::setWeight: Value out of range (%d)", weight ); #endif return; @@ -1203,7 +1203,7 @@ void TQFont::setStretch( int factor ) { if ( factor < 1 || factor > 4000 ) { #ifdef QT_CHECK_RANGE - qWarning( "TQFont::setStretch(): parameter '%d' out of range", factor ); + tqWarning( "TQFont::setStretch(): parameter '%d' out of range", factor ); #endif // QT_CHECK_RANGE return; @@ -1658,7 +1658,7 @@ bool TQFont::fromString(const TQString &descrip) if ( !count || ( count > 2 && count < 9 ) || count > 11 ) { #ifdef QT_CHECK_STATE - qWarning("TQFont::fromString: invalid description '%s'", + tqWarning("TQFont::fromString: invalid description '%s'", descrip.isEmpty() ? "(empty)" : descrip.latin1()); #endif @@ -1917,7 +1917,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p ) { #if defined(CHECK_STATE) if ( !painter->isActive() ) - qWarning( "TQFontMetrics: Get font metrics between TQPainter::begin() " + tqWarning( "TQFontMetrics: Get font metrics between TQPainter::begin() " "and TQPainter::end()" ); #endif @@ -2676,7 +2676,7 @@ TQFontInfo::TQFontInfo( const TQPainter *p ) #if defined(CHECK_STATE) if ( !painter->isActive() ) - qWarning( "TQFontInfo: Get font info between TQPainter::begin() " + tqWarning( "TQFontInfo: Get font info between TQPainter::begin() " "and TQPainter::end()" ); #endif diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index 4e2c6f014..9baa6a5cf 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -69,7 +69,7 @@ #define TQFONTLOADER_DEBUG #define TQFONTLOADER_DEBUG_VERBOSE -Q_EXPORT bool qt_has_xft = FALSE; +Q_EXPORT bool tqt_has_xft = FALSE; #ifndef QT_NO_XFTFREETYPE TQt::HANDLE qt_xft_handle(const TQFont &font) @@ -350,7 +350,7 @@ void TQFontPrivate::load( TQFont::Script script ) #ifdef QT_CHECK_STATE // sanity checks if (!TQFontCache::instance) - qWarning("Must construct a TQApplication before a TQFont"); + tqWarning("Must construct a TQApplication before a TQFont"); Q_ASSERT( script >= 0 && script < TQFont::LastPrivateScript ); #endif // QT_CHECK_STATE @@ -521,7 +521,7 @@ void TQFont::setRawName( const TQString &name ) if ( ! qt_fillFontDef( qt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) { #ifdef QT_CHECK_STATE - qWarning("TQFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); + tqWarning("TQFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); #endif // QT_CHECK_STATE setFamily( name ); @@ -650,7 +650,7 @@ TQString TQFont::lastResortFont() const } #if defined(CHECK_NULL) - qFatal( "TQFontPrivate::lastResortFont: Cannot find any reasonable font" ); + tqFatal( "TQFontPrivate::lastResortFont: Cannot find any reasonable font" ); #endif return last; diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index 09846b029..af4cf5993 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -57,16 +57,16 @@ //#define TQFONTDATABASE_DEBUG #ifdef TQFONTDATABASE_DEBUG -# define FD_DEBUG qDebug +# define FD_DEBUG tqDebug #else -# define FD_DEBUG if (FALSE) qDebug +# define FD_DEBUG if (FALSE) tqDebug #endif //#define FONT_MATCH_DEBUG #ifdef FONT_MATCH_DEBUG -# define FM_DEBUG qDebug +# define FM_DEBUG tqDebug #else -# define FM_DEBUG if (FALSE) qDebug +# define FM_DEBUG if (FALSE) tqDebug #endif #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) @@ -307,7 +307,7 @@ TQtFontStyle *TQtFontFoundry::style( const TQtFontStyle::Key &key, bool create ) if ( !create ) return 0; -// qDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d", key.weight, key.italic, key.oblique, key.stretch, pos ); +// tqDebug("adding key (weight=%d, italic=%d, oblique=%d stretch=%d) at %d", key.weight, key.italic, key.oblique, key.stretch, pos ); if ( !(count % 8) ) styles = (TQtFontStyle **) realloc( styles, (((count+8) >> 3 ) << 3) * sizeof( TQtFontStyle * ) ); @@ -439,7 +439,7 @@ TQtFontFamily *TQFontDatabasePrivate::family( const TQString &f, bool create ) if ( res < 0 ) pos++; - // qDebug("adding family %s at %d total=%d", f.latin1(), pos, count); + // tqDebug("adding family %s at %d total=%d", f.latin1(), pos, count); if ( !(count % 8) ) families = (TQtFontFamily **) realloc( families, @@ -1343,7 +1343,7 @@ int main( int argc, char **argv ) TQStringList families = fdb.families(); for ( TQStringList::Iterator f = families.begin(); f != families.end(); ++f ) { TQString family = *f; - qDebug( family ); + tqDebug( family ); TQStringList styles = fdb.styles( family ); for ( TQStringList::Iterator s = styles.begin(); s != styles.end(); ++s ) { TQString style = *s; @@ -1354,7 +1354,7 @@ int main( int argc, char **argv ) dstyle += TQString::number( *points ) + " "; } dstyle = dstyle.left( dstyle.length() - 1 ) + ")"; - qDebug( dstyle ); + tqDebug( dstyle ); } } return 0; diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp index c027bfc41..ba768d811 100644 --- a/src/kernel/qfontdatabase_x11.cpp +++ b/src/kernel/qfontdatabase_x11.cpp @@ -65,9 +65,9 @@ #endif #ifdef TQFONTDATABASE_DEBUG -# define FD_DEBUG qDebug +# define FD_DEBUG tqDebug #else -# define FD_DEBUG if (FALSE) qDebug +# define FD_DEBUG if (FALSE) tqDebug #endif // TQFONTDATABASE_DEBUG // from qfont_x11.cpp @@ -450,7 +450,7 @@ const int numEncodings = sizeof( xlfd_encoding ) / sizeof( XlfdEncoding ) - 1; int qt_xlfd_encoding_id( const char *encoding ) { - // qDebug("looking for encoding id for '%s'", encoding ); + // tqDebug("looking for encoding id for '%s'", encoding ); int len = strlen( encoding ); if ( len < 4 ) return -1; @@ -468,11 +468,11 @@ int qt_xlfd_encoding_id( const char *encoding ) const char *n = enc->name; const char *e = encoding; while ( 1 ) { - // qDebug("bol: *e='%c', *n='%c'", *e, *n ); + // tqDebug("bol: *e='%c', *n='%c'", *e, *n ); if ( *e == '\0' ) { if ( *n ) break; - // qDebug( "found encoding id %d", enc->id ); + // tqDebug( "found encoding id %d", enc->id ); return enc->id; } if ( *e == *n ) { @@ -483,12 +483,12 @@ int qt_xlfd_encoding_id( const char *encoding ) if ( *n != '*' ) break; ++n; - // qDebug("skip: *e='%c', *n='%c'", *e, *n ); + // tqDebug("skip: *e='%c', *n='%c'", *e, *n ); while ( *e && *e != *n ) ++e; } } - // qDebug( "couldn't find encoding %s", encoding ); + // tqDebug( "couldn't find encoding %s", encoding ); return -1; } @@ -706,7 +706,7 @@ static TQtFontStyle::Key getStyle( char ** tokens ) } -extern bool qt_has_xft; // defined in qfont_x11.cpp +extern bool tqt_has_xft; // defined in qfont_x11.cpp static bool xlfdsFullyLoaded = FALSE; static unsigned char encodingLoaded[numEncodings]; @@ -722,7 +722,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) return; #ifdef QT_XFT2 - if ( !qt_has_xft ) { + if ( !tqt_has_xft ) { #endif // QT_XFT2 int fontCount; // force the X server to give us XLFDs @@ -734,7 +734,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) char **fontList = XListFonts( TQPaintDevice::x11AppDisplay(), xlfd_pattern.data(), 0xffff, &fontCount ); - // qDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount ); + // tqDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount ); char *tokens[NFontFields]; @@ -787,9 +787,9 @@ static void loadXlfds( const char *reqFamily, int encoding_id ) TQtFontStyle *style = foundry->style( styleKey, TRUE ); delete [] style->weightName; - style->weightName = qstrdup( tokens[Weight] ); + style->weightName = tqstrdup( tokens[Weight] ); delete [] style->setwidthName; - style->setwidthName = qstrdup( tokens[Width] ); + style->setwidthName = tqstrdup( tokens[Width] ); if ( smooth_scalable ) { style->smoothScalable = TRUE; @@ -849,7 +849,7 @@ static int getXftWeight(int xftweight) static void loadXft() { - if (!qt_has_xft) + if (!tqt_has_xft) return; #ifdef QT_XFT2 @@ -1095,7 +1095,7 @@ static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned s if ( unicode < 256 ) return (int) *(table+6+unicode); } else if ( format == 2 ) { - qWarning("format 2 encoding table for Unicode, not implemented!"); + tqWarning("format 2 encoding table for Unicode, not implemented!"); } else if ( format == 4 ) { Q_UINT16 segCountX2 = getUShort( table + 6 ); unsigned char *ends = table + 14; @@ -1137,7 +1137,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) TQCString ext = family->fontFilename.mid( family->fontFilename.findRev( '.' ) ).lower(); if ( family->fontFileIndex == 0 && ( ext == ".ttf" || ext == ".otf" ) ) { void *map; - // qDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() ); + // tqDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() ); int fd = open( family->fontFilename.data(), O_RDONLY ); size_t pagesize = getpagesize(); off_t offset = 0; @@ -1152,7 +1152,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) unsigned char *ttf = (unsigned char *)map; Q_UINT32 version = getUInt( ttf ); if ( version != 0x00010000 ) { - // qDebug("file has wrong version %x", version ); + // tqDebug("file has wrong version %x", version ); goto error1; } Q_UINT16 numTables = getUShort( ttf+4 ); @@ -1169,7 +1169,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) } } if ( !cmap_offset ) { - // qDebug("no cmap found" ); + // tqDebug("no cmap found" ); goto error1; } @@ -1186,7 +1186,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) version = getUShort( cmap ); if ( version != 0 ) { - // qDebug("wrong cmap version" ); + // tqDebug("wrong cmap version" ); goto error1; } numTables = getUShort( cmap + 2 ); @@ -1205,7 +1205,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) } if ( !unicode_table ) { - // qDebug("no unicode table found" ); + // tqDebug("no unicode table found" ); goto error1; } @@ -1230,7 +1230,7 @@ static inline void checkXftCoverage( TQtFontFamily *family ) } } if ( supported ){ - // qDebug("font can render script %d", i ); + // tqDebug("font can render script %d", i ); family->scripts[i] = TQtFontFamily::Supported; } else { family->scripts[i] |= TQtFontFamily::UnSupported_Xft; @@ -1293,7 +1293,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) if ( family.isNull() ) { #ifndef QT_NO_XFTFREETYPE static bool xft_readall_done = false; - if (qt_has_xft && !xft_readall_done) { + if (tqt_has_xft && !xft_readall_done) { xft_readall_done = true; XftFontSet *fonts = XftListFonts(TQPaintDevice::x11AppDisplay(), @@ -1313,7 +1313,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) XftFontSetDestroy (fonts); } #ifdef QT_XFT2 - if (qt_has_xft) + if (tqt_has_xft) return; #endif #endif // QT_NO_XFTFREETYPE @@ -1330,7 +1330,7 @@ static void load( const TQString &family = TQString::null, int script = -1 ) if ( !f->fullyLoaded ) { #ifndef QT_NO_XFTFREETYPE - if (qt_has_xft) { + if (tqt_has_xft) { TQString mfamily = family; redo: XftFontSet *fonts = @@ -1419,7 +1419,7 @@ static void initializeDb() #ifdef TQFONTDATABASE_DEBUG #ifdef QT_XFT2 - if (!qt_has_xft) + if (!tqt_has_xft) #endif // load everything at startup in debug mode. loadXlfds( 0, -1 ); @@ -1451,7 +1451,7 @@ static void initializeDb() else if ( style->bitmapScalable ) FD_DEBUG("\t\t\t\tbitmap scalable" ); if ( style->pixelSizes ) { - qDebug("\t\t\t\t%d pixel sizes", style->count ); + tqDebug("\t\t\t\t%d pixel sizes", style->count ); for ( int z = 0; z < style->count; ++z ) { TQtFontSize *size = style->pixelSizes + z; for ( int e = 0; e < size->count; ++e ) { @@ -1763,7 +1763,7 @@ static void parseFontName(const TQString &name, TQString &foundry, TQString &fam static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef &request, TQFont::Script script) { - if (!qt_has_xft) + if (!tqt_has_xft) return 0; TQStringList family_list; @@ -1809,7 +1809,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef double scale = addPatternProps(pattern, key, FALSE, TRUE, fp, request); #ifdef FONT_MATCH_DEBUG - qDebug("original pattern contains:"); + tqDebug("original pattern contains:"); FcPatternPrint(pattern); #endif @@ -1818,7 +1818,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef FcConfigSubstitute(0, pattern, FcMatchPattern); XftDefaultSubstitute(TQPaintDevice::x11AppDisplay(), TQPaintDevice::x11AppScreen(), pattern); -// qDebug("1: pattern contains:"); +// tqDebug("1: pattern contains:"); // FcPatternPrint(pattern); { @@ -1951,7 +1951,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef if ( !xftfs ) { // Xft couldn't find a font? - qDebug("couldn't open fontconfigs chosen font with Xft!!!"); + tqDebug("couldn't open fontconfigs chosen font with Xft!!!"); } else { fe = new TQFontEngineXft( xftfs, result, 0 ); if (fp->paintdevice diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp index 3802a13c1..d9d2f1640 100644 --- a/src/kernel/qfontengine_x11.cpp +++ b/src/kernel/qfontengine_x11.cpp @@ -139,7 +139,7 @@ static TQBitmap transform(Display *dpy, const TQBitmap &source, int xoff, int y bm = TQBitmap( w, h, dptr, TQImage::systemBitOrder() != TQImage::BigEndian ); } else { #if defined(QT_CHECK_RANGE) - qWarning( "TQFontEngineXft::tranform: xform failed"); + tqWarning( "TQFontEngineXft::tranform: xform failed"); #endif } @@ -266,7 +266,7 @@ void TQFontEngineBox::draw( TQPainter *p, int x, int y, const TQTextEngine *engi glyph_metrics_t ci = boundingBox( glyphs, offsets, numGlyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height ); - qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int xp = x; int yp = y; @@ -323,7 +323,7 @@ void TQFontEngineBox::draw( TQPainter *p, int x, int y, const TQTextEngine *engi x += offsets[i].x; y += offsets[i].y; p->drawRect( x + ci.x, y + 50 + ci.y, ci.width, ci.height ); - qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, + tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offset=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y ); x += ci.xoff; y += ci.yoff; @@ -558,7 +558,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng if ( !si->num_glyphs ) return; -// qDebug("TQFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs ); +// tqDebug("TQFontEngineXLFD::draw( %d, %d, numglyphs=%d", x, y, si->num_glyphs ); Display *dpy = TQPaintDevice::x11AppDisplay(); TQt::HANDLE hd = p->device()->handle(); @@ -633,7 +633,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng matrix += ' '; } matrix += ']'; - //qDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data()); + //tqDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data()); xlfd_transformed.replace( pos, endPos-pos, matrix ); x_font_load_error = FALSE; @@ -642,7 +642,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng XSync( dpy, FALSE ); XSetErrorHandler( old_handler ); if ( x_font_load_error ) { - //qDebug( "couldn't load transformed font" ); + //tqDebug( "couldn't load transformed font" ); font_id = _fs->fid; xlfd_transformations = XlfdTrUnsupported; } else { @@ -678,7 +678,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height ); - qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int xp = x; int yp = y; @@ -705,7 +705,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng int i = si->num_glyphs; while( i-- ) { advance_t adv = advances[i]; - // qDebug("advance = %d/%d", adv.x, adv.y ); + // tqDebug("advance = %d/%d", adv.x, adv.y ); x += adv; glyph_metrics_t gi = boundingBox( glyphs[i] ); int xp = x-offsets[i].x-gi.xoff; @@ -726,7 +726,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN) XDrawString16(dpy, hd, gc, xp, yp, chars+i, 1 ); advance_t adv = advances[i]; - // qDebug("advance = %d/%d", adv.x, adv.y ); + // tqDebug("advance = %d/%d", adv.x, adv.y ); x += adv; i++; } @@ -760,7 +760,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng for ( int i = 0; i < si->num_glyphs; i++ ) { glyph_metrics_t ci = boundingBox( glyphs[i] ); p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height ); - qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, + tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=(%d/%d)", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y, advances[i].x, advances[i].y); x += advances[i].x; @@ -1505,10 +1505,10 @@ TQFontEngineXft::TQFontEngineXft( XftFont *font, XftPattern *pattern, int cmap ) // Xft maps Unicode and adobe roman for us. for (int i = 0; i < _face->num_charmaps; ++i) { FT_CharMap cm = _face->charmaps[i]; -// qDebug("font has charmap %x", cm->encoding); +// tqDebug("font has charmap %x", cm->encoding); if (cm->encoding == ft_encoding_adobe_custom || cm->encoding == ft_encoding_symbol) { -// qDebug("font has adobe custom or ms symbol charmap"); +// tqDebug("font has adobe custom or ms symbol charmap"); _cmap = i; break; } @@ -1855,13 +1855,13 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi col.color.alpha = 0xffff; col.pixel = pen.pixel(); #ifdef FONTENGINE_DEBUG - qDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" ); + tqDebug("===== drawing %d glyphs reverse=%s ======", si->num_glyphs, si->analysis.bidiLevel % 2?"TRUE":"FALSE" ); p->save(); p->setBrush( TQt::white ); glyph_metrics_t ci = boundingBox( glyphs, advances, offsets, si->num_glyphs ); p->drawRect( x + ci.x, y + ci.y, ci.width, ci.height ); p->drawRect( x + ci.x, y + 100 + ci.y, ci.width, ci.height ); - qDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); + tqDebug("bounding rect=%d %d (%d/%d)", ci.x, ci.y, ci.width, ci.height ); p->restore(); int yp = y; int xp = x; @@ -1895,7 +1895,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi p->drawRect( x+offsets[i].x+gi.x, y+offsets[i].y+100+gi.y, gi.width, gi.height ); p->drawLine( x+offsets[i].x, y + 150 + 5*i , x+offsets[i].x+advances[i], y + 150 + 5*i ); p->drawLine( x+offsets[i].x, y + 152 + 5*i , x+offsets[i].x+gi.xoff, y + 152 + 5*i ); - qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height, + tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, gi.x, gi.y, gi.width, gi.height, gi.xoff, gi.yoff, offsets[i].x, offsets[i].y, advances[i]); #endif x += advances[i]; @@ -1915,7 +1915,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi if (!glyphAttributes[i].zeroWidth && xp < SHRT_MAX && xp > SHRT_MIN) XftDrawString16( draw, &col, fnt, xp, yp, (XftChar16 *) (glyphs+i), 1 ); #endif // QT_XFT2 - // qDebug("advance = %d/%d", adv.x, adv.y ); + // tqDebug("advance = %d/%d", adv.x, adv.y ); x += advances[i]; i++; } @@ -1980,7 +1980,7 @@ void TQFontEngineXft::draw( TQPainter *p, int x, int y, const TQTextEngine *engi for ( int i = 0; i < si->num_glyphs; i++ ) { glyph_metrics_t ci = boundingBox( glyphs[i] ); p->drawRect( x + ci.x + offsets[i].x, y + 100 + ci.y + offsets[i].y, ci.width, ci.height ); - qDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height, + tqDebug("bounding ci[%d]=%d %d (%d/%d) / %d %d offs=(%d/%d) advance=%d", i, ci.x, ci.y, ci.width, ci.height, ci.xoff, ci.yoff, offsets[i].x, offsets[i].y, advances[i]); x += advances[i]; } @@ -2208,7 +2208,7 @@ bool TQFontEngineXft::canRender( const TQChar *string, int len ) TQOpenType *TQFontEngineXft::openType() const { -// qDebug("openTypeIface requested!"); +// tqDebug("openTypeIface requested!"); if ( _openType ) return _openType; @@ -2390,7 +2390,7 @@ TQOpenType::TQOpenType(TQFontEngineXft *fe) FT_Error error; if ((error = TT_Load_GDEF_Table(face, &gdef))) { #ifdef OT_DEBUG - qDebug("error loading gdef table: %d", error); + tqDebug("error loading gdef table: %d", error); #endif gdef = 0; } @@ -2399,9 +2399,9 @@ TQOpenType::TQOpenType(TQFontEngineXft *fe) gsub = 0; #ifdef OT_DEBUG if (error != FT_Err_Table_Missing) { - qDebug("error loading gsub table: %d", error); + tqDebug("error loading gsub table: %d", error); } else { - qDebug("face doesn't have a gsub table"); + tqDebug("face doesn't have a gsub table"); } #endif } @@ -2409,7 +2409,7 @@ TQOpenType::TQOpenType(TQFontEngineXft *fe) if ((error = TT_Load_GPOS_Table(face, &gpos, gdef))) { gpos = 0; #ifdef OT_DEBUG - qDebug("error loading gpos table: %d", error); + tqDebug("error loading gpos table: %d", error); #endif } @@ -2448,7 +2448,7 @@ bool TQOpenType::checkScript(unsigned int script) FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index); if (error) { #ifdef OT_DEBUG - qDebug("could not select script %d in GSub table: %d", (int)script, error); + tqDebug("could not select script %d in GSub table: %d", (int)script, error); #endif return FALSE; } @@ -2462,7 +2462,7 @@ bool TQOpenType::checkScript(unsigned int script) FT_Error error = TT_GPOS_Select_Script(gpos, script, &script_index); if (error) { #ifdef OT_DEBUG - qDebug("could not select script in gpos table: %d", error); + tqDebug("could not select script in gpos table: %d", error); #endif return FALSE; } @@ -2486,10 +2486,10 @@ void TQOpenType::selectScript(unsigned int script, const Features *features) { TTO_FeatureList featurelist = gsub->FeatureList; int numfeatures = featurelist.FeatureCount; - qDebug("gsub table has %d features", numfeatures); + tqDebug("gsub table has %d features", numfeatures); for(int i = 0; i < numfeatures; i++) { TTO_FeatureRecord *r = featurelist.FeatureRecord + i; - qDebug(" feature '%s'", tag_to_string(r->FeatureTag)); + tqDebug(" feature '%s'", tag_to_string(r->FeatureTag)); } } #endif @@ -2498,14 +2498,14 @@ void TQOpenType::selectScript(unsigned int script, const Features *features) FT_Error error = TT_GSUB_Select_Script(gsub, tag, &script_index); if (!error) { #ifdef OT_DEBUG - qDebug("script %s has script index %d", tag_to_string(script), script_index); + tqDebug("script %s has script index %d", tag_to_string(script), script_index); #endif while (features->tag) { FT_UShort feature_index; error = TT_GSUB_Select_Feature(gsub, features->tag, script_index, 0xffff, &feature_index); if (!error) { #ifdef OT_DEBUG - qDebug(" adding feature %s", tag_to_string(features->tag)); + tqDebug(" adding feature %s", tag_to_string(features->tag)); #endif TT_GSUB_Add_Feature(gsub, feature_index, features->property); } @@ -2523,12 +2523,12 @@ void TQOpenType::selectScript(unsigned int script, const Features *features) { TTO_FeatureList featurelist = gpos->FeatureList; int numfeatures = featurelist.FeatureCount; - qDebug("gpos table has %d features", numfeatures); + tqDebug("gpos table has %d features", numfeatures); for(int i = 0; i < numfeatures; i++) { TTO_FeatureRecord *r = featurelist.FeatureRecord + i; FT_UShort feature_index; TT_GPOS_Select_Feature(gpos, r->FeatureTag, script_index, 0xffff, &feature_index); - qDebug(" feature '%s'", tag_to_string(r->FeatureTag)); + tqDebug(" feature '%s'", tag_to_string(r->FeatureTag)); } } #endif @@ -2553,7 +2553,7 @@ void TQOpenType::selectScript(unsigned int script, const Features *features) static void dump_string(OTL_Buffer buffer) { for (uint i = 0; i < buffer->in_length; ++i) { - qDebug(" %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster); + tqDebug(" %x: cluster=%d", buffer->in_string[i].gindex, buffer->in_string[i].cluster); } } #endif @@ -2575,13 +2575,13 @@ bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties) } #ifdef OT_DEBUG - qDebug("-----------------------------------------"); -// qDebug("log clusters before shaping:"); + tqDebug("-----------------------------------------"); +// tqDebug("log clusters before shaping:"); // for (int j = 0; j < length; j++) -// qDebug(" log[%d] = %d", j, item->log_clusters[j]); - qDebug("original glyphs: %p", item->glyphs); +// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); + tqDebug("original glyphs: %p", item->glyphs); for (int i = 0; i < length; ++i) - qDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); + tqDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); // dump_string(otl_buffer); #endif @@ -2594,13 +2594,13 @@ bool TQOpenType::shape(TQShaperItem *item, const unsigned int *properties) } #ifdef OT_DEBUG -// qDebug("log clusters before shaping:"); +// tqDebug("log clusters before shaping:"); // for (int j = 0; j < length; j++) -// qDebug(" log[%d] = %d", j, item->log_clusters[j]); - qDebug("shaped glyphs:"); +// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); + tqDebug("shaped glyphs:"); for (int i = 0; i < length; ++i) - qDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); - qDebug("-----------------------------------------"); + tqDebug(" glyph=%4x", otl_buffer->in_string[i].gindex); + tqDebug("-----------------------------------------"); // dump_string(otl_buffer); #endif @@ -2643,7 +2643,7 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) int oldCi = 0; for (unsigned int i = 0; i < otl_buffer->in_length; ++i) { int ci = otl_buffer->in_string[i].cluster; - // qDebug(" ci[%d] = %d mark=%d, cmb=%d, cs=%d", + // tqDebug(" ci[%d] = %d mark=%d, cmb=%d, cs=%d", // i, ci, glyphAttributes[i].mark, glyphAttributes[i].combiningClass, glyphAttributes[i].clusterStart); if (!item->attributes[i].mark && item->attributes[i].clusterStart && ci != oldCi) { for (int j = oldCi; j < ci; j++) @@ -2657,7 +2657,7 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) } // calulate the advances for the shaped glyphs -// qDebug("unpositioned: "); +// tqDebug("unpositioned: "); static_cast<TQFontEngineXft *>(item->font)->recalcAdvances(item->num_glyphs, item->glyphs, item->advances); // positioning code: @@ -2665,9 +2665,9 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) float scale = item->font->scale(); OTL_Position positions = otl_buffer->positions; -// qDebug("positioned glyphs:"); +// tqDebug("positioned glyphs:"); for (unsigned int i = 0; i < otl_buffer->in_length; i++) { -// qDebug(" %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i, +// tqDebug(" %d:\t orig advance: (%d/%d)\tadv=(%d/%d)\tpos=(%d/%d)\tback=%d\tnew_advance=%d", i, // glyphs[i].advance.x.toInt(), glyphs[i].advance.y.toInt(), // (int)(positions[i].x_advance >> 6), (int)(positions[i].y_advance >> 6), // (int)(positions[i].x_pos >> 6), (int)(positions[i].y_pos >> 6), @@ -2695,7 +2695,7 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) --back; } } -// qDebug(" ->\tadv=%d\tpos=(%d/%d)", +// tqDebug(" ->\tadv=%d\tpos=(%d/%d)", // glyphs[i].advance.x.toInt(), glyphs[i].offset.x.toInt(), glyphs[i].offset.y.toInt()); } item->has_positioning = TRUE; @@ -2705,18 +2705,18 @@ bool TQOpenType::positionAndAdd(TQShaperItem *item, bool doLogClusters) #ifdef OT_DEBUG // if (doLogClusters) { -// qDebug("log clusters after shaping:"); +// tqDebug("log clusters after shaping:"); // for (int j = 0; j < length; j++) -// qDebug(" log[%d] = %d", j, item->log_clusters[j]); +// tqDebug(" log[%d] = %d", j, item->log_clusters[j]); // } - qDebug("final glyphs:"); + tqDebug("final glyphs:"); for (int i = 0; i < (int)otl_buffer->in_length; ++i) - qDebug(" glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d", + tqDebug(" glyph=%4x char_index=%d mark: %d cmp: %d, clusterStart: %d advance=%d offset=%d/%d", item->glyphs[i], otl_buffer->in_string[i].cluster, item->attributes[i].mark, item->attributes[i].combiningClass, item->attributes[i].clusterStart, item->advances[i], item->offsets[i].x, item->offsets[i].y); - qDebug("-----------------------------------------"); + tqDebug("-----------------------------------------"); #endif return TRUE; } diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp index e631b1988..803e75e18 100644 --- a/src/kernel/qguardedptr.cpp +++ b/src/kernel/qguardedptr.cpp @@ -68,7 +68,7 @@ if ( label) label->show(); else - qDebug("The label has been destroyed"); + tqDebug("The label has been destroyed"); \endcode The program will output \c{The label has been destroyed} rather diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index bb7e1da93..c67c463ab 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -427,9 +427,9 @@ TQImage::TQImage( const char * const xpm[] ) #ifndef QT_NO_IMAGEIO_XPM read_xpm_image_or_array( 0, xpm, *this ); #else - // We use a qFatal rather than disabling the whole function, as this + // We use a tqFatal rather than disabling the whole function, as this // constructor may be ambiguous. - qFatal("XPM not supported"); + tqFatal("XPM not supported"); #endif } @@ -588,7 +588,7 @@ TQImage TQImage::fromMimeSource( const TQString &abs_name ) const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( abs_name ); if ( !m ) { #if defined(QT_CHECK_STATE) - qWarning("TQImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() ); + tqWarning("TQImage::fromMimeSource: Cannot find image \"%s\" in the mime source factory", abs_name.latin1() ); #endif return TQImage(); } @@ -944,7 +944,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const void TQImage::warningIndexRange( const char *func, int i ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::%s: Index %d out of range", func, i ); + tqWarning( "TQImage::%s: Index %d out of range", func, i ); #else Q_UNUSED( func ) Q_UNUSED( i ) @@ -1091,7 +1091,7 @@ TQImage::Endian TQImage::systemByteOrder() if ( sbo == IgnoreEndian ) { // initialize int ws; bool be; - qSysInfo( &ws, &be ); + tqSysInfo( &ws, &be ); sbo = be ? BigEndian : LittleEndian; } return sbo; @@ -1130,7 +1130,7 @@ TQImage::Endian TQImage::systemByteOrder() TQImage::Endian TQImage::systemBitOrder() { #if defined(Q_WS_X11) - return BitmapBitOrder(qt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian; + return BitmapBitOrder(tqt_xdisplay()) == MSBFirst ? BigEndian :LittleEndian; #else return BigEndian; #endif @@ -1242,7 +1242,7 @@ bool TQImage::create( int width, int height, int depth, int numColors, return FALSE; // invalid parameter(s) if ( depth == 1 && bitOrder == IgnoreEndian ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::create: Bit order is required for 1 bpp images" ); + tqWarning( "TQImage::create: Bit order is required for 1 bpp images" ); #endif return FALSE; } @@ -1251,7 +1251,7 @@ bool TQImage::create( int width, int height, int depth, int numColors, #if defined(QT_CHECK_RANGE) if ( depth == 24 ) - qWarning( "TQImage::create: 24-bpp images no longer supported, " + tqWarning( "TQImage::create: 24-bpp images no longer supported, " "use 32-bpp instead" ); #endif switch ( depth ) { @@ -2162,9 +2162,9 @@ TQImage TQImage::convertDepth( int depth, int conversion_flags ) const else { #if defined(QT_CHECK_RANGE) if ( isNull() ) - qWarning( "TQImage::convertDepth: Image is a null image" ); + tqWarning( "TQImage::convertDepth: Image is a null image" ); else - qWarning( "TQImage::convertDepth: Depth %d not supported", depth ); + tqWarning( "TQImage::convertDepth: Depth %d not supported", depth ); #endif } return image; @@ -2206,7 +2206,7 @@ int TQImage::pixelIndex( int x, int y ) const { #if defined(QT_CHECK_RANGE) if ( x < 0 || x >= width() ) { - qWarning( "TQImage::pixel: x=%d out of range", x ); + tqWarning( "TQImage::pixel: x=%d out of range", x ); return -12345; } #endif @@ -2225,7 +2225,7 @@ int TQImage::pixelIndex( int x, int y ) const #endif case 32: #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::pixelIndex: Not applicable for %d-bpp images " + tqWarning( "TQImage::pixelIndex: Not applicable for %d-bpp images " "(no palette)", depth() ); #endif return 0; @@ -2248,7 +2248,7 @@ TQRgb TQImage::pixel( int x, int y ) const { #if defined(QT_CHECK_RANGE) if ( x < 0 || x >= width() ) { - qWarning( "TQImage::pixel: x=%d out of range", x ); + tqWarning( "TQImage::pixel: x=%d out of range", x ); return 12345; } #endif @@ -2292,7 +2292,7 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb ) { if ( x < 0 || x >= width() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::setPixel: x=%d out of range", x ); + tqWarning( "TQImage::setPixel: x=%d out of range", x ); #endif return; } @@ -2300,7 +2300,7 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb ) uchar * s = scanLine( y ); if ( index_or_rgb > 1) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::setPixel: index=%d out of range", + tqWarning( "TQImage::setPixel: index=%d out of range", index_or_rgb ); #endif } else if ( bitOrder() == TQImage::LittleEndian ) { @@ -2317,7 +2317,7 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb ) } else if ( depth() == 8 ) { if (index_or_rgb > (uint)numColors()) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::setPixel: index=%d out of range", + tqWarning( "TQImage::setPixel: index=%d out of range", index_or_rgb ); #endif return; @@ -2789,7 +2789,7 @@ TQImage TQImage::smoothScale( const TQSize& s, ScaleMode mode ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::smoothScale: Image is a null image" ); + tqWarning( "TQImage::smoothScale: Image is a null image" ); #endif return copy(); } @@ -2854,7 +2854,7 @@ TQImage TQImage::scale( const TQSize& s, ScaleMode mode ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::scale: Image is a null image" ); + tqWarning( "TQImage::scale: Image is a null image" ); #endif return copy(); } @@ -2892,7 +2892,7 @@ TQImage TQImage::scaleWidth( int w ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::scaleWidth: Image is a null image" ); + tqWarning( "TQImage::scaleWidth: Image is a null image" ); #endif return copy(); } @@ -2921,7 +2921,7 @@ TQImage TQImage::scaleHeight( int h ) const { if ( isNull() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage::scaleHeight: Image is a null image" ); + tqWarning( "TQImage::scaleHeight: Image is a null image" ); #endif return copy(); } @@ -3336,7 +3336,7 @@ TQImage TQImage::swapRGB() const } #ifndef QT_NO_IMAGE_16_BIT } else if ( depth() == 16 ) { - qWarning( "TQImage::swapRGB not implemented for 16bpp" ); + tqWarning( "TQImage::swapRGB not implemented for 16bpp" ); #endif } else #endif //QT_NO_IMAGE_TRUECOLOR @@ -3562,7 +3562,7 @@ bool TQImage::doImageIO( TQImageIO* io, int quality ) const io->setImage( *this ); #if defined(QT_CHECK_RANGE) if ( quality > 100 || quality < -1 ) - qWarning( "TQPixmap::save: quality out of range [-1,100]" ); + tqWarning( "TQPixmap::save: quality out of range [-1,100]" ); #endif if ( quality >= 0 ) io->setQuality( TQMIN(quality,100) ); @@ -3899,7 +3899,7 @@ void qt_init_image_handlers() // initialize image handlers imageHandlers = new TQIHList; TQ_CHECK_PTR( imageHandlers ); imageHandlers->setAutoDelete( TRUE ); - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); #ifndef QT_NO_IMAGEIO_BMP TQImageIO::defineIOHandler( "BMP", "^BM", 0, read_bmp_image, write_bmp_image ); @@ -4199,7 +4199,7 @@ void TQImageIO::setParameters( const char *parameters ) { if ( d && d->parameters ) delete [] (char*)d->parameters; - d->parameters = qstrdup( parameters ); + d->parameters = tqstrdup( parameters ); } /*! @@ -4502,7 +4502,7 @@ bool TQImageIO::write() } if ( !h || !h->write_image ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImageIO::write: No such image format handler: %s", + tqWarning( "TQImageIO::write: No such image format handler: %s", format() ); #endif return FALSE; @@ -4637,19 +4637,19 @@ bool read_dib( TQDataStream& s, int offset, int startpos, TQImage& image ) if ( d->atEnd() ) // end of stream/file return FALSE; #if 0 - qDebug( "offset...........%d", offset ); - qDebug( "startpos.........%d", startpos ); - qDebug( "biSize...........%d", bi.biSize ); - qDebug( "biWidth..........%d", bi.biWidth ); - qDebug( "biHeight.........%d", bi.biHeight ); - qDebug( "biPlanes.........%d", bi.biPlanes ); - qDebug( "biBitCount.......%d", bi.biBitCount ); - qDebug( "biCompression....%d", bi.biCompression ); - qDebug( "biSizeImage......%d", bi.biSizeImage ); - qDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter ); - qDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter ); - qDebug( "biClrUsed........%d", bi.biClrUsed ); - qDebug( "biClrImportant...%d", bi.biClrImportant ); + tqDebug( "offset...........%d", offset ); + tqDebug( "startpos.........%d", startpos ); + tqDebug( "biSize...........%d", bi.biSize ); + tqDebug( "biWidth..........%d", bi.biWidth ); + tqDebug( "biHeight.........%d", bi.biHeight ); + tqDebug( "biPlanes.........%d", bi.biPlanes ); + tqDebug( "biBitCount.......%d", bi.biBitCount ); + tqDebug( "biCompression....%d", bi.biCompression ); + tqDebug( "biSizeImage......%d", bi.biSizeImage ); + tqDebug( "biXPelsPerMeter..%d", bi.biXPelsPerMeter ); + tqDebug( "biYPelsPerMeter..%d", bi.biYPelsPerMeter ); + tqDebug( "biClrUsed........%d", bi.biClrUsed ); + tqDebug( "biClrImportant...%d", bi.biClrImportant ); #endif int w = bi.biWidth, h = bi.biHeight, nbits = bi.biBitCount; int t = bi.biSize, comp = bi.biCompression; @@ -5758,7 +5758,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc for( currentColor=0; currentColor < ncols; ++currentColor ) { if ( !read_xpm_string( buf, d, source, index ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage: XPM color specification missing"); + tqWarning( "TQImage: XPM color specification missing"); #endif return; } @@ -5769,7 +5769,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc i = nextColorSpec(buf); if ( i < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage: XPM color specification is missing: %s", buf.data()); + tqWarning( "TQImage: XPM color specification is missing: %s", buf.data()); #endif return; // no c/g/g4/m/s specification at all } @@ -5809,7 +5809,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc for( int y=0; y<h; y++ ) { if ( !read_xpm_string( buf, d, source, index ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQImage: XPM pixels missing on image line %d", y); + tqWarning( "TQImage: XPM pixels missing on image line %d", y); #endif return; } @@ -6478,7 +6478,7 @@ TQGfx * TQImage::graphicsContext() int h = qt_screen->mapToDevice( TQSize(width(),height()) ).height(); ret=TQGfx::createGfx(depth(),bits(),w,h,bytesPerLine()); } else { - qDebug("Trying to create image for null depth"); + tqDebug("Trying to create image for null depth"); return 0; } if(depth()<=8) { diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp index a59fecef1..654547f22 100644 --- a/src/kernel/qinputcontext.cpp +++ b/src/kernel/qinputcontext.cpp @@ -526,15 +526,15 @@ void TQInputContext::sendIMEventInternal( TQEvent::Type type, return; if ( type == TQEvent::IMStart ) { - qDebug( "sending IMStart with %d chars to %p", + tqDebug( "sending IMStart with %d chars to %p", text.length(), receiver ); event = new TQIMEvent( type, text, cursorPosition ); } else if ( type == TQEvent::IMEnd ) { - qDebug( "sending IMEnd with %d chars to %p, text=%s", + tqDebug( "sending IMEnd with %d chars to %p, text=%s", text.length(), receiver, (const char*)text.local8Bit() ); event = new TQIMEvent( type, text, cursorPosition ); } else if ( type == TQEvent::IMCompose ) { - qDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", + tqDebug( "sending IMCompose to %p with %d chars, cpos=%d, sellen=%d, text=%s", receiver, text.length(), cursorPosition, selLength, (const char*)text.local8Bit() ); event = new TQIMComposeEvent( type, text, cursorPosition, selLength ); diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 2a58f01d3..0b64c69cf 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -183,7 +183,7 @@ bool TQSharedDoubleBufferCleaner::event( TQEvent *e ) } #ifdef QT_CHECK_STATE else { - qWarning( "TQSharedDoubleBufferCleaner::event: invalid timer event received." ); + tqWarning( "TQSharedDoubleBufferCleaner::event: invalid timer event received." ); return FALSE; } #endif // QT_CHECK_STATE @@ -335,7 +335,7 @@ bool TQSharedDoubleBuffer::begin( TQPainter* painter, int x, int y, int w, int h { if ( isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSharedDoubleBuffer::begin: Buffer is already active." + tqWarning( "TQSharedDoubleBuffer::begin: Buffer is already active." "\n\tYou must end() the buffer before a second begin()" ); #endif // QT_CHECK_STATE return FALSE; @@ -390,7 +390,7 @@ bool TQSharedDoubleBuffer::begin( TQWidget* widget, int x, int y, int w, int h ) { if ( isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSharedDoubleBuffer::begin: Buffer is already active." + tqWarning( "TQSharedDoubleBuffer::begin: Buffer is already active." "\n\tYou must end() the buffer before a second begin()" ); #endif // QT_CHECK_STATE return FALSE; @@ -447,7 +447,7 @@ bool TQSharedDoubleBuffer::end() { if ( ! isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSharedDoubleBuffer::end: Buffer is not active." + tqWarning( "TQSharedDoubleBuffer::end: Buffer is not active." "\n\tYou must call begin() before calling end()." ); #endif // QT_CHECK_STATE return FALSE; @@ -584,7 +584,7 @@ void TQSharedDoubleBuffer::releasePixmap() // sanity check #ifdef QT_CHECK_STATE - qWarning( "TQSharedDoubleBuffer::releasePixmap: internal error." + tqWarning( "TQSharedDoubleBuffer::releasePixmap: internal error." "\n\t%p does not own shared pixmap, %p does.", (void*)this, (void*)qdb_owner ); #endif // QT_CHECK_STATE diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp index e7b33f8ca..cbc469fad 100644 --- a/src/kernel/qjpegio.cpp +++ b/src/kernel/qjpegio.cpp @@ -80,7 +80,7 @@ void my_error_exit (j_common_ptr cinfo) my_error_mgr* myerr = (my_error_mgr*) cinfo->err; char buffer[JMSG_LENGTH_MAX]; (*cinfo->err->format_message)(cinfo, buffer); - qWarning(buffer); + tqWarning(buffer); longjmp(myerr->setjmp_buffer, 1); } @@ -249,13 +249,13 @@ void read_jpeg_image(TQImageIO* iio) } else if ( sModeTQStr == "ScaleMax" ) { sMode = TQImage::ScaleMax; } else { - qDebug("read_jpeg_image: invalid scale mode \"%s\", see TQImage::ScaleMode documentation", sModeStr); + tqDebug("read_jpeg_image: invalid scale mode \"%s\", see TQImage::ScaleMode documentation", sModeStr); sMode = TQImage::ScaleFree; } -// qDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr ); +// tqDebug( "Parameters ask to scale the image to %i x %i ScaleMode: %s", sWidth, sHeight, sModeStr ); scaleSize( sWidth, sHeight, cinfo.output_width, cinfo.output_height, sMode ); -// qDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr ); +// tqDebug( "Scaling the jpeg to %i x %i", sWidth, sHeight, sModeStr ); bool created = FALSE; if ( cinfo.output_components == 3 || cinfo.output_components == 4) { diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp index c50110a16..17a49b6c6 100644 --- a/src/kernel/qkeysequence.cpp +++ b/src/kernel/qkeysequence.cpp @@ -300,7 +300,7 @@ void TQKeySequence::setKey( int key, int index ) { #ifdef QT_CHECK_STATE if ( 0 > index && 4 < index ) { - qWarning( "TQKeySequence::setKey: index %u out of range", index ); + tqWarning( "TQKeySequence::setKey: index %u out of range", index ); return; } #endif // QT_CHECK_STATE @@ -620,7 +620,7 @@ int TQKeySequence::operator[]( uint index ) const { #ifdef QT_CHECK_STATE if ( index > 4 ) { - qWarning( "TQKeySequence::operator[]: index %u out of range", index ); + tqWarning( "TQKeySequence::operator[]: index %u out of range", index ); return 0; } #endif // QT_CHECK_STATE @@ -707,7 +707,7 @@ TQDataStream &operator>>( TQDataStream &s, TQKeySequence &keysequence ) #ifdef QT_CHECK_STATE if ( 1 != list.count() && 4 != list.count() ) { - qWarning( "Invalid TQKeySequence data in the datastream." ); + tqWarning( "Invalid TQKeySequence data in the datastream." ); return s; } #endif diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp index 11960dba1..dfcf450dd 100644 --- a/src/kernel/qlayout.cpp +++ b/src/kernel/qlayout.cpp @@ -468,9 +468,9 @@ void TQGridLayoutData::add( TQGridBox *box, int row1, int row2, int col1, { #ifdef QT_CHECK_RANGE if ( row2 >= 0 && row2 < row1 ) - qWarning( "TQGridLayout: Multi-cell fromRow greater than toRow" ); + tqWarning( "TQGridLayout: Multi-cell fromRow greater than toRow" ); if ( col2 >= 0 && col2 < col1 ) - qWarning( "TQGridLayout: Multi-cell fromCol greater than toCol" ); + tqWarning( "TQGridLayout: Multi-cell fromCol greater than toCol" ); #endif if ( row1 == row2 && col1 == col2 ) { add( box, row1, col1 ); @@ -1216,7 +1216,7 @@ static bool checkWidget( TQLayout *l, TQWidget *w ) { if ( !w ) { #if defined(QT_CHECK_STATE) - qWarning( "TQLayout: Cannot add null widget to %s/%s", l->className(), + tqWarning( "TQLayout: Cannot add null widget to %s/%s", l->className(), l->name() ); #endif return FALSE; @@ -1224,12 +1224,12 @@ static bool checkWidget( TQLayout *l, TQWidget *w ) if ( w->parentWidget() != l->mainWidget() && l->mainWidget() ) { #if defined(QT_CHECK_STATE) if ( w->parentWidget() ) - qWarning( "TQLayout: Adding %s/%s (child of %s/%s) to layout for " + tqWarning( "TQLayout: Adding %s/%s (child of %s/%s) to layout for " "%s/%s", w->className(), w->name(), w->parentWidget()->className(), w->parentWidget()->name(), l->mainWidget()->className(), l->mainWidget()->name() ); else - qWarning( "TQLayout: Adding %s/%s (top-level widget) to layout for" + tqWarning( "TQLayout: Adding %s/%s (top-level widget) to layout for" " %s/%s", w->className(), w->name(), l->mainWidget()->className(), l->mainWidget()->name() ); #endif @@ -1264,7 +1264,7 @@ void TQGridLayout::addWidget( TQWidget *w, int row, int col, int alignment ) return; if ( row < 0 || col < 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", + tqWarning( "TQGridLayout: Cannot add %s/%s to %s/%s at row %d col %d", w->className(), w->name(), className(), name(), row, col ); #endif return; diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp index 73a0c8a5b..95ba0dc61 100644 --- a/src/kernel/qlocalfs.cpp +++ b/src/kernel/qlocalfs.cpp @@ -73,7 +73,7 @@ \endcode This code will only work if the TQLocalFs class is registered; to - register the class, you must call qInitNetworkProtocols() before + register the class, you must call tqInitNetworkProtocols() before using a TQUrlOperator with TQLocalFs. If you really need to use TQLocalFs directly, don't forget @@ -122,7 +122,7 @@ static int convertPermissions(TQFileInfo *fi) void TQLocalFs::operationListChildren( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationListChildren" ); + tqDebug( "TQLocalFs: operationListChildren" ); #endif op->setState( StInProgress ); @@ -171,7 +171,7 @@ void TQLocalFs::operationListChildren( TQNetworkOperation *op ) void TQLocalFs::operationMkDir( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationMkDir" ); + tqDebug( "TQLocalFs: operationMkDir" ); #endif op->setState( StInProgress ); TQString dirname = op->arg( 0 ); @@ -202,7 +202,7 @@ void TQLocalFs::operationMkDir( TQNetworkOperation *op ) void TQLocalFs::operationRemove( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationRemove" ); + tqDebug( "TQLocalFs: operationRemove" ); #endif op->setState( StInProgress ); TQString name = TQUrl( op->arg( 0 ) ).path(); @@ -236,7 +236,7 @@ void TQLocalFs::operationRemove( TQNetworkOperation *op ) void TQLocalFs::operationRename( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationRename" ); + tqDebug( "TQLocalFs: operationRename" ); #endif op->setState( StInProgress ); TQString oldname = op->arg( 0 ); @@ -263,7 +263,7 @@ void TQLocalFs::operationRename( TQNetworkOperation *op ) void TQLocalFs::operationGet( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationGet" ); + tqDebug( "TQLocalFs: operationGet" ); #endif op->setState( StInProgress ); TQString from = TQUrl( op->arg( 0 ) ).path(); @@ -271,7 +271,7 @@ void TQLocalFs::operationGet( TQNetworkOperation *op ) TQFile f( from ); if ( !f.open( IO_ReadOnly ) ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: could not open %s", from.latin1() ); + tqDebug( "TQLocalFs: could not open %s", from.latin1() ); #endif TQString msg = tr( "Could not open\n%1" ).arg( from ); op->setState( StFailed ); @@ -291,7 +291,7 @@ void TQLocalFs::operationGet( TQNetworkOperation *op ) emit data( s, op ); emit dataTransferProgress( f.size(), f.size(), op ); #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: got all %d bytes at once", f.size() ); + tqDebug( "TQLocalFs: got all %d bytes at once", f.size() ); #endif } else { s.resize( blockSize ); @@ -317,7 +317,7 @@ void TQLocalFs::operationGet( TQNetworkOperation *op ) if (!that) return; #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: got all %d bytes step by step", f.size() ); + tqDebug( "TQLocalFs: got all %d bytes step by step", f.size() ); #endif emit dataTransferProgress( f.size(), f.size(), op ); } @@ -334,7 +334,7 @@ void TQLocalFs::operationGet( TQNetworkOperation *op ) void TQLocalFs::operationPut( TQNetworkOperation *op ) { #ifdef TQLOCALFS_DEBUG - qDebug( "TQLocalFs: operationPut" ); + tqDebug( "TQLocalFs: operationPut" ); #endif op->setState( StInProgress ); TQString to = TQUrl( op->arg( 0 ) ).path(); diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp index d470c512c..49edf98ca 100644 --- a/src/kernel/qlock.cpp +++ b/src/kernel/qlock.cpp @@ -138,9 +138,9 @@ TQLock::TQLock( const TQString &filename, char id, bool create ) } #endif if ( data->id == -1 ) { - qWarning( "Cannot %s semaphore %s \'%c\'", + tqWarning( "Cannot %s semaphore %s \'%c\'", create ? "create" : "get", filename.latin1(), id ); - qDebug("Error %d %s\n",errno,strerror(errno)); + tqDebug("Error %d %s\n",errno,strerror(errno)); } #endif } @@ -211,7 +211,7 @@ void TQLock::lock( Type t ) for( int rv=1; rv; ) { rv = flock(data->id, op); if (rv == -1 && errno != EINTR) - qDebug("Semop lock failure %s",strerror(errno)); + tqDebug("Semop lock failure %s",strerror(errno)); } #else sembuf sops; @@ -230,7 +230,7 @@ void TQLock::lock( Type t ) do { rv = semop(data->id,&sops,1); if (rv == -1 && errno != EINTR) - qDebug("Semop lock failure %s",strerror(errno)); + tqDebug("Semop lock failure %s",strerror(errno)); } while ( rv == -1 && errno == EINTR ); #endif } @@ -256,7 +256,7 @@ void TQLock::unlock() for( int rv=1; rv; ) { rv = flock(data->id, LOCK_UN); if (rv == -1 && errno != EINTR) - qDebug("Semop lock failure %s",strerror(errno)); + tqDebug("Semop lock failure %s",strerror(errno)); } #else sembuf sops; @@ -270,12 +270,12 @@ void TQLock::unlock() do { rv = semop(data->id,&sops,1); if (rv == -1 && errno != EINTR) - qDebug("Semop unlock failure %s",strerror(errno)); + tqDebug("Semop unlock failure %s",strerror(errno)); } while ( rv == -1 && errno == EINTR ); #endif } } else { - qDebug("Unlock without corresponding lock"); + tqDebug("Unlock without corresponding lock"); } #endif } diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp index 5cdb20522..6dbc044a4 100644 --- a/src/kernel/qmetaobject.cpp +++ b/src/kernel/qmetaobject.cpp @@ -283,8 +283,8 @@ TQMetaObject::~TQMetaObject() delete signalDict; delete d; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( qt_metaobjects ) { qt_metaobjects->remove( classname ); @@ -423,7 +423,7 @@ int TQMetaObject::findSignal( const char* n, bool super ) const if ( md ) { #if defined(QT_CHECK_RANGE) if ( offset != -1 ) { - qWarning( "TQMetaObject::findSignal:%s: Conflict with %s::%s", + tqWarning( "TQMetaObject::findSignal:%s: Conflict with %s::%s", className(), mo->className(), n ); return offset; } @@ -800,8 +800,8 @@ TQMetaObject *TQMetaObject::metaObject( const char *class_name ) if ( !qt_metaobjects ) return 0; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); if ( func ) @@ -815,8 +815,8 @@ bool TQMetaObject::hasMetaObject( const char *class_name ) if ( !qt_metaobjects ) return FALSE; #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT return !!qt_metaobjects->find( class_name ); } @@ -1205,8 +1205,8 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp( const char *mo_name, TQtStaticMetaObje : metaObject( 0 ) { #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !qt_metaobjects ) qt_metaobjects = new TQAsciiDict<void>( 257 ); @@ -1227,8 +1227,8 @@ TQMetaObjectCleanUp::TQMetaObjectCleanUp() TQMetaObjectCleanUp::~TQMetaObjectCleanUp() { #ifdef QT_THREAD_SUPPORT - TQMutexLocker( qt_global_mutexpool ? - qt_global_mutexpool->get( &qt_metaobjects ) : 0 ); + TQMutexLocker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !--qt_metaobjects_count ) { delete qt_metaobjects; @@ -1245,7 +1245,7 @@ void TQMetaObjectCleanUp::setMetaObject( TQMetaObject *&mo ) { #if defined(QT_CHECK_RANGE) if ( metaObject ) - qWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" ); + tqWarning( "TQMetaObjectCleanUp::setMetaObject: Double use of TQMetaObjectCleanUp!" ); #endif metaObject = &mo; } diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 34d4b2152..d36b88aea 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -139,7 +139,7 @@ bool TQMimeSource::provides(const char* mimeType) const { const char* fmt; for (int i=0; (fmt = format(i)); i++) { - if ( !qstricmp(mimeType,fmt) ) + if ( !tqstricmp(mimeType,fmt) ) return TRUE; } return FALSE; diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp index 0bd83131a..bf4504c3c 100644 --- a/src/kernel/qmngio.cpp +++ b/src/kernel/qmngio.cpp @@ -122,7 +122,7 @@ public: mng_int32 iExtra2, mng_pchar zErrortext ) { - qWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d", + tqWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d", iErrorcode, zErrortext ? zErrortext : "", (iChunkname>>24)&0xff, (iChunkname>>16)&0xff, @@ -456,7 +456,7 @@ void qInitMngIO() done = TRUE; #ifndef QT_NO_ASYNC_IMAGE_IO globalMngFormatTypeObject = new TQMNGFormatType; - qAddPostRoutine( qCleanupMngIO ); + tqAddPostRoutine( qCleanupMngIO ); #endif } } diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index 0085b8956..fc97c3d68 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -597,12 +597,12 @@ static DndTargetsTable TargetsTable(Display *display) &type, &format, &size, &bytes_after, (unsigned char **) &target_prop) != Success) || type == None) { - qWarning("TQMotifDND: cannot get property on motif window"); + tqWarning("TQMotifDND: cannot get property on motif window"); return 0; } if (target_prop->protocol_version != DND_PROTOCOL_VERSION) { - qWarning("TQMotifDND: protocol mismatch"); + tqWarning("TQMotifDND: protocol mismatch"); } if (target_prop->byte_order != DndByteOrder()) { @@ -726,7 +726,7 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) TQByteArray result; // try to convert the selection to the requested property - // qDebug( "trying to convert to '%s'", mimeType ); + // tqDebug( "trying to convert to '%s'", mimeType ); int n=0; const char* f; @@ -735,22 +735,22 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) if ( !f ) return result; n++; - } while( qstricmp( mimeType, f ) ); + } while( tqstricmp( mimeType, f ) ); // found one Atom conversion_type; - if ( qstrnicmp( f, "text/", 5 ) == 0 ) { + if ( tqstrnicmp( f, "text/", 5 ) == 0 ) { // always convert text to XA_STRING for compatibility with // prior TQt versions conversion_type = XA_STRING; } else { conversion_type = *qt_xdnd_str_to_atom( f ); - // qDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, + // tqDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, // qt_xdnd_atom_to_str( conversion_type ) ); } - if ( XGetSelectionOwner( qt_xdisplay(), + if ( XGetSelectionOwner( tqt_xdisplay(), Dnd_selection ) == None ) { return result; // should never happen? } @@ -761,19 +761,19 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) } // convert selection to the appropriate type - XConvertSelection (qt_xdisplay(), Dnd_selection, conversion_type, + XConvertSelection (tqt_xdisplay(), Dnd_selection, conversion_type, Dnd_selection, tw->winId(), Dnd_selection_time); - XFlush( qt_xdisplay() ); + XFlush( tqt_xdisplay() ); XEvent xevent; - bool got=qt_xclb_wait_for_event( qt_xdisplay(), + bool got=qt_xclb_wait_for_event( tqt_xdisplay(), tw->winId(), SelectionNotify, &xevent, 5000); if ( got ) { Atom type; - if ( qt_xclb_read_property( qt_xdisplay(), + if ( qt_xclb_read_property( tqt_xdisplay(), tw->winId(), Dnd_selection, TRUE, &result, 0, &type, 0, TRUE ) ) { @@ -781,11 +781,11 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) } // we have to convert selection in order to indicate success to the initiator - XConvertSelection (qt_xdisplay(), Dnd_selection, Dnd_transfer_success, + XConvertSelection (tqt_xdisplay(), Dnd_selection, Dnd_transfer_success, Dnd_selection, tw->winId(), Dnd_selection_time); // wait again for SelectionNotify event - qt_xclb_wait_for_event( qt_xdisplay(), + qt_xclb_wait_for_event( tqt_xdisplay(), tw->winId(), SelectionNotify, &xevent, 5000); @@ -938,7 +938,7 @@ void qt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pas case DND_DROP_START: if (!in_drop_site) { // we have to convert selection in order to indicate failure to the initiator - XConvertSelection (qt_xdisplay(), dnd_data.property, Dnd_transfer_failure, + XConvertSelection (tqt_xdisplay(), dnd_data.property, Dnd_transfer_failure, dnd_data.property, cur_window, dnd_data.time); TQDragLeaveEvent e; TQApplication::sendEvent( drop_widget, &e ); diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp index c53649119..021636c68 100644 --- a/src/kernel/qnetworkprotocol.cpp +++ b/src/kernel/qnetworkprotocol.cpp @@ -51,9 +51,9 @@ //#define TQNETWORKPROTOCOL_DEBUG #define NETWORK_OP_DELAY 1000 -extern Q_EXPORT TQNetworkProtocolDict *qNetworkProtocolRegister; +extern Q_EXPORT TQNetworkProtocolDict *tqNetworkProtocolRegister; -TQNetworkProtocolDict *qNetworkProtocolRegister = 0; +TQNetworkProtocolDict *tqNetworkProtocolRegister = 0; class TQNetworkProtocolPrivate { @@ -542,7 +542,7 @@ int TQNetworkProtocol::supportedOperations() const void TQNetworkProtocol::addOperation( TQNetworkOperation *op ) { #ifdef TQNETWORKPROTOCOL_DEBUG - qDebug( "TQNetworkOperation: addOperation: %p %d", op, op->operation() ); + tqDebug( "TQNetworkOperation: addOperation: %p %d", op, op->operation() ); #endif d->operationQueue.enqueue( op ); if ( !d->opInProgress ) @@ -566,12 +566,12 @@ void TQNetworkProtocol::addOperation( TQNetworkOperation *op ) void TQNetworkProtocol::registerNetworkProtocol( const TQString &protocol, TQNetworkProtocolFactoryBase *protocolFactory ) { - if ( !qNetworkProtocolRegister ) { - qNetworkProtocolRegister = new TQNetworkProtocolDict; + if ( !tqNetworkProtocolRegister ) { + tqNetworkProtocolRegister = new TQNetworkProtocolDict; TQNetworkProtocol::registerNetworkProtocol( "file", new TQNetworkProtocolFactory< TQLocalFs > ); } - qNetworkProtocolRegister->insert( protocol, protocolFactory ); + tqNetworkProtocolRegister->insert( protocol, protocolFactory ); } /*! @@ -596,15 +596,15 @@ void TQNetworkProtocol::registerNetworkProtocol( const TQString &protocol, TQNetworkProtocol *TQNetworkProtocol::getNetworkProtocol( const TQString &protocol ) { - if ( !qNetworkProtocolRegister ) { - qNetworkProtocolRegister = new TQNetworkProtocolDict; + if ( !tqNetworkProtocolRegister ) { + tqNetworkProtocolRegister = new TQNetworkProtocolDict; TQNetworkProtocol::registerNetworkProtocol( "file", new TQNetworkProtocolFactory< TQLocalFs > ); } if ( protocol.isNull() ) return 0; - TQNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->find( protocol ); + TQNetworkProtocolFactoryBase *factory = tqNetworkProtocolRegister->find( protocol ); if ( factory ) return factory->createObject(); @@ -619,10 +619,10 @@ TQNetworkProtocol *TQNetworkProtocol::getNetworkProtocol( const TQString &protoc bool TQNetworkProtocol::hasOnlyLocalFileSystem() { - if ( !qNetworkProtocolRegister ) + if ( !tqNetworkProtocolRegister ) return FALSE; - TQDictIterator< TQNetworkProtocolFactoryBase > it( *qNetworkProtocolRegister ); + TQDictIterator< TQNetworkProtocolFactoryBase > it( *tqNetworkProtocolRegister ); for ( ; it.current(); ++it ) if ( it.currentKey() != "file" ) return FALSE; @@ -637,7 +637,7 @@ bool TQNetworkProtocol::hasOnlyLocalFileSystem() void TQNetworkProtocol::startOps() { #ifdef TQNETWORKPROTOCOL_DEBUG - qDebug( "TQNetworkOperation: start processing operations" ); + tqDebug( "TQNetworkOperation: start processing operations" ); #endif processNextOperation( 0 ); } @@ -826,7 +826,7 @@ void TQNetworkProtocol::operationPutChunk( TQNetworkOperation * ) void TQNetworkProtocol::processNextOperation( TQNetworkOperation *old ) { #ifdef TQNETWORKPROTOCOL_DEBUG - qDebug( "TQNetworkOperation: process next operation, old: %p", old ); + tqDebug( "TQNetworkOperation: process next operation, old: %p", old ); #endif d->removeTimer->stop(); @@ -949,7 +949,7 @@ void TQNetworkProtocol::removeMe() { if ( d->autoDelete ) { #ifdef TQNETWORKPROTOCOL_DEBUG - qDebug( "TQNetworkOperation: autodelete of TQNetworkProtocol %p", this ); + tqDebug( "TQNetworkOperation: autodelete of TQNetworkProtocol %p", this ); #endif delete d->url; // destructor deletes the network protocol } diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index d79d655ef..e958f636e 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -275,7 +275,7 @@ void *qt_find_obj_child( TQObject *parent, const char *type, const char *name ) /* Preliminary signal spy */ -Q_EXPORT TQObject* qt_preliminary_signal_spy = 0; +Q_EXPORT TQObject* tqt_preliminary_signal_spy = 0; static TQObject* qt_spy_signal_sender = 0; static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) @@ -292,18 +292,18 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) mo = sender->metaObject(); while ( mo ) { s.sprintf( "%s_%s", mo->className(), sigData->name ); - int slot = qt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE ); + int slot = tqt_preliminary_signal_spy->metaObject()->findSlot( s, TRUE ); if ( slot >= 0 ) { #ifdef QT_THREAD_SUPPORT // protect access to qt_spy_signal_sender void * const address = &qt_spy_signal_sender; - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( address ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( address ) : 0 ); #endif // QT_THREAD_SUPPORT TQObject* old_sender = qt_spy_signal_sender; qt_spy_signal_sender = sender; - qt_preliminary_signal_spy->qt_invoke( slot, o ); + tqt_preliminary_signal_spy->qt_invoke( slot, o ); qt_spy_signal_sender = old_sender; break; } @@ -335,7 +335,7 @@ static void cleanup_object_trees() static void ensure_object_trees() { object_trees = new TQObjectList; - qAddPostRoutine( cleanup_object_trees ); + tqAddPostRoutine( cleanup_object_trees ); } static void insert_tree( TQObject* obj ) @@ -418,7 +418,7 @@ TQObject::TQObject( TQObject *parent, const char *name ) blockSig( FALSE ), // not blocking signals wasDeleted( FALSE ), // double-delete catcher isTree( FALSE ), // no tree yet - objname( name ? qstrdup(name) : 0 ), // set object name + objname( name ? tqstrdup(name) : 0 ), // set object name parentObj( 0 ), // no parent yet. It is set by insertChild() childObjects( 0 ), // no children yet connections( 0 ), // no connections yet @@ -463,7 +463,7 @@ TQObject::~TQObject() { if ( wasDeleted ) { #if defined(QT_DEBUG) - qWarning( "Double TQObject deletion detected." ); + tqWarning( "Double TQObject deletion detected." ); #endif return; } @@ -643,12 +643,12 @@ void *qt_inheritedBy( TQMetaObject *superClass, const TQObject *object ) future. If the object does not have a name, the name() function returns - "unnamed", so printf() (used in qDebug()) will not be asked to + "unnamed", so printf() (used in tqDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ). \code - qDebug( "MyClass::setPrecision(): (%s) invalid precision %f", + tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f", name(), newPrecision ); \endcode @@ -668,7 +668,7 @@ void TQObject::setName( const char *name ) { if ( objname ) delete [] (char*) objname; - objname = name ? qstrdup(name) : 0; + objname = name ? tqstrdup(name) : 0; } /*! @@ -756,7 +756,7 @@ bool TQObject::event( TQEvent *e ) { #if defined(QT_CHECK_NULL) if ( e == 0 ) - qWarning( "TQObject::event: Null events are not permitted" ); + tqWarning( "TQObject::event: Null events are not permitted" ); #endif if ( eventFilters ) { // try filters if ( activate_filters(e) ) // stopped by a filter @@ -883,7 +883,7 @@ void TQObject::customEvent( TQCustomEvent * ) if ( obj == textEdit ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *k = (TQKeyEvent*)ev; - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); return TRUE; } else { return FALSE; @@ -1005,7 +1005,7 @@ void TQObject::blockSignals( bool block ) void MyObject::timerEvent( TQTimerEvent *e ) { - qDebug( "timer event, id %d", e->timerId() ); + tqDebug( "timer event, id %d", e->timerId() ); } \endcode @@ -1242,7 +1242,7 @@ TQConnectionList *TQObject::receivers( const char* signal ) const TQConnectionList *TQObject::receivers( int signal ) const { #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY - if ( qt_preliminary_signal_spy && signal >= 0 ) { + if ( tqt_preliminary_signal_spy && signal >= 0 ) { if ( !connections ) { TQObject* that = (TQObject*) this; that->connections = new TQSignalVec( signal+1 ); @@ -1282,7 +1282,7 @@ void TQObject::insertChild( TQObject *obj ) if ( obj->parentObj && obj->parentObj != this ) { #if defined(QT_CHECK_STATE) if ( obj->parentObj != this && obj->isWidgetType() ) - qWarning( "TQObject::insertChild: Cannot reparent a widget, " + tqWarning( "TQObject::insertChild: Cannot reparent a widget, " "use TQWidget::reparent() instead" ); #endif obj->parentObj->removeChild( obj ); @@ -1293,7 +1293,7 @@ void TQObject::insertChild( TQObject *obj ) TQ_CHECK_PTR( childObjects ); } else if ( obj->parentObj == this ) { #if defined(QT_CHECK_STATE) - qWarning( "TQObject::insertChild: Object %s::%s already in list", + tqWarning( "TQObject::insertChild: Object %s::%s already in list", obj->className(), obj->name( "unnamed" ) ); #endif return; @@ -1368,7 +1368,7 @@ void TQObject::removeChild( TQObject *obj ) if ( e->type() == TQEvent::KeyPress ) { // special processing for key press TQKeyEvent *k = (TQKeyEvent *)e; - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); return TRUE; // eat event } else { // standard event processing @@ -1453,10 +1453,10 @@ static bool check_signal_macro( const TQObject *sender, const char *signal, int sigcode = (int)(*signal) - '0'; if ( sigcode != TQSIGNAL_CODE ) { if ( sigcode == TQSLOT_CODE ) - qWarning( "TQObject::%s: Attempt to %s non-signal %s::%s", + tqWarning( "TQObject::%s: Attempt to %s non-signal %s::%s", func, op, sender->className(), signal+1 ); else - qWarning( "TQObject::%s: Use the SIGNAL macro to %s %s::%s", + tqWarning( "TQObject::%s: Use the SIGNAL macro to %s %s::%s", func, op, sender->className(), signal ); return FALSE; } @@ -1467,7 +1467,7 @@ static bool check_member_code( int code, const TQObject *object, const char *member, const char *func ) { if ( code != TQSLOT_CODE && code != TQSIGNAL_CODE ) { - qWarning( "TQObject::%s: Use the SLOT or SIGNAL macro to " + tqWarning( "TQObject::%s: Use the SLOT or SIGNAL macro to " "%s %s::%s", func, func, object->className(), member ); return FALSE; } @@ -1483,10 +1483,10 @@ static void err_member_notfound( int code, const TQObject *object, case TQSIGNAL_CODE: type = "signal"; break; } if ( strchr(member,')') == 0 ) // common typing mistake - qWarning( "TQObject::%s: Parentheses expected, %s %s::%s", + tqWarning( "TQObject::%s: Parentheses expected, %s %s::%s", func, type, object->className(), member ); else - qWarning( "TQObject::%s: No such %s %s::%s", + tqWarning( "TQObject::%s: No such %s %s::%s", func, type, object->className(), member ); } @@ -1497,9 +1497,9 @@ static void err_info_about_objects( const char * func, { const char * a = sender->name(), * b = receiver->name(); if ( a ) - qWarning( "TQObject::%s: (sender name: '%s')", func, a ); + tqWarning( "TQObject::%s: (sender name: '%s')", func, a ); if ( b ) - qWarning( "TQObject::%s: (receiver name: '%s')", func, b ); + tqWarning( "TQObject::%s: (receiver name: '%s')", func, b ); } static void err_info_about_candidates( int code, @@ -1524,7 +1524,7 @@ static void err_info_about_candidates( int code, break; } if ( rm ) { - qWarning("TQObject::%s: Candidate: %s", func, newname.data()); + tqWarning("TQObject::%s: Candidate: %s", func, newname.data()); } } } @@ -1552,12 +1552,12 @@ static void err_info_about_candidates( int code, const TQObject *TQObject::sender() { #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY - if ( this == qt_preliminary_signal_spy ) { + if ( this == tqt_preliminary_signal_spy ) { # ifdef QT_THREAD_SUPPORT // protect access to qt_spy_signal_sender void * const address = &qt_spy_signal_sender; - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( address ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( address ) : 0 ); # endif // QT_THREAD_SUPPORT return qt_spy_signal_sender; } @@ -1748,7 +1748,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || receiver == 0 || signal == 0 || member == 0 ) { - qWarning( "TQObject::connect: Cannot connect %s::%s to %s::%s", + tqWarning( "TQObject::connect: Cannot connect %s::%s to %s::%s", sender ? sender->className() : "(null)", signal ? signal+1 : "(null)", receiver ? receiver->className() : "(null)", @@ -1825,7 +1825,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, } #if defined(QT_CHECK_RANGE) if ( !s->checkConnectArgs(signal,receiver,member) ) { - qWarning( "TQObject::connect: Incompatible sender/receiver arguments" + tqWarning( "TQObject::connect: Incompatible sender/receiver arguments" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1849,7 +1849,7 @@ bool TQObject::connect( const TQObject *sender, const char *signal, || ( TQUType::isEqual( sm->method->parameters[si-1].type, &static_QUType_varptr ) && TQUType::isEqual( rm->method->parameters[ri-1].type, &static_QUType_ptr ) ) ) continue; // varptr got introduced in 3.1 and is binary compatible with ptr - qWarning( "TQObject::connect: Incompatible sender/receiver marshalling" + tqWarning( "TQObject::connect: Incompatible sender/receiver marshalling" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1989,7 +1989,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || (receiver == 0 && member != 0) ) { - qWarning( "TQObject::disconnect: Unexpected null parameter" ); + tqWarning( "TQObject::disconnect: Unexpected null parameter" ); return FALSE; } #endif @@ -2061,7 +2061,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, } if ( signal_index < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQObject::disconnect: No such signal %s::%s", + tqWarning( "TQObject::disconnect: No such signal %s::%s", s->className(), signal ); #endif return FALSE; @@ -2333,7 +2333,7 @@ TQMetaObject* TQObject::staticTQtMetaObject() void TQObject::activate_signal( int signal ) { #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY - if ( qt_preliminary_signal_spy ) { + if ( tqt_preliminary_signal_spy ) { if ( !signalsBlocked() && signal >= 0 && ( !connections || !connections->at( signal ) ) ) { TQUObject o[1]; @@ -2360,7 +2360,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) return; #ifndef QT_NO_PRELIMINARY_SIGNAL_SPY - if ( qt_preliminary_signal_spy ) + if ( tqt_preliminary_signal_spy ) qt_spy_signal( this, connections->findRef( clist), o ); #endif @@ -2438,7 +2438,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) #define ACTIVATE_SIGNAL_WITH_PARAM(FNAME,TYPE) \ void TQObject::FNAME( int signal, TYPE param ) \ { \ - if ( qt_preliminary_signal_spy ) { \ + if ( tqt_preliminary_signal_spy ) { \ if ( !signalsBlocked() && signal >= 0 && \ ( !connections || !connections->at( signal ) ) ) { \ TQUObject o[2]; \ @@ -2504,7 +2504,7 @@ static void dumpRecursive( int level, TQObject *object ) flags += 'I'; } } - qDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, + tqDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, flags.latin1() ); if ( object->children() ) { TQObjectListIt it(*object->children()); @@ -2546,41 +2546,41 @@ void TQObject::dumpObjectTree() void TQObject::dumpObjectInfo() { #if defined(QT_DEBUG) - qDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); + tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); int n = 0; - qDebug( " SIGNALS OUT" ); + tqDebug( " SIGNALS OUT" ); if ( connections ) { TQConnectionList *clist; for ( uint i = 0; i < connections->size(); i++ ) { if ( ( clist = connections->at( i ) ) ) { - qDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); + tqDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); n++; register TQConnection *c; TQConnectionListIt cit(*clist); while ( (c=cit.current()) ) { ++cit; - qDebug( "\t --> %s::%s %s", c->object()->className(), + tqDebug( "\t --> %s::%s %s", c->object()->className(), c->object()->name( "unnamed" ), c->memberName() ); } } } } if ( n == 0 ) - qDebug( "\t<None>" ); + tqDebug( "\t<None>" ); - qDebug( " SIGNALS IN" ); + tqDebug( " SIGNALS IN" ); n = 0; if ( senderObjects ) { TQObject *sender = senderObjects->first(); while ( sender ) { - qDebug( "\t%s::%s", + tqDebug( "\t%s::%s", sender->className(), sender->name( "unnamed" ) ); n++; sender = senderObjects->next(); } } if ( n == 0 ) - qDebug( "\t<None>" ); + tqDebug( "\t<None>" ); #endif } @@ -2610,7 +2610,7 @@ bool TQObject::setProperty( const char *name, const TQVariant& value ) int id = meta->findProperty( name, TRUE ); const TQMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() || !p->writable() ) { - qWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", + tqWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", className(), name ); return FALSE; } @@ -2662,7 +2662,7 @@ TQVariant TQObject::property( const char *name ) const int id = meta->findProperty( name, TRUE ); const TQMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() ) { - qWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", + tqWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", className(), name ); return v; } diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp index 1036664e8..2521ffb1e 100644 --- a/src/kernel/qpaintdevice_x11.cpp +++ b/src/kernel/qpaintdevice_x11.cpp @@ -133,7 +133,7 @@ TQPaintDevice::TQPaintDevice( uint devflags ) { if ( !tqApp ) { // global constructor #if defined(QT_CHECK_STATE) - qFatal( "TQPaintDevice: Must construct a TQApplication before a " + tqFatal( "TQPaintDevice: Must construct a TQApplication before a " "TQPaintDevice" ); #endif return; @@ -153,7 +153,7 @@ TQPaintDevice::~TQPaintDevice() { #if defined(QT_CHECK_STATE) if ( paintingActive() ) - qWarning( "TQPaintDevice: Cannot destroy paint device that is being " + tqWarning( "TQPaintDevice: Cannot destroy paint device that is being " "painted" ); #endif if ( x11Data && x11Data->deref() ) { @@ -699,7 +699,7 @@ int TQPaintDevice::x11AppDpiY() bool TQPaintDevice::cmd( int, TQPainter *, TQPDevCmdParam * ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPaintDevice::cmd: Device has no command interface" ); + tqWarning( "TQPaintDevice::cmd: Device has no command interface" ); #endif return FALSE; } @@ -715,7 +715,7 @@ bool TQPaintDevice::cmd( int, TQPainter *, TQPDevCmdParam * ) int TQPaintDevice::metric( int ) const { #if defined(QT_CHECK_STATE) - qWarning( "TQPaintDevice::metrics: Device has no metric information" ); + tqWarning( "TQPaintDevice::metrics: Device has no metric information" ); #endif return 0; } @@ -778,7 +778,7 @@ static GC cache_mask_gc( Display *dpy, Drawable hd, int mask_no, Pixmap mask ) { if ( !init_mask_gc ) { // first time initialization init_mask_gc = TRUE; - qAddPostRoutine( cleanup_mask_gc ); + tqAddPostRoutine( cleanup_mask_gc ); for ( int i=0; i<max_mask_gcs; i++ ) gc_vec[i].gc = 0; } @@ -885,7 +885,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, bitBlt( pm, 0, 0, src, sx, sy, sw, sh ); } else { #if defined(QT_CHECK_RANGE) - qWarning( "bitBlt: Cannot bitBlt from device" ); + tqWarning( "bitBlt: Cannot bitBlt from device" ); #endif return; } @@ -906,7 +906,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, break; default: #if defined(QT_CHECK_RANGE) - qWarning( "bitBlt: Cannot bitBlt from device type %x", ts ); + tqWarning( "bitBlt: Cannot bitBlt from device type %x", ts ); #endif return; } @@ -917,7 +917,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, break; default: #if defined(QT_CHECK_RANGE) - qWarning( "bitBlt: Cannot bitBlt to device type %x", td ); + tqWarning( "bitBlt: Cannot bitBlt to device type %x", td ); #endif return; } @@ -930,14 +930,14 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, }; if ( rop > TQt::LastROP ) { #if defined(QT_CHECK_RANGE) - qWarning( "bitBlt: Invalid ROP code" ); + tqWarning( "bitBlt: Invalid ROP code" ); #endif return; } if ( dst->handle() == 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "bitBlt: Cannot bitBlt to device" ); + tqWarning( "bitBlt: Cannot bitBlt to device" ); #endif return; } @@ -975,7 +975,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, if ( mono_dst && !mono_src ) { // dest is 1-bit pixmap, source is not #if defined(QT_CHECK_RANGE) - qWarning( "bitBlt: Incompatible destination pixmap" ); + tqWarning( "bitBlt: Incompatible destination pixmap" ); #endif return; } @@ -1058,7 +1058,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy, return; } - gc = qt_xget_temp_gc( dst->x11Screen(), mono_dst ); // get a reusable GC + gc = tqt_xget_temp_gc( dst->x11Screen(), mono_dst ); // get a reusable GC if ( rop != TQt::CopyROP ) // use non-default ROP code XSetFunction( dpy, gc, ropCodes[rop] ); diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp index d21be3703..79960a4ec 100644 --- a/src/kernel/qpainter.cpp +++ b/src/kernel/qpainter.cpp @@ -601,7 +601,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, const TQWidget *copyAttributes, { if ( copyAttributes == 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQPainter::begin: The widget to copy attributes from cannot " + tqWarning( "TQPainter::begin: The widget to copy attributes from cannot " "be null" ); #endif return FALSE; @@ -684,7 +684,7 @@ void TQPainter::killPStack() { #if defined(QT_CHECK_STATE) if ( ps_stack && !((TQPStateStack *)ps_stack)->isEmpty() ) - qWarning( "TQPainter::killPStack: non-empty save/restore stack when " + tqWarning( "TQPainter::killPStack: non-empty save/restore stack when " "end() was called" ); #endif delete (TQPStateStack *)ps_stack; @@ -763,7 +763,7 @@ void TQPainter::restore() TQPStateStack *pss = (TQPStateStack *)ps_stack; if ( pss == 0 || pss->isEmpty() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::restore: Empty stack error" ); + tqWarning( "TQPainter::restore: Empty stack error" ); #endif return; } @@ -842,7 +842,7 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ) } #if defined(QT_CHECK_NULL) if ( pdev == 0 ) - qWarning( "TQPainter::redirect: The pdev argument cannot be 0" ); + tqWarning( "TQPainter::redirect: The pdev argument cannot be 0" ); #endif if ( replacement ) { pdev_dict->insert( pdev, replacement ); @@ -920,7 +920,7 @@ void TQPainter::setPen( const TQPen &pen ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setPen: Will be reset by begin()" ); + tqWarning( "TQPainter::setPen: Will be reset by begin()" ); #endif if ( cpen == pen ) return; @@ -941,7 +941,7 @@ void TQPainter::setPen( PenStyle style ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setPen: Will be reset by begin()" ); + tqWarning( "TQPainter::setPen: Will be reset by begin()" ); #endif TQPen::TQPenData *d = cpen.data; // low level access if ( d->style == style && d->linest == style && !d->width && d->color == TQt::black ) @@ -970,7 +970,7 @@ void TQPainter::setPen( const TQColor &color ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setPen: Will be reset by begin()" ); + tqWarning( "TQPainter::setPen: Will be reset by begin()" ); #endif TQPen::TQPenData *d = cpen.data; // low level access if ( d->color == color && !d->width && d->style == SolidLine && d->linest == SolidLine ) @@ -1008,7 +1008,7 @@ void TQPainter::setBrush( const TQBrush &brush ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setBrush: Will be reset by begin()" ); + tqWarning( "TQPainter::setBrush: Will be reset by begin()" ); #endif if ( cbrush == brush ) return; @@ -1027,7 +1027,7 @@ void TQPainter::setBrush( BrushStyle style ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setBrush: Will be reset by begin()" ); + tqWarning( "TQPainter::setBrush: Will be reset by begin()" ); #endif TQBrush::TQBrushData *d = cbrush.data; // low level access if ( d->style == style && d->color == TQt::black && !d->pixmap ) @@ -1058,7 +1058,7 @@ void TQPainter::setBrush( const TQColor &color ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setBrush: Will be reset by begin()" ); + tqWarning( "TQPainter::setBrush: Will be reset by begin()" ); #endif TQBrush::TQBrushData *d = cbrush.data; // low level access if ( d->color == color && d->style == SolidPattern && !d->pixmap ) @@ -1136,7 +1136,7 @@ void TQPainter::setTabStops( int ts ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setTabStops: Will be reset by begin()" ); + tqWarning( "TQPainter::setTabStops: Will be reset by begin()" ); #endif tabstops = ts; if ( isActive() && testf(ExtDev) ) { // tell extended device @@ -1167,7 +1167,7 @@ void TQPainter::setTabArray( int *ta ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setTabArray: Will be reset by begin()" ); + tqWarning( "TQPainter::setTabArray: Will be reset by begin()" ); #endif if ( ta != tabarray ) { tabarraylen = 0; @@ -1218,7 +1218,7 @@ void TQPainter::setViewXForm( bool enable ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setViewXForm: Will be reset by begin()" ); + tqWarning( "TQPainter::setViewXForm: Will be reset by begin()" ); #endif if ( !isActive() || enable == testf(VxF) ) return; @@ -1272,7 +1272,7 @@ void TQPainter::setWindow( int x, int y, int w, int h ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setWindow: Will be reset by begin()" ); + tqWarning( "TQPainter::setWindow: Will be reset by begin()" ); #endif wx = x; wy = y; @@ -1322,7 +1322,7 @@ void TQPainter::setViewport( int x, int y, int w, int h ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setViewport: Will be reset by begin()" ); + tqWarning( "TQPainter::setViewport: Will be reset by begin()" ); #endif vx = x; vy = y; @@ -1354,7 +1354,7 @@ void TQPainter::setWorldXForm( bool enable ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setWorldXForm: Will be reset by begin()" ); + tqWarning( "TQPainter::setWorldXForm: Will be reset by begin()" ); #endif if ( !isActive() || enable == testf(WxF) ) return; @@ -1440,7 +1440,7 @@ void TQPainter::setWorldMatrix( const TQWMatrix &m, bool combine ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setWorldMatrix: Will be reset by begin()" ); + tqWarning( "TQPainter::setWorldMatrix: Will be reset by begin()" ); #endif return; } @@ -1493,7 +1493,7 @@ void TQPainter::restoreWorldMatrix() TQWMatrixStack *stack = (TQWMatrixStack *)wm_stack; if ( stack == 0 || stack->isEmpty() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::restoreWorldMatrix: Empty stack error" ); + tqWarning( "TQPainter::restoreWorldMatrix: Empty stack error" ); #endif return; } @@ -1774,7 +1774,7 @@ void TQPainter::map( int x, int y, int w, int h, } break; default: #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::map: Internal error" ); + tqWarning( "TQPainter::map: Internal error" ); #endif break; } @@ -1797,7 +1797,7 @@ void TQPainter::map( int x, int y, int w, int h, break; default: #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::map: Internal error" ); + tqWarning( "TQPainter::map: Internal error" ); #endif break; } @@ -1819,7 +1819,7 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const #ifndef QT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv ) - qWarning( "TQPainter::mapInv: Internal error" ); + tqWarning( "TQPainter::mapInv: Internal error" ); #endif if ( qt_old_transformations ) { double tx = im11()*x + im21()*y+idx(); @@ -1848,7 +1848,7 @@ void TQPainter::mapInv( int x, int y, int w, int h, #ifndef QT_NO_TRANSFORMATIONS #if defined(QT_CHECK_STATE) if ( !txinv || txop == TxRotShear ) - qWarning( "TQPainter::mapInv: Internal error" ); + tqWarning( "TQPainter::mapInv: Internal error" ); #endif if ( qt_old_transformations ) { double tx = im11()*x + idx(); @@ -2939,20 +2939,20 @@ void qt_format_text( const TQFont& font, const TQRect &_r, int desc = fm.descent(); height = -leading; - //qDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width()); + //tqDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width()); while ( !textLayout.atEnd() ) { height += leading; textLayout.beginLine( lineWidth == INT_MAX ? lineWidth : lineWidth ); - //qDebug("-----beginLine( %d )-----", lineWidth ); + //tqDebug("-----beginLine( %d )-----", lineWidth ); bool linesep = FALSE; while ( 1 ) { TQTextItem ti = textLayout.currentItem(); - //qDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() ); + //tqDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() ); if ( expandtabs && ti.isTab() ) { int tw = 0; int x = textLayout.widthUsed(); if ( tabarraylen ) { -// qDebug("tabarraylen=%d", tabarraylen ); +// tqDebug("tabarraylen=%d", tabarraylen ); int tab = 0; while ( tab < tabarraylen ) { if ( tabarray[tab] > x ) { @@ -2964,7 +2964,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, } else { tw = tabstops - (x % tabstops); } - //qDebug("tw = %d", tw ); + //tqDebug("tw = %d", tw ); if ( tw ) ti.setWidth( tw ); } @@ -2979,7 +2979,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, textLayout.setLineWidth( r.width()-rb-lb ); textLayout.endLine( 0, height, tf, &ascent, &descent, &lineLeft, &lineRight ); - //qDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight ); + //tqDebug("finalizing line: lw=%d ascent = %d, descent=%d lineleft=%d lineright=%d", lineWidth, ascent, descent,lineLeft, lineRight ); left = TQMIN( left, lineLeft ); right = TQMAX( right, lineRight ); height += ascent + descent + 1; @@ -2996,7 +2996,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, if ( brect ) { *brect = TQRect( r.x() + left, r.y() + yoff, right-left + lb+rb, height ); - //qDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right); + //tqDebug("br = %d %d %d/%d, left=%d, right=%d", brect->x(), brect->y(), brect->width(), brect->height(), left, right); } if (!(tf & TQPainter::DontPrint)) { @@ -3032,10 +3032,10 @@ void qt_format_text( const TQFont& font, const TQRect &_r, if (fnt.overline()) _tf |= TQt::Overline; if (fnt.strikeOut()) _tf |= TQt::StrikeOut; - //qDebug("have %d items",textLayout.numItems()); + //tqDebug("have %d items",textLayout.numItems()); for ( int i = 0; i < textLayout.numItems(); i++ ) { TQTextItem ti = textLayout.itemAt( i ); - //qDebug("Item %d: from=%d, length=%d, space=%d x=%d", i, ti.from(), ti.length(), ti.isSpace(), ti.x() ); + //tqDebug("Item %d: from=%d, length=%d, space=%d x=%d", i, ti.from(), ti.length(), ti.isSpace(), ti.x() ); if ( ti.isTab() || ti.isObject() ) continue; int textFlags = _tf; @@ -3803,7 +3803,7 @@ void TQBrush::setStyle( BrushStyle s ) // set brush style return; #if defined(QT_CHECK_RANGE) if ( s == CustomPattern ) - qWarning( "TQBrush::setStyle: CustomPattern is for internal use" ); + tqWarning( "TQBrush::setStyle: CustomPattern is for internal use" ); #endif detach(); data->style = s; @@ -3930,7 +3930,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBrush &b ) #ifndef QT_NO_IMAGEIO s << *b.pixmap(); #else - qWarning("No Image Brush I/O"); + tqWarning("No Image Brush I/O"); #endif return s; } @@ -3956,7 +3956,7 @@ TQDataStream &operator>>( TQDataStream &s, TQBrush &b ) s >> pm; b = TQBrush( color, pm ); #else - qWarning("No Image Brush I/O"); + tqWarning("No Image Brush I/O"); #endif } else diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index badbe9e23..a35b5b3b8 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -347,7 +347,7 @@ static GC alloc_gc( Display *dpy, int scrn, Drawable hd, bool monochrome=FALSE, p++; } #if defined(QT_CHECK_NULL) - qWarning( "TQPainter: Internal error; no available GC" ); + tqWarning( "TQPainter: Internal error; no available GC" ); #endif GC gc = XCreateGC( dpy, hd, 0, 0 ); XSetGraphicsExposures( dpy, gc, False ); @@ -449,9 +449,9 @@ static void cleanup_gc_cache() if ( !gc_cache_init ) return; #if defined(GC_CACHE_STAT) - qDebug( "Number of cache hits = %d", g_numhits ); - qDebug( "Number of cache creates = %d", g_numcreates ); - qDebug( "Number of cache faults = %d", g_numfaults ); + tqDebug( "Number of cache hits = %d", g_numhits ); + tqDebug( "Number of cache creates = %d", g_numcreates ); + tqDebug( "Number of cache faults = %d", g_numfaults ); for ( int i=0; i<gc_cache_size; i++ ) { TQCString str; TQBuffer buf( str ); @@ -464,7 +464,7 @@ static void cleanup_gc_cache() << g->count << '\t'; } s << '\0'; - qDebug( str ); + tqDebug( str ); buf.close(); } #endif @@ -640,7 +640,7 @@ void TQPainter::setFont( const TQFont &font ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setFont: Will be reset by begin()" ); + tqWarning( "TQPainter::setFont: Will be reset by begin()" ); #endif if ( cfont.d != font.d ) { cfont = font; @@ -1013,14 +1013,14 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) { if ( isActive() ) { // already active painting #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::begin: Painter is already active." + tqWarning( "TQPainter::begin: Painter is already active." "\n\tYou must end() the painter before a second begin()" ); #endif return FALSE; } if ( pd == 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQPainter::begin: Paint device cannot be null" ); + tqWarning( "TQPainter::begin: Paint device cannot be null" ); #endif return FALSE; } @@ -1039,7 +1039,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) if ( pdev->isExtDev() && pdev->paintingActive() ) { // somebody else is already painting #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::begin: Another TQPainter is already painting " + tqWarning( "TQPainter::begin: Another TQPainter is already painting " "this device;\n\tAn extended paint device can only be " "painted by one TQPainter at a time." ); #endif @@ -1129,7 +1129,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped ) TQPixmap *pm = (TQPixmap*)pdev; if ( pm->isNull() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQPainter::begin: Cannot paint null pixmap" ); + tqWarning( "TQPainter::begin: Cannot paint null pixmap" ); #endif end(); return FALSE; @@ -1189,7 +1189,7 @@ bool TQPainter::end() // end painting { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::end: Missing begin() or begin() failed" ); + tqWarning( "TQPainter::end: Missing begin() or begin() failed" ); #endif return FALSE; } @@ -1290,7 +1290,7 @@ void TQPainter::setBackgroundColor( const TQColor &c ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setBackgroundColor: Call begin() first" ); + tqWarning( "TQPainter::setBackgroundColor: Call begin() first" ); #endif return; } @@ -1325,13 +1325,13 @@ void TQPainter::setBackgroundMode( BGMode m ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setBackgroundMode: Call begin() first" ); + tqWarning( "TQPainter::setBackgroundMode: Call begin() first" ); #endif return; } if ( m != TransparentMode && m != OpaqueMode ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPainter::setBackgroundMode: Invalid mode" ); + tqWarning( "TQPainter::setBackgroundMode: Invalid mode" ); #endif return; } @@ -1379,13 +1379,13 @@ void TQPainter::setRasterOp( RasterOp r ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setRasterOp: Call begin() first" ); + tqWarning( "TQPainter::setRasterOp: Call begin() first" ); #endif return; } if ( (uint)r > LastROP ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPainter::setRasterOp: Invalid ROP code" ); + tqWarning( "TQPainter::setRasterOp: Invalid ROP code" ); #endif return; } @@ -1420,7 +1420,7 @@ void TQPainter::setBrushOrigin( int x, int y ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setBrushOrigin: Call begin() first" ); + tqWarning( "TQPainter::setBrushOrigin: Call begin() first" ); #endif return; } @@ -1449,7 +1449,7 @@ void TQPainter::setClipping( bool enable ) { if ( !isActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPainter::setClipping: Will be reset by begin()" ); + tqWarning( "TQPainter::setClipping: Will be reset by begin()" ); #endif return; } @@ -1514,7 +1514,7 @@ void TQPainter::setClipRegion( const TQRegion &rgn, CoordinateMode m ) { #if defined(QT_CHECK_STATE) if ( !isActive() ) - qWarning( "TQPainter::setClipRegion: Will be reset by begin()" ); + tqWarning( "TQPainter::setClipRegion: Will be reset by begin()" ); #endif if ( m == CoordDevice ) crgn = rgn; @@ -2501,7 +2501,7 @@ void TQPainter::drawCubicBezier( const TQPointArray &a, int index ) return; if ( a.size() - index < 4 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPainter::drawCubicBezier: Cubic Bezier needs 4 control " + tqWarning( "TQPainter::drawCubicBezier: Cubic Bezier needs 4 control " "points" ); #endif return; @@ -2681,7 +2681,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap, TQBitmap *comb = new TQBitmap( sw, sh ); comb->detach(); - GC cgc = qt_xget_temp_gc( pixmap.x11Screen(), TRUE ); // get temporary mono GC + GC cgc = tqt_xget_temp_gc( pixmap.x11Screen(), TRUE ); // get temporary mono GC XSetForeground( dpy, cgc, 0 ); XFillRectangle( dpy, comb->handle(), cgc, 0, 0, sw, sh ); XSetBackground( dpy, cgc, 0 ); diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp index 51947caa6..7f0cabe45 100644 --- a/src/kernel/qpalette.cpp +++ b/src/kernel/qpalette.cpp @@ -1100,13 +1100,13 @@ const TQBrush &TQPalette::directBrush( ColorGroup gr, TQColorGroup::ColorRole r { if ( (uint)gr > (uint)TQPalette::NColorGroups ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorGroup(%i) out of range", gr ); + tqWarning( "TQPalette::directBrush: colorGroup(%i) out of range", gr ); #endif return data->active.br[TQColorGroup::Foreground]; } if ( (uint)r >= (uint)TQColorGroup::NColorRoles ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorRole(%i) out of range", r ); + tqWarning( "TQPalette::directBrush: colorRole(%i) out of range", r ); #endif return data->active.br[TQColorGroup::Foreground]; } @@ -1124,7 +1124,7 @@ const TQBrush &TQPalette::directBrush( ColorGroup gr, TQColorGroup::ColorRole r break; } #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorGroup(%i) internal error", gr ); + tqWarning( "TQPalette::directBrush: colorGroup(%i) internal error", gr ); #endif return data->active.br[TQColorGroup::Foreground]; // Satisfy compiler } @@ -1133,13 +1133,13 @@ void TQPalette::directSetBrush( ColorGroup gr, TQColorGroup::ColorRole r, const { if ( (uint)gr > (uint)TQPalette::NColorGroups ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorGroup(%i) out of range", gr ); + tqWarning( "TQPalette::directBrush: colorGroup(%i) out of range", gr ); #endif return; } if ( (uint)r >= (uint)TQColorGroup::NColorRoles ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorRole(%i) out of range", r ); + tqWarning( "TQPalette::directBrush: colorRole(%i) out of range", r ); #endif return; } @@ -1155,7 +1155,7 @@ void TQPalette::directSetBrush( ColorGroup gr, TQColorGroup::ColorRole r, const break; default: #if defined(QT_CHECK_RANGE) - qWarning( "TQPalette::directBrush: colorGroup(%i) internal error", gr ); + tqWarning( "TQPalette::directBrush: colorGroup(%i) internal error", gr ); #endif break; } diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp index f7c60ad3b..64245179a 100644 --- a/src/kernel/qpicture.cpp +++ b/src/kernel/qpicture.cpp @@ -138,7 +138,7 @@ TQPicture::TQPicture( int formatVersion ) #if defined(QT_CHECK_RANGE) if ( formatVersion == 0 ) - qWarning( "TQPicture: invalid format version 0" ); + tqWarning( "TQPicture: invalid format version 0" ); #endif // still accept the 0 default from before TQt 3.0. @@ -260,7 +260,7 @@ bool TQPicture::load( TQIODevice *dev, const char *format ) } #endif if ( format ) { - qWarning( "TQPicture::load: No such picture format: %s", format ); + tqWarning( "TQPicture::load: No such picture format: %s", format ); return FALSE; } @@ -291,7 +291,7 @@ bool TQPicture::save( const TQString &fileName, const char *format ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPicture::save: still being painted on. " + tqWarning( "TQPicture::save: still being painted on. " "Call TQPainter::end() first" ); #endif return FALSE; @@ -300,7 +300,7 @@ bool TQPicture::save( const TQString &fileName, const char *format ) #ifndef QT_NO_SVG // identical to TQIODevice* code below but the file name // makes a difference when it comes to saving pixmaps - if ( qstricmp( format, "svg" ) == 0 ) { + if ( tqstricmp( format, "svg" ) == 0 ) { TQSvgDevice svg; TQPainter p( &svg ); if ( !play( &p ) ) @@ -326,14 +326,14 @@ bool TQPicture::save( TQIODevice *dev, const char *format ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPicture::save: still being painted on. " + tqWarning( "TQPicture::save: still being painted on. " "Call TQPainter::end() first" ); #endif return FALSE; } #ifndef QT_NO_SVG - if ( qstricmp( format, "svg" ) == 0 ) { + if ( tqstricmp( format, "svg" ) == 0 ) { TQSvgDevice svg; TQPainter p( &svg ); if ( !play( &p ) ) @@ -343,7 +343,7 @@ bool TQPicture::save( TQIODevice *dev, const char *format ) } #endif if ( format ) { - qWarning( "TQPicture::save: No such picture format: %s", format ); + tqWarning( "TQPicture::save: No such picture format: %s", format ); return FALSE; } @@ -409,7 +409,7 @@ bool TQPicture::play( TQPainter *painter ) s >> nrecords; if ( !exec( painter, s, nrecords ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::play: Format error" ); + tqWarning( "TQPicture::play: Format error" ); #endif d->pictb.close(); return FALSE; @@ -669,13 +669,13 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords ) break; default: #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::play: Invalid command %d", c ); + tqWarning( "TQPicture::play: Invalid command %d", c ); #endif if ( len ) // skip unknown command s.device()->at( s.device()->at()+len ); } #if defined(QT_DEBUG) - //qDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len ); + //tqDebug( "device->at(): %i, strm_pos: %i len: %i", s.device()->at(), strm_pos, len ); Q_ASSERT( Q_INT32(s.device()->at() - strm_pos) == len ); #endif } @@ -736,7 +736,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) } s << (Q_UINT32)trecs; // write number of records pictb.at( cs_start ); - Q_UINT16 cs = (Q_UINT16)qChecksum( buf.data()+data_start, pos-data_start ); + Q_UINT16 cs = (Q_UINT16)tqChecksum( buf.data()+data_start, pos-data_start ); s << cs; // write checksum pictb.close(); return TRUE; @@ -899,7 +899,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p ) break; #if defined(QT_CHECK_RANGE) default: - qWarning( "TQPicture::cmd: Command %d not recognized", c ); + tqWarning( "TQPicture::cmd: Command %d not recognized", c ); #endif } int newpos = (int)pictb.at(); // new position @@ -985,7 +985,7 @@ int TQPicture::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::metric: Invalid metric command" ); + tqWarning( "TQPicture::metric: Invalid metric command" ); #endif } return val; @@ -1120,7 +1120,7 @@ bool TQPicture::TQPicturePrivate::checkFormat() s.readRawBytes( mf_id, 4 ); // read actual tag if ( memcmp(mf_id, mfhdr_tag, 4) != 0 ) { // wrong header id #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::checkFormat: Incorrect header" ); + tqWarning( "TQPicture::checkFormat: Incorrect header" ); #endif pictb.close(); return FALSE; @@ -1131,10 +1131,10 @@ bool TQPicture::TQPicturePrivate::checkFormat() Q_UINT16 cs,ccs; TQByteArray buf = pictb.buffer(); // pointer to data s >> cs; // read checksum - ccs = qChecksum( buf.data() + data_start, buf.size() - data_start ); + ccs = tqChecksum( buf.data() + data_start, buf.size() - data_start ); if ( ccs != cs ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPicture::checkFormat: Invalid checksum %x, %x expected", + tqWarning( "TQPicture::checkFormat: Invalid checksum %x, %x expected", ccs, cs ); #endif pictb.close(); @@ -1145,7 +1145,7 @@ bool TQPicture::TQPicturePrivate::checkFormat() s >> major >> minor; // read version number if ( major > mfhdr_maj ) { // new, incompatible version #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::checkFormat: Incompatible version %d.%d", + tqWarning( "TQPicture::checkFormat: Incompatible version %d.%d", major, minor); #endif pictb.close(); @@ -1163,7 +1163,7 @@ bool TQPicture::TQPicturePrivate::checkFormat() } } else { #if defined(QT_CHECK_RANGE) - qWarning( "TQPicture::checkFormat: Format error" ); + tqWarning( "TQPicture::checkFormat: Format error" ); #endif pictb.close(); return FALSE; diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index c03ac42f6..95fbed5ab 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -405,7 +405,7 @@ TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name ) return TQPixmap( abs_name ); #if defined(QT_CHECK_STATE) if ( !abs_name.isEmpty() ) - qWarning( "TQPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory", + tqWarning( "TQPixmap::fromMimeSource: Cannot find pixmap \"%s\" in the mime source factory", abs_name.latin1() ); #endif return TQPixmap(); @@ -459,7 +459,7 @@ TQPixmap &TQPixmap::operator=( const TQPixmap &pixmap ) { if ( paintingActive() ) { #if defined(QT_CHECK_STATE) - qWarning("TQPixmap::operator=: Cannot assign to pixmap during painting"); + tqWarning("TQPixmap::operator=: Cannot assign to pixmap during painting"); #endif return *this; } @@ -673,7 +673,7 @@ void TQPixmap::resize( int w, int h ) } else #elif defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) if (data->alphapm) - qWarning("TQPixmap::resize: TODO: resize alpha data"); + tqWarning("TQPixmap::resize: TODO: resize alpha data"); else #endif // Q_WS_X11 if ( data->mask ) { // resize mask as well @@ -746,7 +746,7 @@ void TQPixmap::setMask( const TQBitmap &newmask ) if ( newmask.width() != width() || newmask.height() != height() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::setMask: The pixmap and the mask must have " + tqWarning( "TQPixmap::setMask: The pixmap and the mask must have " "the same size" ); #endif return; @@ -1054,7 +1054,7 @@ bool TQPixmap::doImageIO( TQImageIO* io, int quality ) const io->setImage( convertToImage() ); #if defined(QT_CHECK_RANGE) if ( quality > 100 || quality < -1 ) - qWarning( "TQPixmap::save: quality out of range [-1,100]" ); + tqWarning( "TQPixmap::save: quality out of range [-1,100]" ); #endif if ( quality >= 0 ) io->setQuality( TQMIN(quality,100) ); diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index cc8da0d3c..328f78175 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -141,7 +141,7 @@ static bool qt_create_mitshm_buffer( const TQPaintDevice* dev, int w, int h ) } else { if ( !XShmQueryVersion(dpy, &major, &minor, &pixmaps_ok) ) return FALSE; // MIT Shm not supported - qAddPostRoutine( qt_cleanup_mitshm ); + tqAddPostRoutine( qt_cleanup_mitshm ); xshminit = TRUE; } @@ -350,14 +350,14 @@ static void build_scale_table( uint **table, uint nBits ) { if ( nBits > 7 ) { #if defined(QT_CHECK_RANGE) - qWarning( "build_scale_table: internal error, nBits = %i", nBits ); + tqWarning( "build_scale_table: internal error, nBits = %i", nBits ); #endif return; } if (!*table) { static bool firstTable = TRUE; if ( firstTable ) { - qAddPostRoutine( cleanup_scale_tables ); + tqAddPostRoutine( cleanup_scale_tables ); firstTable = FALSE; } *table = new uint[256]; @@ -371,8 +371,8 @@ static void build_scale_table( uint **table, uint nBits ) static int defaultScreen = -1; -extern bool qt_use_xrender; // defined in qapplication_x11.cpp -extern bool qt_has_xft; // defined in qfont_x11.cpp +extern bool tqt_use_xrender; // defined in qapplication_x11.cpp +extern bool tqt_has_xft; // defined in qfont_x11.cpp #ifndef QT_NO_XFTFREETYPE #ifndef QT_XFT2 @@ -394,7 +394,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) { #if defined(QT_CHECK_STATE) if ( tqApp->type() == TQApplication::Tty ) { - qWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " + tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI " "is being used" ); } #endif @@ -441,7 +441,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) rendhd = 0; #if defined(QT_CHECK_RANGE) if ( !make_null ) - qWarning( "TQPixmap: Invalid pixmap parameters" ); + tqWarning( "TQPixmap: Invalid pixmap parameters" ); #endif return; } @@ -451,7 +451,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) w, h, data->d ); #ifndef QT_NO_XFTFREETYPE - if ( qt_has_xft ) { + if ( tqt_has_xft ) { if ( data->d == 1 ) { rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd ); } else { @@ -521,7 +521,7 @@ TQPixmap::TQPixmap( int w, int h, const uchar *bits, bool isXbitmap) (char *)bits, w, h ); #ifndef QT_NO_XFTFREETYPE - if ( qt_has_xft ) + if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreateBitmap (x11Display (), hd); #endif // QT_NO_XFTFREETYPE @@ -640,7 +640,7 @@ void TQPixmap::fill( const TQColor &fillColor ) if ( isNull() ) return; detach(); // detach other references - GC gc = qt_xget_temp_gc( x11Screen(), depth()==1 ); + GC gc = tqt_xget_temp_gc( x11Screen(), depth()==1 ); XSetForeground( x11Display(), gc, fillColor.pixel(x11Screen()) ); XFillRectangle( x11Display(), hd, gc, 0, 0, width(), height() ); } @@ -690,7 +690,7 @@ int TQPixmap::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::metric: Invalid metric command" ); + tqWarning( "TQPixmap::metric: Invalid metric command" ); #endif } } @@ -889,7 +889,7 @@ TQImage TQPixmap::convertToImage() const y = h; pixel = 0; // eliminate compiler warning #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::convertToImage: Invalid depth %d", + tqWarning( "TQPixmap::convertToImage: Invalid depth %d", bppc ); #endif } @@ -938,7 +938,7 @@ TQImage TQPixmap::convertToImage() const } else { /* Typically 2 or 4 bits display depth */ #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::convertToImage: Display not supported (bpp=%d)", + tqWarning( "TQPixmap::convertToImage: Display not supported (bpp=%d)", xi->bits_per_pixel ); #endif image.reset(); @@ -1098,7 +1098,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) { if ( img.isNull() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQPixmap::convertFromImage: Cannot convert a null image" ); + tqWarning( "TQPixmap::convertFromImage: Cannot convert a null image" ); #endif return FALSE; } @@ -1219,7 +1219,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) bits, w, h ); #ifndef QT_NO_XFTFREETYPE - if ( qt_has_xft ) + if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd ); #endif // QT_NO_XFTFREETYPE @@ -1352,7 +1352,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) int wordsize; bool bigendian; - qSysInfo( &wordsize, &bigendian ); + tqSysInfo( &wordsize, &bigendian ); bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian ); if( bppc == 8 ) // 8 bit @@ -1375,7 +1375,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) else mode = bppc == 33 ? BPP32_LSB : BPP32_MSB; } else - qFatal("Logic error 3"); + tqFatal("Logic error 3"); #define GET_PIXEL \ int pixel; \ @@ -1494,7 +1494,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) ) break; default: - qFatal("Logic error"); + tqFatal("Logic error"); } } else { switch ( mode ) { @@ -1591,7 +1591,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) ) break; default: - qFatal("Logic error 2"); + tqFatal("Logic error 2"); } } xi->data = (char *)newbits; @@ -1756,7 +1756,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) newbits = (uchar *)newerbits; } else if ( xi->bits_per_pixel != 8 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::convertFromImage: Display not supported " + tqWarning( "TQPixmap::convertFromImage: Display not supported " "(bpp=%d)", xi->bits_per_pixel ); #endif } @@ -1789,7 +1789,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) w, h, dd ); #ifndef QT_NO_XFTFREETYPE - if ( qt_has_xft ) { + if ( tqt_has_xft ) { if ( data->d == 1 ) { rendhd = (HANDLE) XftDrawCreateBitmap( x11Display (), hd ); } else { @@ -1803,11 +1803,11 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) #ifdef QT_MITSHM_CONVERSIONS if( mitshm_ximage ) - XShmPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE ), + XShmPutImage( dpy, hd, tqt_xget_readonly_gc( x11Screen(), FALSE ), xi, 0, 0, 0, 0, w, h, False ); else #endif - XPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE ), + XPutImage( dpy, hd, tqt_xget_readonly_gc( x11Screen(), FALSE ), xi, 0, 0, 0, 0, w, h ); data->w = w; @@ -1838,7 +1838,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) } } - if (qt_use_xrender && qt_has_xft && alphamap) { + if (tqt_use_xrender && tqt_has_xft && alphamap) { data->alphapm = new TQPixmap; // create a null pixmap // setup pixmap data @@ -2023,7 +2023,7 @@ TQPixmap TQPixmap::grabWindow( WId window, int x, int y, int w, int h ) pm.data->uninit = FALSE; pm.x11SetScreen( scr ); - GC gc = qt_xget_temp_gc( scr, FALSE ); + GC gc = tqt_xget_temp_gc( scr, FALSE ); XSetSubwindowMode( dpy, gc, IncludeInferiors ); XCopyArea( dpy, window, pm.handle(), gc, x, y, w, h, 0, 0 ); XSetSubwindowMode( dpy, gc, ClipByChildren ); @@ -2155,17 +2155,17 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const // #define QT_DEBUG_XIMAGE #if defined(QT_DEBUG_XIMAGE) - qDebug( "----IMAGE--INFO--------------" ); - qDebug( "width............. %d", xi->width ); - qDebug( "height............ %d", xi->height ); - qDebug( "xoffset........... %d", xi->xoffset ); - qDebug( "format............ %d", xi->format ); - qDebug( "byte order........ %d", xi->byte_order ); - qDebug( "bitmap unit....... %d", xi->bitmap_unit ); - qDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); - qDebug( "depth............. %d", xi->depth ); - qDebug( "bytes per line.... %d", xi->bytes_per_line ); - qDebug( "bits per pixel.... %d", xi->bits_per_pixel ); + tqDebug( "----IMAGE--INFO--------------" ); + tqDebug( "width............. %d", xi->width ); + tqDebug( "height............ %d", xi->height ); + tqDebug( "xoffset........... %d", xi->xoffset ); + tqDebug( "format............ %d", xi->format ); + tqDebug( "byte order........ %d", xi->byte_order ); + tqDebug( "bitmap unit....... %d", xi->bitmap_unit ); + tqDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); + tqDebug( "depth............. %d", xi->depth ); + tqDebug( "bytes per line.... %d", xi->bytes_per_line ); + tqDebug( "bits per pixel.... %d", xi->bits_per_pixel ); #endif int type; @@ -2188,7 +2188,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const if ( !qt_xForm_helper( mat, xi->xoffset, type, bpp, dptr, xbpl, p_inc, h, sptr, sbpl, ws, hs ) ){ #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::xForm: display not supported (bpp=%d)",bpp); + tqWarning( "TQPixmap::xForm: display not supported (bpp=%d)",bpp); #endif TQPixmap pm; return pm; @@ -2213,7 +2213,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const } return pm; } else { // color pixmap - GC gc = qt_xget_readonly_gc( x11Screen(), FALSE ); + GC gc = tqt_xget_readonly_gc( x11Screen(), FALSE ); TQPixmap pm( w, h ); pm.data->uninit = FALSE; pm.x11SetScreen( x11Screen() ); @@ -2234,7 +2234,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const pm.setMask( data->mask->xForm(matrix) ); #ifndef QT_NO_XFTFREETYPE - if ( qt_use_xrender && qt_has_xft && data->alphapm ) { // xform the alpha channel + if ( tqt_use_xrender && tqt_has_xft && data->alphapm ) { // xform the alpha channel XImage *axi = 0; if ((axi = XGetImage(x11Display(), data->alphapm->handle(), 0, 0, ws, hs, AllPlanes, ZPixmap))) { @@ -2325,7 +2325,7 @@ void TQPixmap::x11SetScreen( int screen ) return; } #if 0 - qDebug("TQPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); + tqDebug("TQPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); #endif TQImage img = convertToImage(); @@ -2415,8 +2415,8 @@ Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy, #ifndef QT_NO_XFTFREETYPE // copy alpha data - extern bool qt_use_xrender; // from qapplication_x11.cpp - if ( ! qt_use_xrender || ! src->data->alphapm ) + extern bool tqt_use_xrender; // from qapplication_x11.cpp + if ( ! tqt_use_xrender || ! src->data->alphapm ) return; if ( sw < 0 ) diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp index d2256bb66..6f350620a 100644 --- a/src/kernel/qpixmapcache.cpp +++ b/src/kernel/qpixmapcache.cpp @@ -307,7 +307,7 @@ void TQPixmapCache::setCacheLimit( int n ) { #ifdef Q_WS_MAC9 if(n > 256) - qWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); + tqWarning("TQPixmapCache::setCacheLimit: Setting cache limits high is harmfull to mac9's health"); #endif cache_limit = n; if ( pm_cache ) diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index 2d12ec985..b3a634ab5 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -309,7 +309,7 @@ extern "C" { #endif static void CALLBACK_CALL_TYPE qt_png_warning(png_structp /*png_ptr*/, png_const_charp message) { - qWarning("libpng warning: %s", message); + tqWarning("libpng warning: %s", message); } #if defined(Q_C_CALLBACKS) @@ -502,7 +502,7 @@ static void set_text(const TQImage& image, png_structp png_ptr, png_infop info_p text_ptr[i].compression = PNG_TEXT_COMPRESSION_zTXt; text_ptr[i].key = (png_charp)(*it).key.data(); text_ptr[i].text = (png_charp)t.latin1(); - //text_ptr[i].text = qstrdup(t.latin1()); + //text_ptr[i].text = tqstrdup(t.latin1()); i++; } } @@ -555,7 +555,7 @@ bool TQPNGImageWriter::writeImage(const TQImage& image, int quality_in, int off_ if (quality >= 0) { if (quality > 9) { #if defined(QT_CHECK_RANGE) - qWarning( "PNG: Quality %d out of range", quality ); + tqWarning( "PNG: Quality %d out of range", quality ); #endif quality = 9; } @@ -1268,7 +1268,7 @@ int TQPNGFormat::user_chunk(png_structp png, png_bytep data, png_uint_32 length) { #if 0 // NOT SUPPORTED: experimental PNG animation. - // qDebug("Got %ld-byte %s chunk", length, png->chunk_name); + // tqDebug("Got %ld-byte %s chunk", length, png->chunk_name); if ( 0==qstrcmp((char*)png->chunk_name, "gIFg") && length == 4 ) { @@ -1351,7 +1351,7 @@ void qInitPngIO() #ifndef QT_NO_ASYNC_IMAGE_IO globalPngFormatTypeObject = new TQPNGFormatType; #endif - qAddPostRoutine( qCleanupPngIO ); + tqAddPostRoutine( qCleanupPngIO ); } } diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp index 35fd3bc34..e75134a28 100644 --- a/src/kernel/qpoint.cpp +++ b/src/kernel/qpoint.cpp @@ -376,7 +376,7 @@ void TQPoint::warningDivByZero() { #if defined(QT_CHECK_MATH) - qWarning( "TQPoint: Division by zero error" ); + tqWarning( "TQPoint: Division by zero error" ); #endif } diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp index 6a9d3748d..5da55e2d4 100644 --- a/src/kernel/qpointarray.cpp +++ b/src/kernel/qpointarray.cpp @@ -915,7 +915,7 @@ TQPointArray TQPointArray::cubicBezier() const #ifdef USE_SIMPLE_QBEZIER_CODE if ( size() != 4 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPointArray::bezier: The array must have 4 control points" ); + tqWarning( "TQPointArray::bezier: The array must have 4 control points" ); #endif TQPointArray p; return p; @@ -969,7 +969,7 @@ TQPointArray TQPointArray::cubicBezier() const if ( size() != 4 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQPointArray::bezier: The array must have 4 control points" ); + tqWarning( "TQPointArray::bezier: The array must have 4 control points" ); #endif TQPointArray pa; return pa; diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp index 9597010f7..4b8175d96 100644 --- a/src/kernel/qprinter.cpp +++ b/src/kernel/qprinter.cpp @@ -367,7 +367,7 @@ void TQPrinter::setOutputToFile( bool enable ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPrinter::setOutputToFile: Cannot do this during printing" ); + tqWarning( "TQPrinter::setOutputToFile: Cannot do this during printing" ); #endif return; } @@ -400,7 +400,7 @@ void TQPrinter::setOutputFileName( const TQString &fileName ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - qWarning("TQPrinter::setOutputFileName: Cannot do this during printing"); + tqWarning("TQPrinter::setOutputFileName: Cannot do this during printing"); #endif return; } @@ -457,7 +457,7 @@ void TQPrinter::setDocName( const TQString &name ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPrinter::setDocName: Cannot do this during printing" ); + tqWarning( "TQPrinter::setDocName: Cannot do this during printing" ); #endif return; } @@ -550,7 +550,7 @@ void TQPrinter::setPageSize( PageSize newPageSize ) { if ( newPageSize > NPageSize ) { #if defined(QT_CHECK_STATE) - qWarning("TQPrinter::SetPageSize: illegal page size %d", newPageSize ); + tqWarning("TQPrinter::SetPageSize: illegal page size %d", newPageSize ); #endif return; } @@ -674,7 +674,7 @@ void TQPrinter::setFromTo( int fromPage, int toPage ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPrinter::setFromTo: Cannot do this during printing" ); + tqWarning( "TQPrinter::setFromTo: Cannot do this during printing" ); #endif return; } diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index bbe30a850..f2bb8820f 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -226,7 +226,7 @@ void TQPrinter::setPrinterName( const TQString &name ) { if ( state != 0 ) { #if defined(QT_CHECK_STATE) - qWarning( "TQPrinter::setPrinterName: Cannot do this during printing" ); + tqWarning( "TQPrinter::setPrinterName: Cannot do this during printing" ); #endif return; } @@ -258,7 +258,7 @@ bool TQPrinter::setup( TQWidget * parent ) if ( result ) { if ( !globalPrinterDefaults ) { globalPrinterDefaults = new PrinterDefaults; - qAddPostRoutine( deleteGlobalPrinterDefaults ); + tqAddPostRoutine( deleteGlobalPrinterDefaults ); } globalPrinterDefaults->printerName = printerName(); globalPrinterDefaults->outputToFile = outputToFile(); @@ -331,7 +331,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) TQApplication::flushX(); int fds[2]; if ( pipe( fds ) != 0 ) { - qWarning( "TQPSPrinter: could not open pipe to print" ); + tqWarning( "TQPSPrinter: could not open pipe to print" ); state = PST_ERROR; return FALSE; } @@ -587,7 +587,7 @@ int TQPrinter::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - qWarning( "TQPixmap::metric: Invalid metric command" ); + tqWarning( "TQPixmap::metric: Invalid metric command" ); #endif } return val; diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp index 17786eac2..1533a66a1 100644 --- a/src/kernel/qprocess.cpp +++ b/src/kernel/qprocess.cpp @@ -748,28 +748,28 @@ void TQProcess::writeToStdin( const TQString& buf ) void TQProcess::connectNotify( const char * signal ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::connectNotify(): signal %s has been connected", signal ); + tqDebug( "TQProcess::connectNotify(): signal %s has been connected", signal ); #endif if ( !ioRedirection ) if ( qstrcmp( signal, SIGNAL(readyReadStdout()) )==0 || qstrcmp( signal, SIGNAL(readyReadStderr()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::connectNotify(): set ioRedirection to TRUE" ); + tqDebug( "TQProcess::connectNotify(): set ioRedirection to TRUE" ); #endif setIoRedirection( TRUE ); return; } if ( !notifyOnExit && qstrcmp( signal, SIGNAL(processExited()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::connectNotify(): set notifyOnExit to TRUE" ); + tqDebug( "TQProcess::connectNotify(): set notifyOnExit to TRUE" ); #endif setNotifyOnExit( TRUE ); return; } if ( !wroteToStdinConnected && qstrcmp( signal, SIGNAL(wroteToStdin()) )==0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); + tqDebug( "TQProcess::connectNotify(): set wroteToStdinConnected to TRUE" ); #endif setWroteStdinConnected( TRUE ); return; @@ -785,19 +785,19 @@ void TQProcess::disconnectNotify( const char * ) receivers( SIGNAL(readyReadStderr()) ) ==0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::disconnectNotify(): set ioRedirection to FALSE" ); + tqDebug( "TQProcess::disconnectNotify(): set ioRedirection to FALSE" ); #endif setIoRedirection( FALSE ); } if ( notifyOnExit && receivers( SIGNAL(processExited()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::disconnectNotify(): set notifyOnExit to FALSE" ); + tqDebug( "TQProcess::disconnectNotify(): set notifyOnExit to FALSE" ); #endif setNotifyOnExit( FALSE ); } if ( wroteToStdinConnected && receivers( SIGNAL(wroteToStdin()) ) == 0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); + tqDebug( "TQProcess::disconnectNotify(): set wroteToStdinConnected to FALSE" ); #endif setWroteStdinConnected( FALSE ); } diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index 41260d53e..ff68a8860 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -134,7 +134,7 @@ public: TQProc( pid_t p, TQProcess *proc=0 ) : pid(p), process(proc) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProc: Constructor for pid %d and TQProcess %p", pid, process ); + tqDebug( "TQProc: Constructor for pid %d and TQProcess %p", pid, process ); #endif socketStdin = 0; socketStdout = 0; @@ -143,7 +143,7 @@ public: ~TQProc() { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProc: Destructor for pid %d and TQProcess %p", pid, process ); + tqDebug( "TQProc: Destructor for pid %d and TQProcess %p", pid, process ); #endif if ( process ) { if ( process->d->notifierStdin ) @@ -273,7 +273,7 @@ TQProcessManager::TQProcessManager() : sn(0) sigchldFd[1] = 0; } else { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: install socket notifier (%d)", sigchldFd[1] ); + tqDebug( "TQProcessManager: install socket notifier (%d)", sigchldFd[1] ); #endif sn = new TQSocketNotifier( sigchldFd[1], TQSocketNotifier::Read, this ); @@ -286,7 +286,7 @@ TQProcessManager::TQProcessManager() : sn(0) struct sigaction act; #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: install a SIGCHLD handler" ); + tqDebug( "TQProcessManager: install a SIGCHLD handler" ); #endif act.sa_handler = qt_C_sigchldHnd; sigemptyset( &(act.sa_mask) ); @@ -296,17 +296,17 @@ TQProcessManager::TQProcessManager() : sn(0) act.sa_flags |= SA_RESTART; #endif if ( sigaction( SIGCHLD, &act, &oldactChld ) != 0 ) - qWarning( "Error installing SIGCHLD handler" ); + tqWarning( "Error installing SIGCHLD handler" ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: install a SIGPIPE handler (SIG_IGN)" ); + tqDebug( "TQProcessManager: install a SIGPIPE handler (SIG_IGN)" ); #endif act.sa_handler = QT_SIGNAL_IGNORE; sigemptyset( &(act.sa_mask) ); sigaddset( &(act.sa_mask), SIGPIPE ); act.sa_flags = 0; if ( sigaction( SIGPIPE, &act, &oldactPipe ) != 0 ) - qWarning( "Error installing SIGPIPE handler" ); + tqWarning( "Error installing SIGPIPE handler" ); } TQProcessManager::~TQProcessManager() @@ -320,23 +320,23 @@ TQProcessManager::~TQProcessManager() // restore SIGCHLD handler #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: restore old sigchild handler" ); + tqDebug( "TQProcessManager: restore old sigchild handler" ); #endif if ( sigaction( SIGCHLD, &oldactChld, 0 ) != 0 ) - qWarning( "Error restoring SIGCHLD handler" ); + tqWarning( "Error restoring SIGCHLD handler" ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: restore old sigpipe handler" ); + tqDebug( "TQProcessManager: restore old sigpipe handler" ); #endif if ( sigaction( SIGPIPE, &oldactPipe, 0 ) != 0 ) - qWarning( "Error restoring SIGPIPE handler" ); + tqWarning( "Error restoring SIGPIPE handler" ); } void TQProcessManager::append( TQProc *p ) { procList->append( p ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: append process (procList.count(): %d)", procList->count() ); + tqDebug( "TQProcessManager: append process (procList.count(): %d)", procList->count() ); #endif } @@ -344,7 +344,7 @@ void TQProcessManager::remove( TQProc *p ) { procList->remove( p ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager: remove process (procList.count(): %d)", procList->count() ); + tqDebug( "TQProcessManager: remove process (procList.count(): %d)", procList->count() ); #endif cleanup(); } @@ -359,7 +359,7 @@ void TQProcessManager::cleanup() void TQProcessManager::removeMe() { if ( procList->count() == 0 ) { - qRemovePostRoutine(qprocess_cleanup); + tqRemovePostRoutine(qprocess_cleanup); TQProcessPrivate::procManager = 0; delete this; } @@ -381,7 +381,7 @@ void TQProcessManager::sigchldHnd( int fd ) char tmp; ::read( fd, &tmp, sizeof(tmp) ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager::sigchldHnd()" ); + tqDebug( "TQProcessManager::sigchldHnd()" ); #endif TQProc *proc; TQProcess *process; @@ -393,7 +393,7 @@ void TQProcessManager::sigchldHnd( int fd ) if ( process != 0 ) { if ( !process->isRunning() ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager::sigchldHnd() (PID: %d): process exited (TQProcess available)", proc->pid ); + tqDebug( "TQProcessManager::sigchldHnd() (PID: %d): process exited (TQProcess available)", proc->pid ); #endif /* Apparently, there is not consistency among different @@ -415,14 +415,14 @@ void TQProcessManager::sigchldHnd( int fd ) // read pending data if ( proc->socketStdout && ::ioctl(proc->socketStdout, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes ); + tqDebug( "TQProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stdout", proc->pid, nbytes ); #endif process->socketRead( proc->socketStdout ); } nbytes = 0; if ( proc->socketStderr && ::ioctl(proc->socketStderr, FIONREAD, (char*)&nbytes)==0 && nbytes>0 ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes ); + tqDebug( "TQProcessManager::sigchldHnd() (PID: %d): reading %d bytes of pending data on stderr", proc->pid, nbytes ); #endif process->socketRead( proc->socketStderr ); } @@ -450,7 +450,7 @@ void TQProcessManager::sigchldHnd( int fd ) int status; if ( ::waitpid( proc->pid, &status, WNOHANG ) == proc->pid ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessManager::sigchldHnd() (PID: %d): process exited (TQProcess not available)", proc->pid ); + tqDebug( "TQProcessManager::sigchldHnd() (PID: %d): process exited (TQProcess not available)", proc->pid ); #endif removeProc = TRUE; } @@ -480,7 +480,7 @@ TQProcessManager *TQProcessPrivate::procManager = 0; TQProcessPrivate::TQProcessPrivate() { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessPrivate: Constructor" ); + tqDebug( "TQProcessPrivate: Constructor" ); #endif stdinBufRead = 0; @@ -497,7 +497,7 @@ TQProcessPrivate::TQProcessPrivate() TQProcessPrivate::~TQProcessPrivate() { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcessPrivate: Destructor" ); + tqDebug( "TQProcessPrivate: Destructor" ); #endif if ( proc != 0 ) { @@ -543,7 +543,7 @@ void TQProcessPrivate::newProc( pid_t pid, TQProcess *process ) proc = new TQProc( pid, process ); if ( procManager == 0 ) { procManager = new TQProcessManager; - qAddPostRoutine(qprocess_cleanup); + tqAddPostRoutine(qprocess_cleanup); } // the TQProcessManager takes care of deleting the TQProc instances procManager->append( proc ); @@ -700,7 +700,7 @@ TQProcess::~TQProcess() bool TQProcess::start( TQStringList *env ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::start()" ); + tqDebug( "TQProcess::start()" ); #endif reset(); @@ -760,7 +760,7 @@ bool TQProcess::start( TQStringList *env ) arglistQ[i] = (*it).local8Bit(); arglist[i] = arglistQ[i]; #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::start(): arg %d = %s", i, arglist[i] ); + tqDebug( "TQProcess::start(): arg %d = %s", i, arglist[i] ); #endif i++; } @@ -788,7 +788,7 @@ bool TQProcess::start( TQStringList *env ) // in case the process exits tquickly. if ( d->procManager == 0 ) { d->procManager = new TQProcessManager; - qAddPostRoutine(qprocess_cleanup); + tqAddPostRoutine(qprocess_cleanup); } // fork and exec @@ -969,7 +969,7 @@ bool TQProcess::start( TQStringList *env ) error: #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::start(): error starting process" ); + tqDebug( "TQProcess::start(): error starting process" ); #endif if ( d->procManager ) d->procManager->cleanup(); @@ -1050,7 +1050,7 @@ bool TQProcess::isRunning() const { if ( d->exitValuesCalculated ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::isRunning(): FALSE (already computed)" ); + tqDebug( "TQProcess::isRunning(): FALSE (already computed)" ); #endif return FALSE; } @@ -1080,12 +1080,12 @@ bool TQProcess::isRunning() const } #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::isRunning() (PID: %d): FALSE", d->proc->pid ); + tqDebug( "TQProcess::isRunning() (PID: %d): FALSE", d->proc->pid ); #endif return FALSE; } #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::isRunning() (PID: %d): TRUE", d->proc->pid ); + tqDebug( "TQProcess::isRunning() (PID: %d): TRUE", d->proc->pid ); #endif return TRUE; } @@ -1142,7 +1142,7 @@ bool TQProcess::canReadLineStderr() const void TQProcess::writeToStdin( const TQByteArray& buf ) { #if defined(QT_QPROCESS_DEBUG) -// qDebug( "TQProcess::writeToStdin(): write to stdin (%d)", d->socketStdin ); +// tqDebug( "TQProcess::writeToStdin(): write to stdin (%d)", d->socketStdin ); #endif d->stdinBuf.enqueue( new TQByteArray(buf) ); if ( d->notifierStdin != 0 ) @@ -1169,10 +1169,10 @@ void TQProcess::closeStdin() delete d->notifierStdin; d->notifierStdin = 0; if ( ::close( d->proc->socketStdin ) != 0 ) { - qWarning( "Could not close stdin of child process" ); + tqWarning( "Could not close stdin of child process" ); } #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin ); + tqDebug( "TQProcess::closeStdin(): stdin (%d) closed", d->proc->socketStdin ); #endif d->proc->socketStdin = 0; } @@ -1193,7 +1193,7 @@ void TQProcess::socketRead( int fd ) } #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketRead(): %d", fd ); + tqDebug( "TQProcess::socketRead(): %d", fd ); #endif if ( fd == 0 ) return; @@ -1229,7 +1229,7 @@ void TQProcess::socketRead( int fd ) if ( n == 0 || n == -1 ) { if ( fd == d->proc->socketStdout ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketRead(): stdout (%d) closed", fd ); + tqDebug( "TQProcess::socketRead(): stdout (%d) closed", fd ); #endif d->notifierStdout->setEnabled( FALSE ); delete d->notifierStdout; @@ -1239,7 +1239,7 @@ void TQProcess::socketRead( int fd ) return; } else if ( fd == d->proc->socketStderr ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketRead(): stderr (%d) closed", fd ); + tqDebug( "TQProcess::socketRead(): stderr (%d) closed", fd ); #endif d->notifierStderr->setEnabled( FALSE ); delete d->notifierStderr; @@ -1279,13 +1279,13 @@ void TQProcess::socketRead( int fd ) d->socketReadCalled = TRUE; if ( fd == d->proc->socketStdout ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketRead(): %d bytes read from stdout (%d)", + tqDebug( "TQProcess::socketRead(): %d bytes read from stdout (%d)", buffer->size()-oldSize, fd ); #endif emit readyReadStdout(); } else if ( fd == d->proc->socketStderr ) { #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketRead(): %d bytes read from stderr (%d)", + tqDebug( "TQProcess::socketRead(): %d bytes read from stderr (%d)", buffer->size()-oldSize, fd ); #endif emit readyReadStderr(); @@ -1309,7 +1309,7 @@ void TQProcess::socketWrite( int fd ) d->stdinBuf.head()->data() + d->stdinBufRead, d->stdinBuf.head()->size() - d->stdinBufRead ); #if defined(QT_QPROCESS_DEBUG) - qDebug( "TQProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd ); + tqDebug( "TQProcess::socketWrite(): wrote %d bytes to stdin (%d)", ret, fd ); #endif if ( ret == -1 ) return; diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 7d660b471..c2b9aad7e 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -100,13 +100,13 @@ #include "qfontengine_p.h" #include "qtextlayout_p.h" #include "qtextengine_p.h" -extern bool qt_has_xft; +extern bool tqt_has_xft; #endif static bool qt_gen_epsf = FALSE; static bool embedFonts = TRUE; -Q_EXPORT void qt_generate_epsf( bool b ) +Q_EXPORT void tqt_generate_epsf( bool b ) { qt_gen_epsf = b; } @@ -1668,7 +1668,7 @@ unsigned short TQPSPrinterFontPrivate::insertIntoSubset( unsigned short u ) pageSubsetCount++; } } else { - qWarning("TQPSPrinterFont::internal error"); + tqWarning("TQPSPrinterFont::internal error"); } return retval; } @@ -1677,7 +1677,7 @@ void TQPSPrinterFontPrivate::restore() { page_subset.clear(); pageSubsetCount = 0; - //qDebug("restore for font %s\n",psname.latin1()); + //tqDebug("restore for font %s\n",psname.latin1()); } static inline const char *toHex( uchar u ) @@ -1814,7 +1814,7 @@ unsigned short TQPSPrinterFontPrivate::mapUnicode( unsigned short unicode ) if ( !found ) { return insertIntoSubset( unicode ); } - //qDebug("mapping unicode %x to %x", unicode, offset+*res); + //tqDebug("mapping unicode %x to %x", unicode, offset+*res); return offset + *res; } @@ -2289,7 +2289,7 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) else if (TQString(environment_preference) == "3") target_type = 3; else - qWarning("The value of QT_TTFTOPS must be 42 or 3"); + tqWarning("The value of QT_TTFTOPS must be 42 or 3"); } #endif offset_table = (unsigned char*) data.data(); /* first 12 bytes */ @@ -2318,12 +2318,12 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) ury = topost( getFWord( ptr + 42 ) ); indexToLocFormat = getSHORT( ptr + 50 ); /* size of 'loca' data */ if(indexToLocFormat != 0 && indexToLocFormat != 1) { - qWarning("TrueType font is unusable because indexToLocFormat != 0"); + tqWarning("TrueType font is unusable because indexToLocFormat != 0"); defective = TRUE; return; } if( getSHORT(ptr+52) != 0 ) { - qWarning("TrueType font is unusable because glyphDataFormat != 0"); + tqWarning("TrueType font is unusable because glyphDataFormat != 0"); defective = TRUE; return; } @@ -2340,7 +2340,7 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) BYTE* table_ptr = getTable("name"); /* pointer to table */ if ( !table_ptr ) { defective = TRUE; - qDebug("couldn't find name table" ); + tqDebug("couldn't find name table" ); return; } int numrecords = getUSHORT( table_ptr + 2 ); /* number of names */ @@ -2392,8 +2392,8 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) Fixed post_format = getFixed( post_table ); if( post_format.whole != 2 || post_format.fraction != 0 ) { - qWarning("TrueType font does not have a format 2.0 'post' table"); - qWarning("post format is %d.%d",post_format.whole,post_format.fraction); + tqWarning("TrueType font does not have a format 2.0 'post' table"); + tqWarning("post format is %d.%d",post_format.whole,post_format.fraction); // Sivan Feb 2001: no longer defective. // defective = TRUE; } @@ -2402,11 +2402,11 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) BYTE *maxp = getTable("maxp"); if ( !maxp ) { defective = TRUE; - qDebug("no maxp table in font"); + tqDebug("no maxp table in font"); return; } numGlyphs = getUSHORT( maxp + 4 ); -// qDebug("number of glyphs is %d", numGlyphs); +// tqDebug("number of glyphs is %d", numGlyphs); replacementList = makePSFontNameList( f, psname ); uni2glyphSetup(); } @@ -2505,8 +2505,8 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) return; } - //qDebug("downloading ttf font %s", psname.latin1() ); - //qDebug("target type=%d", target_type); + //tqDebug("downloading ttf font %s", psname.latin1() ); + //tqDebug("target type=%d", target_type); global_dict = global; TQMap<unsigned short, unsigned short> *subsetDict = ⊂ if ( !global ) @@ -2716,7 +2716,7 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) } else { /* type 3 */ if (!glyphset[x]) continue; - //qDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() ); + //tqDebug("emitting charproc for glyph %d, name=%s", x, glyphName(x).latin1() ); s << "/"; s << glyphName( x, glyphset ); s << "{"; @@ -2916,7 +2916,7 @@ void TQPSPrinterFontTTF::uni2glyphSetup() } } if (map==nmaps) { - qWarning("Font does not have unicode encoding\n"); + tqWarning("Font does not have unicode encoding\n"); return; // no unicode encoding! } @@ -2928,7 +2928,7 @@ void TQPSPrinterFontTTF::uni2glyphSetup() //fprintf(stderr,"Unicode cmap format %d\n",format); if (format != 4) { - //qWarning("Unicode cmap format is not 4"); + //tqWarning("Unicode cmap format is not 4"); return; } @@ -3145,7 +3145,7 @@ void TQPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset, ** two byte boundary. */ if( length % 2 ) { - qWarning("TrueType font contains a 'glyf' table without 2 byte padding"); + tqWarning("TrueType font contains a 'glyf' table without 2 byte padding"); defective = TRUE; return; } @@ -3168,7 +3168,7 @@ void TQPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset, /* Look for unexplainable descrepancies between sizes */ if( total != correct_total_length ) { - qWarning("TQPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length"); + tqWarning("TQPSPrinterFontTTF::sfnts_glyf_table: total != correct_total_length"); defective = TRUE; return; } @@ -3260,7 +3260,7 @@ void TQPSPrinterFontTTF::download_sfnts(TQTextStream& s) sfnts_pputUSHORT(81,s, string_len, line_len, in_string); /* rangeShift */ } else { - qWarning("Fewer than 9 tables selected"); + tqWarning("Fewer than 9 tables selected"); } /* Now, emmit the table directory. */ @@ -3297,7 +3297,7 @@ void TQPSPrinterFontTTF::download_sfnts(TQTextStream& s) string_len, line_len, in_string); } else { // other tables should not exceed 64K (not always true; Sivan) if( tables[x].length > 65535 ) { - qWarning("TrueType font has a table which is too long"); + tqWarning("TrueType font has a table which is too long"); defective = TRUE; return; } @@ -3699,7 +3699,7 @@ void TQPSPrinterFontTTF::charprocLoad(BYTE *glyph, charproc_data* cd) ct = *(glyph++); if( (x + ct) > cd->num_pts ) { - qWarning("Fatal Error in TT flags"); + tqWarning("Fatal Error in TT flags"); return; } @@ -4053,7 +4053,7 @@ TQPSPrinterFontPFA::TQPSPrinterFontPFA(const TQFontEngine *f, TQByteArray& d) TQString fontname; if (p[ pos ] != '%' || p[ pos+1 ] != '!') { // PFA marker - qWarning("invalid pfa file"); + tqWarning("invalid pfa file"); return; } @@ -4079,7 +4079,7 @@ void TQPSPrinterFontPFA::download(TQTextStream& s, bool global) return; } - //qDebug("downloading pfa font %s", psname.latin1() ); + //tqDebug("downloading pfa font %s", psname.latin1() ); char* p = data.data(); s << "% Font resource\n"; @@ -4111,7 +4111,7 @@ TQPSPrinterFontPFB::TQPSPrinterFontPFB(const TQFontEngine *f, TQByteArray& d) TQString fontname; if (p[ pos ] != 0x80) { // PFB marker - qWarning("pfb file does not start with 0x80"); + tqWarning("pfb file does not start with 0x80"); return; } pos++; @@ -4146,7 +4146,7 @@ void TQPSPrinterFontPFB::download(TQTextStream& s, bool global) return; } - //qDebug("downloading pfb font %s", psname.latin1() ); + //tqDebug("downloading pfb font %s", psname.latin1() ); unsigned char* p = (unsigned char*) data.data(); int pos; int len; @@ -4173,7 +4173,7 @@ void TQPSPrinterFontPFB::download(TQTextStream& s, bool global) len |= (p[ pos ] << 16); pos++; len |= (p[ pos ] << 24); pos++; - //qDebug("font block type %d len %d",typ,len); + //tqDebug("font block type %d len %d",typ,len); int end = pos + len; if (typ==1) { @@ -4182,7 +4182,7 @@ void TQPSPrinterFontPFB::download(TQTextStream& s, bool global) s << "\n"; hexcol = 0; } - //qWarning(TQString::fromLatin1((char*)(p+pos),1)); + //tqWarning(TQString::fromLatin1((char*)(p+pos),1)); if (p[pos] == '\r' || p[pos] == '\n') { s << "\n"; while (pos < end && (p[pos] == '\r' || p[pos] == '\n')) @@ -4233,7 +4233,7 @@ TQPSPrinterFontNotFound::TQPSPrinterFontNotFound(const TQFontEngine* f) void TQPSPrinterFontNotFound::download(TQTextStream& s, bool) { - //qDebug("downloading not found font %s", psname.latin1() ); + //tqDebug("downloading not found font %s", psname.latin1() ); emitPSFontNameList( s, psname, replacementList ); s << "% No embeddable font for "; s << psname; @@ -4350,7 +4350,7 @@ TQString TQPSPrinterFontAsian::defineFont( TQTextStream &stream, const TQString void TQPSPrinterFontAsian::download(TQTextStream& s, bool) { - //qDebug("downloading asian font %s", psname.latin1() ); + //tqDebug("downloading asian font %s", psname.latin1() ); s << "% Asian postscript font requested. Using " << psname << endl; emitPSFontNameList( s, psname, replacementList ); @@ -4871,7 +4871,7 @@ TQPSPrinterFontSimplifiedChinese::TQPSPrinterFontSimplifiedChinese(const TQFontE psname = SongGBK2K[type].psname; appendReplacements( replacementList, SimplifiedReplacements, type ); } - //qDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() ); + //tqDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() ); } TQString TQPSPrinterFontSimplifiedChinese::extension() const @@ -4921,14 +4921,14 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate #if defined( Q_WS_X11 ) bool xlfd = FALSE; - //qDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); + //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script); #ifndef QT_NO_XFTFREETYPE - if ( qt_has_xft && engine && engine->type() == TQFontEngine::Xft ) { + if ( tqt_has_xft && engine && engine->type() == TQFontEngine::Xft ) { XftPattern *pattern = static_cast<TQFontEngineXft *>( engine )->pattern(); char *filename = 0; XftPatternGetString (pattern, XFT_FILE, 0, &filename); - //qDebug("filename for font is '%s'", filename); + //tqDebug("filename for font is '%s'", filename); if ( filename ) { fontfilename = TQString::fromLocal8Bit( filename ); xfontname = fontfilename; @@ -4996,7 +4996,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate xfontname += "/" + toString( script ); #endif - //qDebug("looking for font %s in dict", xfontname.latin1() ); + //tqDebug("looking for font %s in dict", xfontname.latin1() ); p = priv->fonts.find(xfontname); if ( p ) return; @@ -5014,15 +5014,15 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate fontmapname = (*it) + "/fonts.scale"; else fontmapname = (*it) + "/fonts.dir"; - //qWarning(fontmapname); + //tqWarning(fontmapname); TQFile fontmap(fontmapname); if (fontmap.open(IO_ReadOnly)) { while (!fontmap.atEnd()) { TQString mapping; fontmap.readLine(mapping,512); // fold to lower (since X folds to lowercase) - //qWarning(xfontname); - //qWarning(mapping); + //tqWarning(xfontname); + //tqWarning(mapping); if (mapping.lower().contains(searchname.lower())) { int index = mapping.find(' ',0); TQString ffn = mapping.mid(0,index); @@ -5031,7 +5031,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate !ffn.contains( ".spd" ) && !ffn.contains( ".phont" ) ) { fontfilename = (*it) + TQString("/") + ffn; if ( TQFile::exists(fontfilename) ) { - //qDebug("found font file %s", fontfilename.latin1()); + //tqDebug("found font file %s", fontfilename.latin1()); break; } else // unset fontfilename fontfilename = TQString(); @@ -5046,7 +5046,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate } #endif - //qDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p); + //tqDebug("font=%s, fontname=%s, file=%s, p=%p", f.family().latin1(), xfontname.latin1(), fontfilename.latin1(), p); // memory mapping would be better here if (fontfilename.length() > 0) { // maybe there is no file name @@ -5074,7 +5074,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate } else type = NONE; - //qDebug("font is of type %d", type ); + //tqDebug("font is of type %d", type ); switch (type) { case TTF : p = new TQPSPrinterFontTTF(engine, data); @@ -5116,7 +5116,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate } } else #endif - //qDebug("didnt find font for %s", xfontname.latin1()); + //tqDebug("didnt find font for %s", xfontname.latin1()); p = new TQPSPrinterFontNotFound( engine ); break; } @@ -5128,14 +5128,14 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate TQDictIterator<TQPSPrinterFontPrivate> it( priv->fonts ); for( it.toFirst(); it.current(); ++it ) { if ( *(*it) == *p ) { -// qWarning("Post script driver: font already in dict"); +// tqWarning("Post script driver: font already in dict"); delete p; p = *it; return; } } - //qDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() ); + //tqDebug("inserting font %s in dict psname=%s", xfontname.latin1(), p->postScriptFontName().latin1() ); priv->fonts.insert( xfontname, p ); } @@ -5165,7 +5165,7 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) int npaths; char** font_path; - font_path = XGetFontPath( qt_xdisplay(), &npaths); + font_path = XGetFontPath( tqt_xdisplay(), &npaths); bool xfsconfig_read = FALSE; for (int i=0; i<npaths; i++) { // If we're using xfs, append font paths from /etc/X11/fs/config @@ -5235,7 +5235,7 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script ) } if ( f.pointSize() == 0 ) { #if defined(CHECK_RANGE) - qWarning( "TQPrinter: Cannot set a font with zero point size." ); + tqWarning( "TQPrinter: Cannot set a font with zero point size." ); #endif f.setPointSize(TQApplication::font().pointSize()); if ( f.pointSize() == 0 ) @@ -5529,7 +5529,7 @@ static TQByteArray compress( const TQImage & image, bool gray ) { #if 0 /* this should never happen: both the start and the end pointers ran off their tracks. */ - qDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d", + tqDebug( "oops! %06x %06x %06x %06x %5d %5d %5d %d", pixel[start], pixel[end], pixel[index], pixel[index+bestLength], start, end, index, bestLength ); @@ -5716,20 +5716,20 @@ static TQByteArray compress( const TQImage & image, bool gray ) { delete [] pixel; #ifdef DEBUG_COMPRESS - qDebug( "------------- image compression statistics ----------------" ); - qDebug(" compression time %d", t.elapsed() ); - qDebug( "Size dist of uncompressed blocks:" ); - qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1], + tqDebug( "------------- image compression statistics ----------------" ); + tqDebug(" compression time %d", t.elapsed() ); + tqDebug( "Size dist of uncompressed blocks:" ); + tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[0], sizeUncompressed[1], sizeUncompressed[2], sizeUncompressed[3], sizeUncompressed[4], sizeUncompressed[5]); - qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7], + tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeUncompressed[6], sizeUncompressed[7], sizeUncompressed[8], sizeUncompressed[9], sizeUncompressed[10] ); - qDebug( "Size dist of compressed blocks:" ); - qDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1], + tqDebug( "Size dist of compressed blocks:" ); + tqDebug( "\t%d\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[0], sizeCompressed[1], sizeCompressed[2], sizeCompressed[3], sizeCompressed[4], sizeCompressed[5]); - qDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7], + tqDebug( "\t%d\t%d\t%d\t%d\t%d\n", sizeCompressed[6], sizeCompressed[7], sizeCompressed[8], sizeCompressed[9], sizeCompressed[10] ); - qDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size ); - qDebug( "-----------------------------------------------------------" ); + tqDebug( "===> total compression ratio %d/%d = %f", outOffset, size, (float)outOffset/(float)size ); + tqDebug( "-----------------------------------------------------------" ); #endif return outarr; @@ -6061,7 +6061,7 @@ void TQPSPrinterPrivate::resetDrawingTools( TQPainter *paint ) if ( b != defaultBrush ) { if ( b == TQt::CustomPattern ) { #if defined(CHECK_RANGE) - qWarning( "TQPrinter: Pixmap brush not supported" ); + tqWarning( "TQPrinter: Pixmap brush not supported" ); #endif } else { cbrush = b; @@ -6171,7 +6171,7 @@ void TQPSPrinterPrivate::flushPage( bool last ) (last || buffer->size() > 50000000) #endif ) { -// qDebug("emiting header at page %d", pageCount ); +// tqDebug("emiting header at page %d", pageCount ); emitHeader( last ); } outStream << "%%Page: " @@ -6180,7 +6180,7 @@ void TQPSPrinterPrivate::flushPage( bool last ) << "QI\n"; if (!dirtyNewPage) { if ( pageFonts ) { - //qDebug("page fonts for page %d", pageCount); + //tqDebug("page fonts for page %d", pageCount); // we have already downloaded the header. Maybe we have page fonts here TQDictIterator<TQPSPrinterFontPrivate> it(fonts); while (it.current()) { @@ -6243,7 +6243,7 @@ static void ignoreSigPipe(bool b) return; // not ignoring sigpipe if (sigaction(SIGPIPE, users_sigpipe_handler, 0) == -1) - qWarning("TQPSPrinter: could not restore SIGPIPE handler"); + tqWarning("TQPSPrinter: could not restore SIGPIPE handler"); delete users_sigpipe_handler; users_sigpipe_handler = 0; @@ -6513,7 +6513,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) case PdcSetROP: #if defined(CHECK_RANGE) if ( p[0].ival != TQt::CopyROP ) - qWarning( "TQPrinter: Raster operation setting not supported" ); + tqWarning( "TQPrinter: Raster operation setting not supported" ); #endif break; case PdcSetBrushOrigin: @@ -6534,7 +6534,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p ) case PdcSetBrush: if ( p[0].brush->style() == TQt::CustomPattern ) { #if defined(CHECK_RANGE) - qWarning( "TQPrinter: Pixmap brush not supported" ); + tqWarning( "TQPrinter: Pixmap brush not supported" ); #endif return FALSE; } diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp index 6537b74ce..014f0fad0 100644 --- a/src/kernel/qregion.cpp +++ b/src/kernel/qregion.cpp @@ -174,7 +174,7 @@ void TQRegion::exec( const TQByteArray &buffer, int ver ) } #if defined(QT_CHECK_STATE) if ( test_cnt > 0 && id != TQRGN_TRANSLATE ) - qWarning( "TQRegion::exec: Internal error" ); + tqWarning( "TQRegion::exec: Internal error" ); test_cnt++; #endif if ( id == TQRGN_SETRECT || id == TQRGN_SETELLIPSE ) { diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index 3cd7d3436..ccf406729 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -2433,7 +2433,7 @@ static void cleanup_empty_region() TQRegion::TQRegion() { if ( !empty_region ) { // avoid too many allocs - qAddPostRoutine( cleanup_empty_region ); + tqAddPostRoutine( cleanup_empty_region ); empty_region = new TQRegion( TRUE ); TQ_CHECK_PTR( empty_region ); } @@ -2469,7 +2469,7 @@ TQRegion::TQRegion( const TQRect &r, RegionType t ) { if ( r.isEmpty() ) { if ( !empty_region ) { // avoid too many allocs - qAddPostRoutine( cleanup_empty_region ); + tqAddPostRoutine( cleanup_empty_region ); empty_region = new TQRegion( TRUE ); TQ_CHECK_PTR( empty_region ); } @@ -2516,7 +2516,7 @@ TQRegion::TQRegion( const TQPointArray &a, bool winding ) winding ? WindingRule : EvenOddRule ); } else { if ( !empty_region ) { - qAddPostRoutine( cleanup_empty_region ); + tqAddPostRoutine( cleanup_empty_region ); empty_region = new TQRegion( TRUE ); TQ_CHECK_PTR( empty_region ); } @@ -2551,7 +2551,7 @@ TQRegion::TQRegion( const TQBitmap & bm ) { if ( bm.isNull() ) { if ( !empty_region ) { // avoid too many allocs - qAddPostRoutine( cleanup_empty_region ); + tqAddPostRoutine( cleanup_empty_region ); empty_region = new TQRegion( TRUE ); TQ_CHECK_PTR( empty_region ); } diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index 783b89188..59f130222 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -214,7 +214,7 @@ TQTextCursor *TQTextDeleteCommand::execute( TQTextCursor *c ) { TQTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { - qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); return 0; } @@ -242,7 +242,7 @@ TQTextCursor *TQTextDeleteCommand::unexecute( TQTextCursor *c ) { TQTextParagraph *s = doc ? doc->paragAt( id ) : parag; if ( !s ) { - qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); + tqWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() ); return 0; } @@ -1733,10 +1733,10 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu TQString bg = attr["background"]; const TQMimeSource* m = factory_->data( bg, contxt ); if ( !m ) { - qWarning("TQRichText: no mimesource for %s", bg.latin1() ); + tqWarning("TQRichText: no mimesource for %s", bg.latin1() ); } else { if ( !TQImageDrag::decode( m, img ) ) { - qWarning("TQTextImage: cannot decode %s", bg.latin1() ); + tqWarning("TQTextImage: cannot decode %s", bg.latin1() ); } } if ( !img.isNull() ) { @@ -2370,7 +2370,7 @@ TQString TQTextDocument::richText() const TQStyleSheetItem* item_ol = styleSheet()->item("ol"); TQStyleSheetItem* item_li = styleSheet()->item("li"); if ( !item_p || !item_div || !item_ul || !item_ol || !item_li ) { - qWarning( "TQTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" ); + tqWarning( "TQTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, div, ul, ol, or li)" ); return TQString::null; } int pastListDepth = 0; @@ -4415,7 +4415,7 @@ int TQTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const --it; } - qWarning( "TQTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); + tqWarning( "TQTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); return 15; } @@ -4441,7 +4441,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfChar( int i, int *index, int *line --l; } - qWarning( "TQTextParagraph::lineStartOfChar: couldn't find %d", i ); + tqWarning( "TQTextParagraph::lineStartOfChar: couldn't find %d", i ); return 0; } @@ -4468,7 +4468,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfLine( int line, int *index ) const return &str->at( i ); } - qWarning( "TQTextParagraph::lineStartOfLine: couldn't find %d", line ); + tqWarning( "TQTextParagraph::lineStartOfLine: couldn't find %d", line ); return 0; } @@ -5407,12 +5407,12 @@ TQTextLineStart *TQTextFormatter::bidiReorderLine( TQTextParagraph * /*parag*/, visual = (int *)malloc( length*sizeof( int ) ); } - //qDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last ); + //tqDebug("bidiReorderLine: length=%d (%d-%d)", length, start, last ); TQTextStringChar *ch = startChar; unsigned char *l = levels; while ( ch <= lastChar ) { - //qDebug( " level: %d", ch->bidiLevel ); + //tqDebug( " level: %d", ch->bidiLevel ); *(l++) = (ch++)->bidiLevel; } @@ -5472,7 +5472,7 @@ TQTextLineStart *TQTextFormatter::bidiReorderLine( TQTextParagraph * /*parag*/, ch->x = x + toAdd; ch->rightToLeft = ch->bidiLevel % 2; - //qDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft ); + //tqDebug("visual: %d (%x) placed at %d rightToLeft=%d", visual[i], ch->c.unicode(), x +toAdd, ch->rightToLeft ); int ww = 0; if ( ch->c.unicode() >= 32 || ch->c == '\t' || ch->c == '\n' || ch->isCustom() ) { ww = text->width( start+visual[i] ); @@ -6178,7 +6178,7 @@ TQTextFormat *TQTextFormatCollection::format( const TQFont &f, const TQColor &c cachedFormat->collection = this; cKey.insert( cachedFormat->key(), cachedFormat ); if ( cachedFormat->key() != key ) - qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() ); + tqWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() ); return cachedFormat; } @@ -6597,11 +6597,11 @@ TQTextImage::TQTextImage( TQTextDocument *p, const TQMap<TQString, TQString> &at const TQMimeSource* m = factory.data( imageName, context ); if ( !m ) { - qWarning("TQTextImage: no mimesource for %s", imageName.latin1() ); + tqWarning("TQTextImage: no mimesource for %s", imageName.latin1() ); } else { if ( !TQImageDrag::decode( m, img ) ) { - qWarning("TQTextImage: cannot decode %s", imageName.latin1() ); + tqWarning("TQTextImage: cannot decode %s", imageName.latin1() ); } } @@ -7229,7 +7229,7 @@ static TQMap<TQString, TQChar> *htmlMap() { if ( !html_map ) { html_map = new TQMap<TQString, TQChar>; - qAddPostRoutine( qt_cleanup_html_map ); + tqAddPostRoutine( qt_cleanup_html_map ); const Entity *ent = entitylist; while( ent->code ) { diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/qrichtext_p.cpp index f426fcead..7e55b6038 100644 --- a/src/kernel/qrichtext_p.cpp +++ b/src/kernel/qrichtext_p.cpp @@ -151,7 +151,7 @@ void TQTextCursor::gotoPosition( TQTextParagraph* p, int index ) para = p; if ( index < 0 || index >= para->length() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQTextCursor::gotoParagraph Index: %d out of range", index ); + tqWarning( "TQTextCursor::gotoParagraph Index: %d out of range", index ); #endif if ( index < 0 || para->length() == 0 ) index = 0; @@ -506,7 +506,7 @@ bool TQTextParagraph::fullSelected( int id ) const int TQTextParagraph::lineY( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - qWarning( "TQTextParagraph::lineY: line %d out of range!", l ); + tqWarning( "TQTextParagraph::lineY: line %d out of range!", l ); return 0; } @@ -522,7 +522,7 @@ int TQTextParagraph::lineY( int l ) const int TQTextParagraph::lineBaseLine( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - qWarning( "TQTextParagraph::lineBaseLine: line %d out of range!", l ); + tqWarning( "TQTextParagraph::lineBaseLine: line %d out of range!", l ); return 10; } @@ -538,7 +538,7 @@ int TQTextParagraph::lineBaseLine( int l ) const int TQTextParagraph::lineHeight( int l ) const { if ( l > (int)lineStarts.count() - 1 ) { - qWarning( "TQTextParagraph::lineHeight: line %d out of range!", l ); + tqWarning( "TQTextParagraph::lineHeight: line %d out of range!", l ); return 15; } @@ -554,8 +554,8 @@ int TQTextParagraph::lineHeight( int l ) const void TQTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const { if ( l > (int)lineStarts.count() - 1 ) { - qWarning( "TQTextParagraph::lineInfo: line %d out of range!", l ); - qDebug( "%d %d", (int)lineStarts.count() - 1, l ); + tqWarning( "TQTextParagraph::lineInfo: line %d out of range!", l ); + tqDebug( "%d %d", (int)lineStarts.count() - 1, l ); y = 0; h = 15; bl = 10; diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 8bac2e018..48c7b0a47 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -1981,7 +1981,7 @@ inline void TQTextParagraph::setParagId( int i ) inline int TQTextParagraph::paragId() const { if ( id == -1 ) - qWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); + tqWarning( "invalid parag id!!!!!!!! (%p)", (void*)this ); return id; } diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index ab6bd2f36..14adbcf0c 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -120,7 +120,7 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) { int nmarks = glast - gfrom; if (nmarks <= 0) { - qWarning("positionCluster: no marks to position!"); + tqWarning("positionCluster: no marks to position!"); return; } @@ -134,12 +134,12 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) TQRect baseRect(baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height); -// qDebug("---> positionCluster: cluster from %d to %d", gfrom, glast); -// qDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff); +// tqDebug("---> positionCluster: cluster from %d to %d", gfrom, glast); +// tqDebug("baseInfo: %f/%f (%f/%f) off=%f/%f", baseInfo.x, baseInfo.y, baseInfo.width, baseInfo.height, baseInfo.xoff, baseInfo.yoff); int size = (f->ascent()/10); int offsetBase = (size - 4) / 4 + TQMIN(size, 4) + 1; -// qDebug("offset = %f", offsetBase); +// tqDebug("offset = %f", offsetBase); bool rightToLeft = item->flags & TQTextEngine::RightToLeft; @@ -152,7 +152,7 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) TQPoint p; glyph_metrics_t markInfo = f->boundingBox(mark); TQRect markRect(markInfo.x, markInfo.y, markInfo.width, markInfo.height); -// qDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff); +// tqDebug("markInfo: %f/%f (%f/%f) off=%f/%f", markInfo.x, markInfo.y, markInfo.width, markInfo.height, markInfo.xoff, markInfo.yoff); int offset = offsetBase; unsigned char cmb = item->attributes[gfrom+i].combiningClass; @@ -192,7 +192,7 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) // combining marks of different class don't interact. Reset the rectangle. if (cmb != lastCmb) { - //qDebug("resetting rect"); + //tqDebug("resetting rect"); attachmentRect = baseRect; } @@ -246,7 +246,7 @@ static inline void positionCluster(TQShaperItem *item, int gfrom, int glast) default: break; } -// qDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y()); +// tqDebug("char=%x combiningClass = %d offset=%d/%d", mark, cmb, p.x(), p.y()); markRect.moveBy(p.x(), p.y()); attachmentRect |= markRect; lastCmb = cmb; @@ -287,7 +287,7 @@ static void heuristicSetGlyphAttributes(TQShaperItem *item, const TQChar *uc, in // justification is missing here!!!!! if ( item->num_glyphs != length ) - qWarning("TQScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" ); + tqWarning("TQScriptEngine::heuristicSetGlyphAttributes: char length and num glyphs disagree" ); unsigned short *logClusters = item->log_clusters; @@ -899,7 +899,7 @@ struct TQArabicProperties { static void getArabicProperties(const unsigned short *chars, int len, TQArabicProperties *properties) { -// qDebug("arabicSyriacOpenTypeShape: properties:"); +// tqDebug("arabicSyriacOpenTypeShape: properties:"); int lastPos = 0; int lastGroup = ArabicNone; @@ -1005,7 +1005,7 @@ static void getArabicProperties(const unsigned short *chars, int len, TQArabicPr // for (int i = 0; i < len; ++i) -// qDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification); +// tqDebug("arabic properties(%d): uc=%x shape=%d, justification=%d", i, chars[i], properties[i].shape, properties[i].justification); } @@ -1326,7 +1326,7 @@ static inline int getShape(uchar cell, int shape) */ static inline const TQChar prevChar(const TQString *str, int pos) { - //qDebug("leftChar: pos=%d", pos); + //tqDebug("leftChar: pos=%d", pos); pos--; const TQChar *ch = str->unicode() + pos; while(pos > -1) { @@ -1344,7 +1344,7 @@ static inline const TQChar nextChar(const TQString *str, int pos) int len = str->length(); const TQChar *ch = str->unicode() + pos; while(pos < len) { - //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); + //tqDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining()); if(::category(*ch) != TQChar::Mark_NonSpacing) return *ch; // assume it's a transparent char, this might not be 100% correct @@ -1402,7 +1402,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf uchar c = ch->cell(); int pos = i + from; int shape = properties[i].shape; -// qDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape)); +// tqDebug("mapping U+%x to shape %d glyph=0x%x", ch->unicode(), shape, getShape(c, shape)); // take care of lam-alef ligatures (lam right of alef) ushort map; switch (c) { @@ -1414,7 +1414,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf case 0x23: case 0x25: case 0x27: -// qDebug(" lam of lam-alef ligature"); +// tqDebug(" lam of lam-alef ligature"); map = arabicUnicodeLamAlefMapping[pch.cell() - 0x22][shape]; goto next; default: @@ -1429,7 +1429,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf case 0x27: // alef if (prevChar(uc, pos).unicode() == 0x0644) { // have a lam alef ligature - //qDebug(" alef of lam-alef ligature"); + //tqDebug(" alef of lam-alef ligature"); goto skip; } default: @@ -1443,7 +1443,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf //attributes[gpos].zeroWidth = zeroWidth; if (::category(*ch) == TQChar::Mark_NonSpacing) { attributes[gpos].mark = TRUE; -// qDebug("glyph %d (char %d) is mark!", gpos, i); +// tqDebug("glyph %d (char %d) is mark!", gpos, i); } else { attributes[gpos].mark = FALSE; clusterStart = data - shapeBuffer; @@ -1451,7 +1451,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf attributes[gpos].clusterStart = !attributes[gpos].mark; attributes[gpos].combiningClass = combiningClass(*ch); attributes[gpos].justification = properties[i].justification; -// qDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode()); +// tqDebug("data[%d] = %x (from %x)", gpos, (uint)data->unicode(), ch->unicode()); data++; skip: ch++; diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp index 06523b700..fb18aa3e9 100644 --- a/src/kernel/qscriptengine_x11.cpp +++ b/src/kernel/qscriptengine_x11.cpp @@ -1124,7 +1124,7 @@ static const unsigned short split_matras[] = { static inline void splitMatra(unsigned short *reordered, int matra, int &len, int &base) { unsigned short matra_uc = reordered[matra]; - //qDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]); + //tqDebug("matra=%d, reordered[matra]=%x", matra, reordered[matra]); const unsigned short *split = split_matras; while (split[0] < matra_uc) @@ -1189,9 +1189,9 @@ static const TQOpenType::Features indic_features[] = { // #define INDIC_DEBUG #ifdef INDIC_DEBUG -#define IDEBUG qDebug +#define IDEBUG tqDebug #else -#define IDEBUG if(0) qDebug +#define IDEBUG if(0) tqDebug #endif #ifdef INDIC_DEBUG @@ -1665,7 +1665,7 @@ static bool indic_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool { IDEBUG("OT properties:"); for (int i = 0; i < len; ++i) - qDebug(" i: %s", ::propertiesToString(properties[i]).toLatin1().data()); + tqDebug(" i: %s", ::propertiesToString(properties[i]).toLatin1().data()); } #endif @@ -1678,14 +1678,14 @@ static bool indic_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool // move the left matra back to it's correct position in malayalam and tamil if ((script == TQFont::Malayalam || script == TQFont::Tamil) && (form(reordered[0]) == Matra)) { -// qDebug("reordering matra, len=%d", newLen); +// tqDebug("reordering matra, len=%d", newLen); // need to find the base in the shaped string and move the matra there int basePos = 0; while (basePos < newLen && (int)otl_glyphs[basePos].cluster <= base) basePos++; --basePos; if (basePos < newLen && basePos > 1) { -// qDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen); +// tqDebug("moving prebase matra to position %d in syllable newlen=%d", basePos, newLen); OTL_GlyphItemRec m = otl_glyphs[0]; --basePos; for (i = 0; i < basePos; ++i) @@ -2092,7 +2092,7 @@ static int tibetan_nextSyllableBoundary(const TQString &s, int start, int end, b int pos = 0; TibetanForm state = tibetan_form(*uc); -// qDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode()); +// tqDebug("state[%d]=%d (uc=%4x)", pos, state, uc[pos].unicode()); pos++; if (state != TibetanHeadConsonant) { @@ -2473,9 +2473,9 @@ static const signed char khmerStateTable[][CC_COUNT] = // #define KHMER_DEBUG #ifdef KHMER_DEBUG -#define KHDEBUG qDebug +#define KHDEBUG tqDebug #else -#define KHDEBUG if(0) qDebug +#define KHDEBUG if(0) tqDebug #endif // Given an input string of characters and a location in which to start looking @@ -2551,9 +2551,9 @@ static bool khmer_shape_syllable(TQOpenType *openType, TQShaperItem *item) memset(properties, 0, 16*sizeof(unsigned char)); #ifdef KHMER_DEBUG - qDebug("original:"); + tqDebug("original:"); for (int i = from; i < syllableEnd; i++) { - qDebug(" %d: %4x", i, string[i].unicode()); + tqDebug(" %d: %4x", i, string[i].unicode()); } #endif @@ -3001,9 +3001,9 @@ static const signed char mymrStateTable[][Mymr_CC_COUNT] = // #define MYANMAR_DEBUG #ifdef MYANMAR_DEBUG -#define MMDEBUG qDebug +#define MMDEBUG tqDebug #else -#define MMDEBUG if(0) qDebug +#define MMDEBUG if(0) tqDebug #endif // Given an input string of characters and a location in which to start looking @@ -3082,9 +3082,9 @@ static bool myanmar_shape_syllable(TQOpenType *openType, TQShaperItem *item, boo const TQChar *uc = item->string->unicode() + item->from; #ifdef MYANMAR_DEBUG - qDebug("original:"); + tqDebug("original:"); for (int i = 0; i < item->length; i++) { - qDebug(" %d: %4x", i, uc[i].unicode()); + tqDebug(" %d: %4x", i, uc[i].unicode()); } #endif int vowel_e = -1; diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp index 4cd0735c3..d871aa74d 100644 --- a/src/kernel/qsize.cpp +++ b/src/kernel/qsize.cpp @@ -381,7 +381,7 @@ void TQSize::scale( const TQSize &s, ScaleMode mode ) void TQSize::warningDivByZero() { #if defined(QT_CHECK_MATH) - qWarning( "TQSize: Division by zero error" ); + tqWarning( "TQSize: Division by zero error" ); #endif } diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp index decff43a7..ae46ca62a 100644 --- a/src/kernel/qsizegrip.cpp +++ b/src/kernel/qsizegrip.cpp @@ -123,7 +123,7 @@ TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name ) #if defined(Q_WS_X11) if ( !qt_sizegrip_workspace( this ) ) { WId id = winId(); - XChangeProperty(qt_xdisplay(), topLevelWidget()->winId(), + XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), qt_sizegrip, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&id, 1); } @@ -143,7 +143,7 @@ TQSizeGrip::~TQSizeGrip() #if defined(Q_WS_X11) if ( !TQApplication::closingDown() && parentWidget() ) { WId id = None; - XChangeProperty(qt_xdisplay(), topLevelWidget()->winId(), + XChangeProperty(tqt_xdisplay(), topLevelWidget()->winId(), qt_sizegrip, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&id, 1); } diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/qsocketnotifier.cpp index b7bceb15e..b89a512ed 100644 --- a/src/kernel/qsocketnotifier.cpp +++ b/src/kernel/qsocketnotifier.cpp @@ -146,10 +146,10 @@ TQSocketNotifier::TQSocketNotifier( int socket, Type type, TQObject *parent, { #if defined(QT_CHECK_RANGE) if ( socket < 0 ) - qWarning( "TQSocketNotifier: Invalid socket specified" ); + tqWarning( "TQSocketNotifier: Invalid socket specified" ); # if defined(Q_OS_UNIX) if ( socket >= FD_SETSIZE ) - qWarning( "TQSocketNotifier: Socket descriptor too large for select()" ); + tqWarning( "TQSocketNotifier: Socket descriptor too large for select()" ); # endif #endif sockfd = socket; diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index 40d7e595d..95dcef208 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -32,7 +32,7 @@ #include <string.h> #include <stdlib.h> -extern bool qt_use_xrender; // defined in qapplication_x11.cpp +extern bool tqt_use_xrender; // defined in qapplication_x11.cpp extern "C" { @@ -95,7 +95,7 @@ XftDraw *XftDrawCreateAlpha( Display *display, draw->render_set = True; draw->render_able = False; - if ( qt_use_xrender ) { + if ( tqt_use_xrender ) { draw->render_able = True; XRenderPictFormat *format = 0; diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp index 318722c97..adeafb887 100644 --- a/src/kernel/qtextengine.cpp +++ b/src/kernel/qtextengine.cpp @@ -157,7 +157,7 @@ static void tqAppendItems(TQTextEngine *engine, int &start, int &stop, BidiContr if ( start > stop ) { // #### the algorithm is currently not really safe against this. Still needs fixing. -// qWarning( "Bidi: appendItems() internal error" ); +// tqWarning( "Bidi: appendItems() internal error" ); return; } @@ -177,7 +177,7 @@ static void tqAppendItems(TQTextEngine *engine, int &start, int &stop, BidiContr } #if (BIDI_DEBUG >= 1) - qDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level); + tqDebug("new run: dir=%s from %d, to %d level = %d\n", directions[dir], start, stop, level); #endif TQFont::Script script = TQFont::NoScript; TQScriptItem item; @@ -279,8 +279,8 @@ static void bidiItemize( TQTextEngine *engine, bool rightToLeft, int mode ) status.last = status.lastStrong; status.dir = sdir; #if (BIDI_DEBUG >= 2) - qDebug("---- bidiReorder --- '%s'", engine->string.utf8().data()); - qDebug("rightToLeft = %d", rightToLeft); + tqDebug("---- bidiReorder --- '%s'", engine->string.utf8().data()); + tqDebug("rightToLeft = %d", rightToLeft); #endif @@ -861,7 +861,7 @@ static void calcLineBreaks(const TQString &str, TQCharAttributes *charAttributes softBreak = (cls == TQUnicodeTables::LineBreak_SP); else softBreak = (brk == Dbk); -// qDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak); +// tqDebug("char = %c %04x, cls=%d, ncls=%d, brk=%d soft=%d", uc[i].cell(), uc[i].unicode(), cls, ncls, brk, charAttributes[i].softBreak); charAttributes[i].softBreak = softBreak; charAttributes[i].whiteSpace = FALSE; charAttributes[i].charStop = TRUE; @@ -1044,7 +1044,7 @@ void TQTextEngine::splitItem( int item, int pos ) oldItem.width = w; } -// qDebug("split at position %d itempos=%d", pos, item ); +// tqDebug("split at position %d itempos=%d", pos, item ); } @@ -1052,12 +1052,12 @@ int TQTextEngine::width( int from, int len ) const { int w = 0; -// qDebug("TQTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() ); +// tqDebug("TQTextEngine::width( from = %d, len = %d ), numItems=%d, strleng=%d", from, len, items.size(), string.length() ); for ( int i = 0; i < items.size(); i++ ) { TQScriptItem *si = &items[i]; int pos = si->position; int ilen = length( i ); -// qDebug("item %d: from %d len %d", i, pos, ilen ); +// tqDebug("item %d: from %d len %d", i, pos, ilen ); if ( pos >= from + len ) break; if ( pos + ilen > from ) { @@ -1089,13 +1089,13 @@ int TQTextEngine::width( int from, int len ) const charEnd++; glyphEnd = (charEnd == ilen) ? si->num_glyphs : logClusters[charEnd]; -// qDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd ); +// tqDebug("char: start=%d end=%d / glyph: start = %d, end = %d", charFrom, charEnd, glyphStart, glyphEnd ); for ( int i = glyphStart; i < glyphEnd; i++ ) w += advances[i]; } } } -// qDebug(" --> w= %d ", w ); +// tqDebug(" --> w= %d ", w ); return w; } diff --git a/src/kernel/qtextengine_unix.cpp b/src/kernel/qtextengine_unix.cpp index 0e76f33fb..0d5e3b920 100644 --- a/src/kernel/qtextengine_unix.cpp +++ b/src/kernel/qtextengine_unix.cpp @@ -96,10 +96,10 @@ void TQTextEngine::shape( int item ) const shaper_item.has_positioning = FALSE; while (1) { -// qDebug(" . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); +// tqDebug(" . num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); ensureSpace(shaper_item.num_glyphs); shaper_item.num_glyphs = num_glyphs - used; -// qDebug(" .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); +// tqDebug(" .. num_glyphs=%d, used=%d, item.num_glyphs=%d", num_glyphs, used, shaper_item.num_glyphs); shaper_item.glyphs = glyphs(&si); shaper_item.advances = advances(&si); shaper_item.offsets = offsets(&si); @@ -118,7 +118,7 @@ void TQTextEngine::shape( int item ) const advance_t *advances = this->advances( &si ); advance_t *end = advances + si.num_glyphs; while ( advances < end ) { -// qDebug("advances[%d] = %d", advances - this->advances(&si), *advances); +// tqDebug("advances[%d] = %d", advances - this->advances(&si), *advances); si.width += *(advances++); } diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp index edbd910ed..ed5641a7b 100644 --- a/src/kernel/qtextlayout.cpp +++ b/src/kernel/qtextlayout.cpp @@ -134,7 +134,7 @@ int TQTextItem::cursorToX( int *cPos, Edge edge ) const for ( int i = 0; i < glyph_pos; i++ ) x += advances[i]; } -// qDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x ); +// tqDebug("cursorToX: pos=%d, gpos=%d x=%d", pos, glyph_pos, x ); *cPos = pos; return x; } @@ -174,7 +174,7 @@ int TQTextItem::xToCursor( int x, CursorPosition cpos ) const cp_after = i; for ( int j = lastCluster; j < newCluster; j++ ) x_after += advances[j]; - // qDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d", + // tqDebug("cluster boundary: lastCluster=%d, newCluster=%d, x_before=%d, x_after=%d", // lastCluster, newCluster, x_before, x_after ); if ( x_after > x ) break; @@ -184,7 +184,7 @@ int TQTextItem::xToCursor( int x, CursorPosition cpos ) const bool before = ( cpos == OnCharacters || (x - x_before) < (x_after - x) ); -// qDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d", +// tqDebug("got cursor position for %d: %d/%d, x_ba=%d/%d using %d", // x, cp_before,cp_after, x_before, x_after, before ? cp_before : cp_after ); return before ? cp_before : cp_after; @@ -355,7 +355,7 @@ TQTextLayout::Result TQTextLayout::addCurrentItem() TQScriptItem ¤t = d->items[d->currentItem]; d->shape( d->currentItem ); d->widthUsed += current.width; -// qDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed ); +// tqDebug("trying to add item %d with width %d, remaining %d", d->currentItem, current.width, d->lineWidth-d->widthUsed ); d->currentItem++; @@ -376,7 +376,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, int i; TQTextLayout::Result result = LineEmpty; -// qDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x, y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed ); +// tqDebug("endLine x=%d, y=%d, first=%d, current=%d lw=%d wu=%d", x, y, d->firstItemInLine, d->currentItem, d->lineWidth, d->widthUsed ); int width_nobreak_found = d->widthUsed; if ( d->firstItemInLine == -1 ) goto end; @@ -428,21 +428,21 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, int lastGlyph = 0; int tmpItemWidth = 0; -// qDebug("looking for break in item %d, isSpace=%d", i, si->isSpace ); +// tqDebug("looking for break in item %d, isSpace=%d", i, si->isSpace ); if(si->isSpace && !(alignment & (TQt::SingleLine|TQt::IncludeTrailingSpaces))) { swidth += si->width; } else { tmpWidth += swidth; swidth = 0; for ( int pos = 0; pos < length; pos++ ) { -// qDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d", +// tqDebug("advance=%d, w=%d, tmpWidth=%d, softbreak=%d, whitespace=%d", // *advances, w, tmpWidth, itemAttrs->softBreak, itemAttrs->whiteSpace ); int glyph = logClusters[pos]; if ( lastGlyph != glyph ) { while ( lastGlyph < glyph ) tmpItemWidth += advances[lastGlyph++]; if ( breakPosition != -1 && w + tmpWidth + tmpItemWidth > d->lineWidth ) { -// qDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth); +// tqDebug("found break at w=%d, tmpWidth=%d, tmpItemWidth=%d", w, tmpWidth, tmpItemWidth); d->widthUsed = w; goto found; } @@ -456,7 +456,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, breakany = FALSE; breakItem = i; breakPosition = pos; -// qDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth); +// tqDebug("found possible break at item %d, position %d (absolute=%d), w=%d, tmpWidth=%d, tmpItemWidth=%d", breakItem, breakPosition, d->items[breakItem].position+breakPosition, w, tmpWidth, tmpItemWidth); w += tmpWidth + tmpItemWidth; itemWidth += tmpItemWidth; tmpWidth = 0; @@ -482,12 +482,12 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, goto nobreak; } -// qDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed ); +// tqDebug("linebreak at item %d, position %d, wu=%d", breakItem, breakPosition, d->widthUsed ); // split the line if ( breakPosition > 0 ) { // int length = d->length( breakItem ); -// qDebug("splitting item, itemWidth=%d", itemWidth); +// tqDebug("splitting item, itemWidth=%d", itemWidth); // not a full item, need to break d->splitItem( breakItem, breakPosition ); d->currentItem = breakItem+1; @@ -508,10 +508,10 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, visual = new int[numRuns]; } -// qDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems ); +// tqDebug("reordering %d runs, numSpaceItems=%d", numRuns, numSpaceItems ); for ( i = 0; i < numRuns; i++ ) { levels[i] = d->items[i+d->firstItemInLine].analysis.bidiLevel; -// qDebug(" level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel ); +// tqDebug(" level = %d", d->items[i+d->firstItemInLine].analysis.bidiLevel ); } d->bidiReorder( numRuns, levels, visual ); @@ -541,7 +541,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int alignment, int left = x; for ( i = 0; i < numRuns; i++ ) { TQScriptItem &si = d->items[d->firstItemInLine+visual[i]]; -// qDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position, +// tqDebug("positioning item %d with width %d (from=%d/length=%d) at %d", d->firstItemInLine+visual[i], si.width, si.position, // d->length(d->firstItemInLine+visual[i]), x ); si.x = x; si.y = y + asc; @@ -593,7 +593,7 @@ void TQTextLayout::endLayout() int TQTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const { -// qDebug("looking for next cursor pos for %d", oldPos ); +// tqDebug("looking for next cursor pos for %d", oldPos ); const TQCharAttributes *attributes = d->attributes(); int len = d->string.length(); if ( oldPos >= len ) @@ -606,13 +606,13 @@ int TQTextLayout::nextCursorPosition( int oldPos, CursorMode mode ) const while ( oldPos < len && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace ) oldPos++; } -// qDebug(" -> %d", oldPos ); +// tqDebug(" -> %d", oldPos ); return oldPos; } int TQTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const { -// qDebug("looking for previous cursor pos for %d", oldPos ); +// tqDebug("looking for previous cursor pos for %d", oldPos ); const TQCharAttributes *attributes = d->attributes(); if ( oldPos <= 0 ) return 0; @@ -624,7 +624,7 @@ int TQTextLayout::previousCursorPosition( int oldPos, CursorMode mode ) const while ( oldPos && !attributes[oldPos].wordStop && !attributes[oldPos-1].whiteSpace ) oldPos--; } -// qDebug(" -> %d", oldPos ); +// tqDebug(" -> %d", oldPos ); return oldPos; } diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp index f9c45d92c..a1719313d 100644 --- a/src/kernel/qthread.cpp +++ b/src/kernel/qthread.cpp @@ -80,7 +80,7 @@ { for( int count = 0; count < 20; count++ ) { sleep( 1 ); - qDebug( "Ping!" ); + tqDebug( "Ping!" ); } } @@ -166,7 +166,7 @@ TQThread::~TQThread() TQMutexLocker locker( d->mutex() ); if ( d->running && !d->finished ) { #ifdef QT_CHECK_STATE - qWarning("TQThread object destroyed while thread is still running."); + tqWarning("TQThread object destroyed while thread is still running."); #endif d->orphan = TRUE; diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp index 35de76021..73319b64a 100644 --- a/src/kernel/qthread_unix.cpp +++ b/src/kernel/qthread_unix.cpp @@ -131,7 +131,7 @@ void TQThreadInstance::finish( void * ) if ( ! d ) { #ifdef QT_CHECK_STATE - qWarning( "TQThread: internal error: zero data for running thread." ); + tqWarning( "TQThread: internal error: zero data for running thread." ); #endif // QT_CHECK_STATE return; } @@ -188,8 +188,8 @@ TQt::HANDLE TQThread::currentThread() */ void TQThread::initialize() { - if ( ! qt_global_mutexpool ) - qt_global_mutexpool = new TQMutexPool( TRUE, 73 ); + if ( ! tqt_global_mutexpool ) + tqt_global_mutexpool = new TQMutexPool( TRUE, 73 ); if ( ! qt_thread_mutexpool ) qt_thread_mutexpool = new TQMutexPool( FALSE, 127 ); @@ -202,9 +202,9 @@ void TQThread::initialize() */ void TQThread::cleanup() { - delete qt_global_mutexpool; + delete tqt_global_mutexpool; delete qt_thread_mutexpool; - qt_global_mutexpool = 0; + tqt_global_mutexpool = 0; qt_thread_mutexpool = 0; TQThreadInstance::finish(&main_instance); @@ -328,7 +328,7 @@ void TQThread::start(Priority priority) if (pthread_attr_getschedpolicy(&attr, &sched_policy) != 0) { // failed to get the scheduling policy, don't bother // setting the priority - qWarning("TQThread: cannot determine default scheduler policy"); + tqWarning("TQThread: cannot determine default scheduler policy"); break; } @@ -337,7 +337,7 @@ void TQThread::start(Priority priority) if (prio_min == -1 || prio_max == -1) { // failed to get the scheduling parameters, don't // bother setting the priority - qWarning("TQThread: cannot determine scheduler priority range"); + tqWarning("TQThread: cannot determine scheduler priority range"); break; } @@ -378,7 +378,7 @@ void TQThread::start(Priority priority) if ( ret ) { #ifdef QT_CHECK_STATE - qWarning( "TQThread::start: thread stack size error: %s", strerror( ret ) ) ; + tqWarning( "TQThread::start: thread stack size error: %s", strerror( ret ) ) ; #endif // QT_CHECK_STATE // we failed to set the stacksize, and as the documentation states, @@ -402,7 +402,7 @@ void TQThread::start(Priority priority) if ( ret ) { #ifdef QT_CHECK_STATE - qWarning( "TQThread::start: thread creation error: %s", strerror( ret ) ); + tqWarning( "TQThread::start: thread creation error: %s", strerror( ret ) ); #endif // QT_CHECK_STATE d->running = FALSE; @@ -439,7 +439,7 @@ bool TQThread::wait( unsigned long time ) if ( d->thread_id == pthread_self() ) { #ifdef QT_CHECK_STATE - qWarning( "TQThread::wait: thread tried to wait on itself" ); + tqWarning( "TQThread::wait: thread tried to wait on itself" ); #endif // QT_CHECK_STATE return FALSE; @@ -464,7 +464,7 @@ bool TQThread::wait( unsigned long time ) #ifdef QT_CHECK_RANGE if (ret && ret != ETIMEDOUT) - qWarning("Wait condition wait failure: %s",strerror(ret)); + tqWarning("Wait condition wait failure: %s",strerror(ret)); #endif return (ret == 0); diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index ed8098999..a99a49c1b 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -246,7 +246,7 @@ static void sst_init() if ( !sst_list ) { sst_list = new TQObjectList; TQ_CHECK_PTR( sst_list ); - qAddPostRoutine( sst_cleanup ); + tqAddPostRoutine( sst_cleanup ); } } diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 7758d31be..6a66947b3 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -492,13 +492,13 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, f = qt_open( TQFile::encodeName(realname), O_RDONLY, 0666 ); if ( f < 0 ) { - // qDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) ); + // tqDebug( "can't open %s: %s", realname.ascii(), strerror( errno ) ); return FALSE; } struct stat st; if ( fstat( f, &st ) ) { - // qDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) ); + // tqDebug( "can't stat %s: %s", realname.ascii(), strerror( errno ) ); return FALSE; } char * tmp; @@ -507,7 +507,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, MAP_FILE | MAP_PRIVATE, // swap-backed map from file f, 0 ); // from offset 0 of f if ( !tmp || tmp == (char*)MAP_FAILED ) { - // qDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) ); + // tqDebug( "can't mmap %s: %s", filename.ascii(), strerror( errno ) ); return FALSE; } @@ -845,7 +845,7 @@ void TQTranslator::squeeze( SaveMode mode ) delete [] hTable; if ( upto > 131072 ) { - qWarning( "TQTranslator::squeeze: Too many contexts" ); + tqWarning( "TQTranslator::squeeze: Too many contexts" ); delete d->contextArray; d->contextArray = 0; } @@ -1029,7 +1029,7 @@ TQTranslatorMessage TQTranslator::findMessage( const char* context, return TQTranslatorMessage(); if ( systemWordSize == 0 ) - qSysInfo( &systemWordSize, &systemBigEndian ); + tqSysInfo( &systemWordSize, &systemBigEndian ); for ( ;; ) { Q_UINT32 h = elfHash( TQCString(sourceText) + comment ); diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp index 0a680e0d9..bf960f336 100644 --- a/src/kernel/qurl.cpp +++ b/src/kernel/qurl.cpp @@ -849,15 +849,15 @@ bool TQUrl::parse( const TQString& url ) d->cleanPathDirty = TRUE; #if 0 - qDebug( "URL: %s", url.latin1() ); - qDebug( "protocol: %s", d->protocol.latin1() ); - qDebug( "user: %s", d->user.latin1() ); - qDebug( "pass: %s", d->pass.latin1() ); - qDebug( "host: %s", d->host.latin1() ); - qDebug( "path: %s", path().latin1() ); - qDebug( "ref: %s", d->refEncoded.latin1() ); - qDebug( "query: %s", d->queryEncoded.latin1() ); - qDebug( "port: %d\n\n----------------------------\n\n", d->port ); + tqDebug( "URL: %s", url.latin1() ); + tqDebug( "protocol: %s", d->protocol.latin1() ); + tqDebug( "user: %s", d->user.latin1() ); + tqDebug( "pass: %s", d->pass.latin1() ); + tqDebug( "host: %s", d->host.latin1() ); + tqDebug( "path: %s", path().latin1() ); + tqDebug( "ref: %s", d->refEncoded.latin1() ); + tqDebug( "query: %s", d->queryEncoded.latin1() ); + tqDebug( "port: %d\n\n----------------------------\n\n", d->port ); #endif return TRUE; @@ -1010,7 +1010,7 @@ void TQUrl::setEncodedPathAndQuery( const TQString& pathAndQuery ) d->cleanPathDirty = TRUE; } -extern bool qt_resolve_symlinks; // defined in qapplication.cpp +extern bool tqt_resolve_symlinks; // defined in qapplication.cpp /*! Returns the path of the URL. If \a correct is TRUE, the path is @@ -1053,7 +1053,7 @@ TQString TQUrl::path( bool correct ) const else if ( fi.isDir() ) { TQString canPath = TQDir( d->path ).canonicalPath(); TQString dir; - if ( qt_resolve_symlinks && !canPath.isNull() ) + if ( tqt_resolve_symlinks && !canPath.isNull() ) dir = TQDir::cleanDirPath( canPath ); else dir = TQDir::cleanDirPath( TQDir( d->path ).absPath() ); @@ -1064,7 +1064,7 @@ TQString TQUrl::path( bool correct ) const d->cleanPath = dir; } else { TQString p = - TQDir::cleanDirPath( (qt_resolve_symlinks ? + TQDir::cleanDirPath( (tqt_resolve_symlinks ? fi.dir().canonicalPath() : fi.dir().absPath()) ); d->cleanPath = p + "/" + fi.fileName(); diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp index e4cb185f4..93235a84c 100644 --- a/src/kernel/qurloperator.cpp +++ b/src/kernel/qurloperator.cpp @@ -122,7 +122,7 @@ public: A TQUrlOperator can be used like this, for example to download a file (and assuming that the FTP protocol is \link - qInitNetworkProtocols() registered\endlink): + tqInitNetworkProtocols() registered\endlink): \code TQUrlOperator *op = new TQUrlOperator(); op->copy( TQString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"), @@ -148,7 +148,7 @@ public: handling deals with this problem. To register the available network protocols, use the - qInitNetworkProtocols() function. The protocols currently + tqInitNetworkProtocols() function. The protocols currently supported are: \list \i \link TQFtp FTP\endlink, @@ -293,7 +293,7 @@ TQUrlOperator::TQUrlOperator() : TQUrl() { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: cstr 1" ); + tqDebug( "TQUrlOperator: cstr 1" ); #endif d = new TQUrlOperatorPrivate; } @@ -309,7 +309,7 @@ TQUrlOperator::TQUrlOperator( const TQString &url ) : TQUrl( url ) { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: cstr 2" ); + tqDebug( "TQUrlOperator: cstr 2" ); #endif d = new TQUrlOperatorPrivate; getNetworkProtocol(); @@ -323,7 +323,7 @@ TQUrlOperator::TQUrlOperator( const TQUrlOperator& url ) : TQObject(), TQUrl( url ) { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: cstr 3" ); + tqDebug( "TQUrlOperator: cstr 3" ); #endif d = new TQUrlOperatorPrivate; *d = *url.d; @@ -345,7 +345,7 @@ TQUrlOperator::TQUrlOperator( const TQUrlOperator& url, const TQString& relUrl, : TQUrl( url, relUrl, checkSlash ) { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: cstr 4" ); + tqDebug( "TQUrlOperator: cstr 4" ); #endif d = new TQUrlOperatorPrivate; if ( relUrl == "." ) @@ -363,7 +363,7 @@ TQUrlOperator::TQUrlOperator( const TQUrlOperator& url, const TQString& relUrl, TQUrlOperator::~TQUrlOperator() { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: dstr" ); + tqDebug( "TQUrlOperator: dstr" ); #endif delete d; } @@ -570,7 +570,7 @@ const TQNetworkOperation *TQUrlOperator::rename( const TQString &oldname, const TQPtrList<TQNetworkOperation> TQUrlOperator::copy( const TQString &from, const TQString &to, bool move, bool toPath ) { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move ); + tqDebug( "TQUrlOperator: copy %s %s %d", from.latin1(), to.latin1(), move ); #endif TQPtrList<TQNetworkOperation> ops; @@ -644,7 +644,7 @@ TQPtrList<TQNetworkOperation> TQUrlOperator::copy( const TQString &from, const T gProt->setAutoDelete( TRUE ); } #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: copy operation should start now..." ); + tqDebug( "TQUrlOperator: copy operation should start now..." ); #endif return ops; } else { @@ -1063,7 +1063,7 @@ bool TQUrlOperator::checkValid() void TQUrlOperator::copyGotData( const TQByteArray &data_, TQNetworkOperation *op ) { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: copyGotData: %d new bytes", data_.size() ); + tqDebug( "TQUrlOperator: copyGotData: %d new bytes", data_.size() ); #endif TQNetworkOperation *put = d->getOpPutOpMap[ (void*)op ]; if ( put ) { @@ -1089,7 +1089,7 @@ void TQUrlOperator::continueCopy( TQNetworkOperation *op ) #ifdef TQURLOPERATOR_DEBUG if ( op->state() != TQNetworkProtocol::StFailed ) { - qDebug( "TQUrlOperator: continue copy (get finished, put will start)" ); + tqDebug( "TQUrlOperator: continue copy (get finished, put will start)" ); } #endif @@ -1134,7 +1134,7 @@ void TQUrlOperator::continueCopy( TQNetworkOperation *op ) void TQUrlOperator::finishedCopy() { #ifdef TQURLOPERATOR_DEBUG - qDebug( "TQUrlOperator: finished copy (finished putting)" ); + tqDebug( "TQUrlOperator: finished copy (finished putting)" ); #endif if ( d->waitingCopies.isEmpty() ) diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp index 6d4b5d1d1..3f4fe430a 100644 --- a/src/kernel/qvariant.cpp +++ b/src/kernel/qvariant.cpp @@ -408,7 +408,7 @@ void TQVariant::Private::clear() TQDataStream in(...); // (opening the previously written stream) in >> v; // Reads an Int variant int z = v.toInt(); // z = 123 - qDebug("Type is %s", // prints "Type is int" + tqDebug("Type is %s", // prints "Type is int" v.typeName()); v.asInt() += 100; // The variant now hold the value 223. v = TQVariant( TQStringList() ); diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index 82b31d430..5a27310f2 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -882,7 +882,7 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n ) { #if defined(QT_CHECK_STATE) && !defined(Q_WS_WIN) if ( tqApp->type() == TQApplication::Tty ) { - qWarning( "TQWidget: Cannot create a TQWidget when no GUI " + tqWarning( "TQWidget: Cannot create a TQWidget when no GUI " "is being used" ); } #endif @@ -954,7 +954,7 @@ TQWidget::~TQWidget() { #if defined (QT_CHECK_STATE) if ( paintingActive() ) - qWarning( "%s (%s): deleted while being painted", className(), name() ); + tqWarning( "%s (%s): deleted while being painted", className(), name() ); #endif // Remove myself and all children from the can-take-focus list @@ -2671,7 +2671,7 @@ void TQWidget::setBackgroundMode( BackgroundMode m, BackgroundMode visual ) setBackgroundEmpty(); } else if ( m == FixedColor || m == FixedPixmap ) { #if defined(QT_DEBUG) - qWarning( "TQWidget::setBackgroundMode: FixedColor or FixedPixmap makes" + tqWarning( "TQWidget::setBackgroundMode: FixedColor or FixedPixmap makes" " no sense" ); #endif return; @@ -3181,7 +3181,7 @@ void TQWidget::setFocusProxy( TQWidget * w ) for ( TQWidget* fp = w; fp; fp = fp->focusProxy() ) { if ( fp == this ) { #if defined (QT_CHECK_STATE) - qWarning( "%s (%s): already in focus proxy chain", className(), name() ); + tqWarning( "%s (%s): already in focus proxy chain", className(), name() ); #endif return; } @@ -3443,8 +3443,8 @@ bool TQWidget::focusNextPrevChild( bool next ) TQWidget *startingPoint = f->it.current(); TQWidget *candidate = 0; TQWidget *w = next ? f->focusWidgets.last() : f->focusWidgets.first(); - extern bool qt_tab_all_widgets; - uint focus_flag = qt_tab_all_widgets ? TabFocus : StrongFocus; + extern bool tqt_tab_all_widgets; + uint focus_flag = tqt_tab_all_widgets ? TabFocus : StrongFocus; do { if ( w && w != startingPoint && ( ( w->focusPolicy() & focus_flag ) == focus_flag ) diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp index 41b048b67..52adb5397 100644 --- a/src/kernel/qwidget_x11.cpp +++ b/src/kernel/qwidget_x11.cpp @@ -85,8 +85,8 @@ static TQWidget *mouseGrb = 0; static TQWidget *keyboardGrb = 0; // defined in qapplication_x11.cpp -extern Time qt_x_time; -extern Time qt_x_user_time; +extern Time tqt_x_time; +extern Time tqt_x_user_time; #ifndef QT_NO_XSYNC extern Atom qt_net_wm_sync_request_counter; @@ -95,7 +95,7 @@ extern bool qt_use_xsync; #endif // defined in qfont_x11.cpp -extern bool qt_has_xft; +extern bool tqt_has_xft; int qt_x11_create_desktop_on_screen = -1; @@ -104,13 +104,13 @@ int qt_x11_create_desktop_on_screen = -1; *****************************************************************************/ // defined in qapplication_x11.cpp -extern Atom qt_wm_state; +extern Atom tqt_wm_state; extern Atom qt_wm_change_state; -extern Atom qt_wm_delete_window; -extern Atom qt_wm_take_focus; +extern Atom tqt_wm_delete_window; +extern Atom tqt_wm_take_focus; extern Atom qt_wm_client_leader; -extern Atom qt_window_role; -extern Atom qt_sm_client_id; +extern Atom tqt_window_role; +extern Atom tqt_sm_client_id; extern Atom qt_utf8_string; extern Atom qt_net_wm_context_help; extern Atom qt_net_wm_ping; @@ -468,7 +468,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) rendhd = 0; } - if ( qt_has_xft ) + if ( tqt_has_xft ) rendhd = (HANDLE) XftDrawCreate( dpy, id, (Visual *) x11Visual(), x11Colormap() ); #endif // QT_NO_XFTFREETYPE @@ -676,8 +676,8 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) XStoreName( dpy, id, tqAppName() ); Atom protocols[5]; int n = 0; - protocols[n++] = qt_wm_delete_window; // support del window protocol - protocols[n++] = qt_wm_take_focus; // support take focus window protocol + protocols[n++] = tqt_wm_delete_window; // support del window protocol + protocols[n++] = tqt_wm_take_focus; // support take focus window protocol protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol #ifndef QT_NO_XSYNC protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_RETQUEST protocol @@ -727,7 +727,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) // declare the widget's object name as window role XChangeProperty( dpy, id, - qt_window_role, XA_STRING, 8, PropModeReplace, + tqt_window_role, XA_STRING, 8, PropModeReplace, (unsigned char *)name(), tqstrlen( name() ) ); // set client leader property @@ -1250,7 +1250,7 @@ qstring_to_xtp( const TQString& s ) tl, 1, XStdICCTextStyle, &tp ); #if defined(QT_DEBUG) if ( errCode < 0 ) - qDebug( "qstring_to_xtp result code %d", errCode ); + tqDebug( "qstring_to_xtp result code %d", errCode ); #endif } if ( !mapper || errCode < 0 ) { @@ -1413,7 +1413,7 @@ void TQWidget::grabMouse() PointerMotionMask | EnterWindowMask | LeaveWindowMask ), GrabModeAsync, GrabModeAsync, - None, None, qt_x_time ); + None, None, tqt_x_time ); #if defined(QT_CHECK_STATE) if ( status ) { const char *s = @@ -1422,7 +1422,7 @@ void TQWidget::grabMouse() status == GrabFrozen ? "\"GrabFrozen\"" : status == GrabInvalidTime ? "\"GrabInvalidTime\"" : "<?>"; - qWarning( "Grabbing the mouse failed with %s", s ); + tqWarning( "Grabbing the mouse failed with %s", s ); } #endif mouseGrb = this; @@ -1455,7 +1455,7 @@ void TQWidget::grabMouse( const TQCursor &cursor ) (uint)(ButtonPressMask | ButtonReleaseMask | PointerMotionMask | EnterWindowMask | LeaveWindowMask), GrabModeAsync, GrabModeAsync, - None, cursor.handle(), qt_x_time ); + None, cursor.handle(), tqt_x_time ); #if defined(QT_CHECK_STATE) if ( status ) { const char *s = @@ -1464,7 +1464,7 @@ void TQWidget::grabMouse( const TQCursor &cursor ) status == GrabFrozen ? "\"GrabFrozen\"" : status == GrabInvalidTime ? "\"GrabInvalidTime\"" : "<?>"; - qWarning( "Grabbing the mouse failed with %s", s ); + tqWarning( "Grabbing the mouse failed with %s", s ); } #endif mouseGrb = this; @@ -1480,7 +1480,7 @@ void TQWidget::grabMouse( const TQCursor &cursor ) void TQWidget::releaseMouse() { if ( !qt_nograb() && mouseGrb == this ) { - XUngrabPointer( x11Display(), qt_x_time ); + XUngrabPointer( x11Display(), tqt_x_time ); XFlush( x11Display() ); mouseGrb = 0; } @@ -1510,7 +1510,7 @@ void TQWidget::grabKeyboard() if ( keyboardGrb ) keyboardGrb->releaseKeyboard(); XGrabKeyboard( x11Display(), winid, False, GrabModeAsync, GrabModeAsync, - qt_x_time ); + tqt_x_time ); keyboardGrb = this; } } @@ -1524,7 +1524,7 @@ void TQWidget::grabKeyboard() void TQWidget::releaseKeyboard() { if ( !qt_nograb() && keyboardGrb == this ) { - XUngrabKeyboard( x11Display(), qt_x_time ); + XUngrabKeyboard( x11Display(), tqt_x_time ); keyboardGrb = 0; } } @@ -1585,7 +1585,7 @@ void TQWidget::setActiveWindow() { TQWidget *tlw = topLevelWidget(); if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_contains(tlw) ) { - XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, qt_x_time); + XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, tqt_x_time); focusInputContext(); } } @@ -1915,7 +1915,7 @@ void TQWidget::showWindow() if ( got_hints ) XFree( (char *)h ); - if (qt_x_user_time != CurrentTime) { + if (tqt_x_user_time != CurrentTime) { XChangeProperty(x11Display(), winId(), qt_net_wm_user_time, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &qt_x_user_time, 1); } @@ -2215,7 +2215,7 @@ void TQWidget::setMinimumSize( int minw, int minh ) { #if defined(QT_CHECK_RANGE) if ( minw < 0 || minh < 0 ) - qWarning("TQWidget::setMinimumSize: The smallest allowed size is (0,0)"); + tqWarning("TQWidget::setMinimumSize: The smallest allowed size is (0,0)"); #endif createExtra(); if ( extra->minw == minw && extra->minh == minh ) @@ -2244,7 +2244,7 @@ void TQWidget::setMaximumSize( int maxw, int maxh ) { #if defined(QT_CHECK_RANGE) if ( maxw > TQWIDGETSIZE_MAX || maxh > TQWIDGETSIZE_MAX ) { - qWarning("TQWidget::setMaximumSize: (%s/%s) " + tqWarning("TQWidget::setMaximumSize: (%s/%s) " "The largest allowed size is (%d,%d)", name( "unnamed" ), className(), TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); @@ -2252,7 +2252,7 @@ void TQWidget::setMaximumSize( int maxw, int maxh ) maxh = TQMIN( maxh, TQWIDGETSIZE_MAX ); } if ( maxw < 0 || maxh < 0 ) { - qWarning("TQWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) " + tqWarning("TQWidget::setMaximumSize: (%s/%s) Negative sizes (%d,%d) " "are not possible", name( "unnamed" ), className(), maxw, maxh ); maxw = TQMAX( maxw, 0 ); @@ -2424,7 +2424,7 @@ void TQWidget::scroll( int dx, int dy, const TQRect& r ) return; Display *dpy = x11Display(); - GC gc = qt_xget_readonly_gc( x11Screen(), FALSE ); + GC gc = tqt_xget_readonly_gc( x11Screen(), FALSE ); // Want expose events if ( w > 0 && h > 0 && !just_update ) { XSetGraphicsExposures( dpy, gc, True ); @@ -2546,7 +2546,7 @@ int TQWidget::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - qWarning( "TQWidget::metric: Invalid metric command" ); + tqWarning( "TQWidget::metric: Invalid metric command" ); #endif } } @@ -2765,7 +2765,7 @@ void TQWidget::setName( const char *name ) TQObject::setName( name ); if ( isTopLevel() ) { XChangeProperty( x11Display(), winId(), - qt_window_role, XA_STRING, 8, PropModeReplace, + tqt_window_role, XA_STRING, 8, PropModeReplace, (unsigned char *)name, tqstrlen( name ) ); } } @@ -2800,7 +2800,7 @@ void TQWidget::updateFrameStrut() const XFree(c); if (! p) { - qWarning("TQWidget::updateFrameStrut(): ERROR - no parent"); + tqWarning("TQWidget::updateFrameStrut(): ERROR - no parent"); return; } diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp index 10a7c93fa..06a1068f2 100644 --- a/src/kernel/qwmatrix.cpp +++ b/src/kernel/qwmatrix.cpp @@ -702,8 +702,8 @@ TQPointArray TQWMatrix::mapToPolygon( const TQRect &rect ) const #if 0 int i; for( i = 0; i< 4; i++ ) - qDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], tqRound(x[i]), tqRound(y[i]) ); - qDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ), + tqDebug("coords(%d) = (%f/%f) (%d/%d)", i, x[i], y[i], tqRound(x[i]), tqRound(y[i]) ); + tqDebug( "width=%f, height=%f", sqrt( (x[1]-x[0])*(x[1]-x[0]) + (y[1]-y[0])*(y[1]-y[0]) ), sqrt( (x[0]-x[3])*(x[0]-x[3]) + (y[0]-y[3])*(y[0]-y[3]) ) ); #endif // all coordinates are correctly, tranform to a pointarray diff --git a/src/moc/moc.l b/src/moc/moc.l index 9ddce077f..a917b03e3 100644 --- a/src/moc/moc.l +++ b/src/moc/moc.l @@ -264,13 +264,13 @@ STRING {ALMOSTSTRING}\" <QT_DEF>[_a-zA-Z][_a-zA-Z0-9]* { X; - yylval.string = qstrdup(yytext); + yylval.string = tqstrdup(yytext); return IDENTIFIER; } <IN_PROPERTY>[_a-zA-Z][_a-zA-Z0-9]* { X; - yylval.string = qstrdup(yytext); + yylval.string = tqstrdup(yytext); return IDENTIFIER; } @@ -280,7 +280,7 @@ STRING {ALMOSTSTRING}\" <IN_CLASSINFO>{ALMOSTSTRING} { X; - yylval.string = qstrdup( yytext + 1 ); + yylval.string = tqstrdup( yytext + 1 ); input(); /* discard the '"' */ return STRING; } @@ -317,7 +317,7 @@ STRING {ALMOSTSTRING}\" <QT_DEF>{ALMOSTSTRING} { X; - yylval.string = qstrdup( yytext + 1 ); + yylval.string = tqstrdup( yytext + 1 ); input(); /* discard the '"' */ return STRING; } diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp index cb2651b4d..149489d07 100644 --- a/src/moc/moc_lex.cpp +++ b/src/moc/moc_lex.cpp @@ -1883,7 +1883,7 @@ YY_RULE_SETUP #line 265 "moc.l" { X; - yylval.string = qstrdup(yytext); + yylval.string = tqstrdup(yytext); return IDENTIFIER; } YY_BREAK @@ -1892,7 +1892,7 @@ YY_RULE_SETUP #line 271 "moc.l" { X; - yylval.string = qstrdup(yytext); + yylval.string = tqstrdup(yytext); return IDENTIFIER; } YY_BREAK @@ -1917,7 +1917,7 @@ YY_RULE_SETUP #line 281 "moc.l" { X; - yylval.string = qstrdup( yytext + 1 ); + yylval.string = tqstrdup( yytext + 1 ); input(); /* discard the '"' */ return STRING; } @@ -1988,7 +1988,7 @@ YY_RULE_SETUP #line 318 "moc.l" { X; - yylval.string = qstrdup( yytext + 1 ); + yylval.string = tqstrdup( yytext + 1 ); input(); /* discard the '"' */ return STRING; } diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h index 2431b9ef5..800414bf0 100644 --- a/src/network/ntqnetwork.h +++ b/src/network/ntqnetwork.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Definition of qInitNetworkProtocols function. +** Definition of tqInitNetworkProtocols function. ** ** Created : 970521 ** @@ -53,7 +53,7 @@ #ifndef QT_NO_NETWORK -TQM_EXPORT_NETWORK void qInitNetworkProtocols(); +TQM_EXPORT_NETWORK void tqInitNetworkProtocols(); #endif diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 17b78b684..ac5ced853 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -411,7 +411,7 @@ void TQDnsAnswer::parseA() { if ( next != pp + 4 ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %d bytes long IN A for %s", + tqDebug( "TQDns: saw %d bytes long IN A for %s", next - pp, label.ascii() ); #endif return; @@ -424,7 +424,7 @@ void TQDnsAnswer::parseA() ( answer[pp+2] << 8 ) + ( answer[pp+3] ) ); #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN A %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN A %s (ttl %d)", label.ascii(), rr->address.toString().ascii(), ttl ); #endif } @@ -434,7 +434,7 @@ void TQDnsAnswer::parseAaaa() { if ( next != pp + 16 ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %d bytes long IN Aaaa for %s", + tqDebug( "TQDns: saw %d bytes long IN Aaaa for %s", next - pp, label.ascii() ); #endif return; @@ -444,7 +444,7 @@ void TQDnsAnswer::parseAaaa() rr->t = TQDns::Aaaa; rr->address = TQHostAddress( answer+pp ); #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN Aaaa %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN Aaaa %s (ttl %d)", label.ascii(), rr->address.toString().ascii(), ttl ); #endif } @@ -455,7 +455,7 @@ void TQDnsAnswer::parseMx() { if ( next < pp + 2 ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %d bytes long IN MX for %s", + tqDebug( "TQDns: saw %d bytes long IN MX for %s", next - pp, label.ascii() ); #endif return; @@ -467,13 +467,13 @@ void TQDnsAnswer::parseMx() rr->target = readString().lower(); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad string in MX for %s", label.ascii() ); + tqDebug( "TQDns: saw bad string in MX for %s", label.ascii() ); #endif return; } rr->t = TQDns::Mx; #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN MX %d %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN MX %d %s (ttl %d)", label.ascii(), rr->priority, rr->target.ascii(), ttl ); #endif } @@ -483,7 +483,7 @@ void TQDnsAnswer::parseSrv() { if ( next < pp + 6 ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %d bytes long IN SRV for %s", + tqDebug( "TQDns: saw %d bytes long IN SRV for %s", next - pp, label.ascii() ); #endif return; @@ -497,13 +497,13 @@ void TQDnsAnswer::parseSrv() rr->target = readString().lower(); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad string in SRV for %s", label.ascii() ); + tqDebug( "TQDns: saw bad string in SRV for %s", label.ascii() ); #endif return; } rr->t = TQDns::Srv; #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN SRV %d %d %d %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN SRV %d %d %d %s (ttl %d)", label.ascii(), rr->priority, rr->weight, rr->port, rr->target.ascii(), ttl ); #endif } @@ -514,7 +514,7 @@ void TQDnsAnswer::parseCname() TQString target = readString().lower(); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad cname for for %s", label.ascii() ); + tqDebug( "TQDns: saw bad cname for for %s", label.ascii() ); #endif return; } @@ -523,7 +523,7 @@ void TQDnsAnswer::parseCname() rr->t = TQDns::Cname; rr->target = target; #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN CNAME %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN CNAME %s (ttl %d)", label.ascii(), rr->target.ascii(), ttl ); #endif } @@ -534,7 +534,7 @@ void TQDnsAnswer::parseNs() TQString target = readString().lower(); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad cname for for %s", label.ascii() ); + tqDebug( "TQDns: saw bad cname for for %s", label.ascii() ); #endif return; } @@ -542,7 +542,7 @@ void TQDnsAnswer::parseNs() // parse, but ignore #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN NS %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN NS %s (ttl %d)", label.ascii(), target.ascii(), ttl ); #endif } @@ -553,7 +553,7 @@ void TQDnsAnswer::parsePtr() TQString target = readString().lower(); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad PTR for for %s", label.ascii() ); + tqDebug( "TQDns: saw bad PTR for for %s", label.ascii() ); #endif return; } @@ -562,7 +562,7 @@ void TQDnsAnswer::parsePtr() rr->t = TQDns::Ptr; rr->target = target; #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN PTR %s (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN PTR %s (ttl %d)", label.ascii(), rr->target.ascii(), ttl ); #endif } @@ -573,7 +573,7 @@ void TQDnsAnswer::parseTxt() TQString text = readString(FALSE); if ( !ok ) { #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw bad TXT for for %s", label.ascii() ); + tqDebug( "TQDns: saw bad TXT for for %s", label.ascii() ); #endif return; } @@ -582,7 +582,7 @@ void TQDnsAnswer::parseTxt() rr->t = TQDns::Txt; rr->text = text; #if defined(TQDNS_DEBUG) - qDebug( "TQDns: saw %s IN TXT \"%s\" (ttl %d)", label.ascii(), + tqDebug( "TQDns: saw %s IN TXT \"%s\" (ttl %d)", label.ascii(), rr->text.ascii(), ttl ); #endif } @@ -593,7 +593,7 @@ void TQDnsAnswer::parse() // okay, do the work... if ( (answer[2] & 0x78) != 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: answer to wrong query type (%d)", answer[1] ); + tqDebug( "DNS Manager: answer to wrong query type (%d)", answer[1] ); #endif ok = FALSE; return; @@ -605,7 +605,7 @@ void TQDnsAnswer::parse() // TC if ( (answer[2] & 2) != 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: truncated answer; pressing on" ); + tqDebug( "DNS Manager: truncated answer; pressing on" ); #endif } @@ -617,7 +617,7 @@ void TQDnsAnswer::parse() if ( (answer[3] & 0x0f) == 3 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: saw NXDomain for %s", query->l.ascii() ); + tqDebug( "DNS Manager: saw NXDomain for %s", query->l.ascii() ); #endif // NXDomain. cache that for one minute. rr = new TQDnsRR( query->l ); @@ -632,7 +632,7 @@ void TQDnsAnswer::parse() if ( (answer[3] & 0x0f) != 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: error code %d", answer[3] & 0x0f ); + tqDebug( "DNS Manager: error code %d", answer[3] & 0x0f ); #endif ok = FALSE; return; @@ -671,7 +671,7 @@ void TQDnsAnswer::parse() rdlength = ( answer[pp+8] << 8 ) + answer[pp+9]; if ( pp + 10 + rdlength > size ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: ran out of stuff to parse (%d+%d>%d (%d)", + tqDebug( "DNS Manager: ran out of stuff to parse (%d+%d>%d (%d)", pp, rdlength, size, rrno < ancount ); #endif // if we're still in the AN section, we should go back and @@ -689,7 +689,7 @@ void TQDnsAnswer::parse() pp = pp + 10; if ( clas != 1 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: class %d (not internet) for %s", + tqDebug( "DNS Manager: class %d (not internet) for %s", clas, label.isNull() ? "." : label.ascii() ); #endif } else { @@ -723,7 +723,7 @@ void TQDnsAnswer::parse() default: // something we don't know #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: type %d for %s", type, + tqDebug( "DNS Manager: type %d for %s", type, label.isNull() ? "." : label.ascii() ); #endif break; @@ -750,7 +750,7 @@ void TQDnsAnswer::parse() } if ( answers == 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: answer contained no answers" ); + tqDebug( "DNS Manager: answer contained no answers" ); #endif ok = ( aa && rd ); } @@ -790,7 +790,7 @@ void TQDnsAnswer::parse() // well, it's equal, but it's not the same. so we kill it, // but use its expiry time. #if defined(TQDNS_DEBUG) - qDebug( "killing off old %d for %s, expire was %d", + tqDebug( "killing off old %d for %s, expire was %d", older->t, older->domain->name().latin1(), rr->expireTime ); #endif @@ -799,7 +799,7 @@ void TQDnsAnswer::parse() rr->deleteTime = TQMAX( older->deleteTime, rr->deleteTime ); older->deleteTime = 0; #if defined(TQDNS_DEBUG) - qDebug( " adjusted expire is %d", rr->expireTime ); + tqDebug( " adjusted expire is %d", rr->expireTime ); #endif } drrs->next(); @@ -808,7 +808,7 @@ void TQDnsAnswer::parse() } #if defined(TQDNS_DEBUG) - //qDebug( "DNS Manager: ()" ); + //tqDebug( "DNS Manager: ()" ); #endif } @@ -836,7 +836,7 @@ void TQDnsAnswer::notify() notified.insert( (void*)dns, (void*)42 ); if ( rrs->count() == 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: found no answers!" ); + tqDebug( "DNS Manager: found no answers!" ); #endif dns->d->noNames = TRUE; ((TQDnsUgleHack*)dns)->ugle( TRUE ); @@ -846,7 +846,7 @@ void TQDnsAnswer::notify() ((TQDnsUgleHack*)dns)->ugle(); #if defined(TQDNS_DEBUG) else - qDebug( "DNS Manager: DNS thing %s not notified for %s", + tqDebug( "DNS Manager: DNS thing %s not notified for %s", dns->label().ascii(), query->l.ascii() ); #endif } @@ -902,7 +902,7 @@ static void cleanupDns() TQDnsManager * TQDnsManager::manager() { if ( !globalManager ) { - qAddPostRoutine(cleanupDns); + tqAddPostRoutine(cleanupDns); new TQDnsManager(); } return globalManager; @@ -913,7 +913,7 @@ void TQDnsUgleHack::ugle( bool emitAnyway) { if ( emitAnyway || !isWorking() ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: status change for %s (type %d)", + tqDebug( "DNS Manager: status change for %s (type %d)", label().ascii(), recordType() ); #endif emit resultsReady(); @@ -977,9 +977,9 @@ TQDnsManager::TQDnsManager() if ( !ns->current() ) { ns->append( new TQHostAddress(*h) ); #if defined(TQDNS_DEBUG) - qDebug( "using name server %s", h->toString().latin1() ); + tqDebug( "using name server %s", h->toString().latin1() ); } else { - qDebug( "skipping address %s", h->toString().latin1() ); + tqDebug( "skipping address %s", h->toString().latin1() ); #endif } ::ns->next(); @@ -1000,9 +1000,9 @@ TQDnsManager::TQDnsManager() if ( !domains->current() ) { domains->append( s ); #if defined(TQDNS_DEBUG) - qDebug( "searching domain %s", s ); + tqDebug( "searching domain %s", s ); } else { - qDebug( "skipping domain %s", s ); + tqDebug( "skipping domain %s", s ); #endif } ::domains->next(); @@ -1035,7 +1035,7 @@ void TQDnsManager::cleanCache() TQDnsDomain * d; Q_UINT32 thisSweep = now(); #if defined(TQDNS_DEBUG) - qDebug( "TQDnsManager::cleanCache(: Called, time is %u, last was %u", + tqDebug( "TQDnsManager::cleanCache(: Called, time is %u, last was %u", thisSweep, lastSweep ); #endif @@ -1079,12 +1079,12 @@ void TQDnsManager::answer() #endif #if defined(TQDNS_DEBUG) #if !defined (QT_NO_IPV6) - qDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r, + tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r, useIpv4Socket ? ipv4Socket->peerAddress().toString().ascii() : ipv6Socket->peerAddress().toString().ascii(), useIpv4Socket ? ipv4Socket->peerPort() : ipv6Socket->peerPort() ); #else - qDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r, + tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r, ipv4Socket->peerAddress().toString().ascii(), ipv4Socket->peerPort());; #endif #endif @@ -1101,7 +1101,7 @@ void TQDnsManager::answer() i++; if ( i == queries.size() ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: bad id (0x%04x) %d", aid, i ); + tqDebug( "DNS Manager: bad id (0x%04x) %d", aid, i ); #endif return; } @@ -1110,7 +1110,7 @@ void TQDnsManager::answer() if ( ( (Q_UINT8)(a[2]) & 0x80 ) == 0 ) { #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: received a query" ); + tqDebug( "DNS Manager: received a query" ); #endif return; } @@ -1159,7 +1159,7 @@ void TQDnsManager::transmitQuery( int i ) // and then get rid of the query queries.take( i ); #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: giving up on query 0x%04x", q->id ); + tqDebug( "DNS Manager: giving up on query 0x%04x", q->id ); #endif delete q; TQTimer::singleShot( 0, TQDnsManager::manager(), SLOT(cleanCache()) ); @@ -1255,7 +1255,7 @@ void TQDnsManager::transmitQuery( int i ) // and then get rid of the query queries.take( i ); #if defined(TQDNS_DEBUG) - qDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id ); + tqDebug( "DNS Manager: no DNS server found on query 0x%04x", q->id ); #endif delete q; TQTimer::singleShot( 1000*10, TQDnsManager::manager(), SLOT(cleanCache()) ); @@ -1271,7 +1271,7 @@ void TQDnsManager::transmitQuery( int i ) ipv6Socket->writeBlock( p.data(), pp, receiver, 53 ); #endif #if defined(TQDNS_DEBUG) - qDebug( "issuing query 0x%04x (%d) about %s type %d to %s", + tqDebug( "issuing query 0x%04x (%d) about %s type %d to %s", q->id, q->step, q->l.ascii(), q->t, ns->at( q->step % ns->count() )->toString().ascii() ); #endif @@ -1289,7 +1289,7 @@ void TQDnsManager::transmitQuery( int i ) ipv6Socket->writeBlock( p.data(), pp, *server, 53 ); #endif #if defined(TQDNS_DEBUG) - qDebug( "copying query to %s", server->toString().ascii() ); + tqDebug( "copying query to %s", server->toString().ascii() ); #endif } } @@ -1408,12 +1408,12 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) TQString s = *it++; nxdomain = FALSE; #if defined(TQDNS_DEBUG) - qDebug( "looking at cache for %s (%s %d)", + tqDebug( "looking at cache for %s (%s %d)", s.ascii(), r->label().ascii(), r->recordType() ); #endif TQDnsDomain * d = m->domain( s ); #if defined(TQDNS_DEBUG) - qDebug( " - found %d RRs", d && d->rrs ? d->rrs->count() : 0 ); + tqDebug( " - found %d RRs", d && d->rrs ? d->rrs->count() : 0 ); #endif if ( d->rrs ) d->rrs->first(); @@ -1425,7 +1425,7 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // cname. if the code is ugly, that may just // possibly be because the concept is. #if defined(TQDNS_DEBUG) - qDebug( "found cname from %s to %s", + tqDebug( "found cname from %s to %s", r->label().ascii(), rr->target.ascii() ); #endif s = rr->target; @@ -1472,11 +1472,11 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // if we found a positive result, return tquickly if ( answer && l->count() ) { #if defined(TQDNS_DEBUG) - qDebug( "found %d records for %s", + tqDebug( "found %d records for %s", l->count(), r->label().ascii() ); l->first(); while( l->current() ) { - qDebug( " type %d target %s address %s", + tqDebug( " type %d target %s address %s", l->current()->t, l->current()->target.latin1(), l->current()->address.toString().latin1() ); @@ -1489,7 +1489,7 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) #if defined(TQDNS_DEBUG) if ( nxdomain ) - qDebug( "found NXDomain %s", s.ascii() ); + tqDebug( "found NXDomain %s", s.ascii() ); #endif if ( !nxdomain ) { @@ -1539,7 +1539,7 @@ void TQDnsDomain::sweep( Q_UINT32 thisSweep ) rr->deleteTime = thisSweep; // will hit next time around #if defined(TQDNS_DEBUG) - qDebug( "TQDns::sweep: %s type %d expires %u %u - %s / %s", + tqDebug( "TQDns::sweep: %s type %d expires %u %u - %s / %s", rr->domain->name().latin1(), rr->t, rr->expireTime, rr->deleteTime, rr->target.latin1(), rr->address.toString().latin1()); @@ -1775,10 +1775,10 @@ void TQDns::setLabel( const TQString & label ) setStartQueryTimer(); // start query the next time we enter event loop #endif #if defined(TQDNS_DEBUG) - qDebug( "TQDns::setLabel: %d address(es) for %s", n.count(), l.ascii() ); + tqDebug( "TQDns::setLabel: %d address(es) for %s", n.count(), l.ascii() ); int i = 0; for( i = 0; i < (int)n.count(); i++ ) - qDebug( "TQDns::setLabel: %d: %s", i, n[i].ascii() ); + tqDebug( "TQDns::setLabel: %d: %s", i, n[i].ascii() ); #endif } @@ -1965,7 +1965,7 @@ TQString TQDns::toInAddrArpaDomain( const TQHostAddress &address ) bool TQDns::isWorking() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::isWorking (%s, %d)", l.ascii(), t ); + tqDebug( "TQDns::isWorking (%s, %d)", l.ascii(), t ); #endif if ( t == None ) return FALSE; @@ -2020,7 +2020,7 @@ bool TQDns::isWorking() const TQValueList<TQHostAddress> TQDns::addresses() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::addresses (%s)", l.ascii() ); + tqDebug( "TQDns::addresses (%s)", l.ascii() ); #endif TQValueList<TQHostAddress> result; if ( t != A && t != Aaaa ) @@ -2074,7 +2074,7 @@ TQValueList<TQHostAddress> TQDns::addresses() const TQValueList<TQDns::MailServer> TQDns::mailServers() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::mailServers (%s)", l.ascii() ); + tqDebug( "TQDns::mailServers (%s)", l.ascii() ); #endif TQValueList<TQDns::MailServer> result; if ( t != Mx ) @@ -2131,7 +2131,7 @@ TQValueList<TQDns::MailServer> TQDns::mailServers() const TQValueList<TQDns::Server> TQDns::servers() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::servers (%s)", l.ascii() ); + tqDebug( "TQDns::servers (%s)", l.ascii() ); #endif TQValueList<TQDns::Server> result; if ( t != Srv ) @@ -2170,7 +2170,7 @@ TQValueList<TQDns::Server> TQDns::servers() const TQStringList TQDns::hostNames() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::hostNames (%s)", l.ascii() ); + tqDebug( "TQDns::hostNames (%s)", l.ascii() ); #endif TQStringList result; if ( t != Ptr ) @@ -2208,7 +2208,7 @@ TQStringList TQDns::hostNames() const TQStringList TQDns::texts() const { #if defined(TQDNS_DEBUG) - qDebug( "TQDns::texts (%s)", l.ascii() ); + tqDebug( "TQDns::texts (%s)", l.ascii() ); #endif TQStringList result; if ( t != Txt ) @@ -2475,7 +2475,7 @@ void TQDns::doResInit() last = searchList.find( separator, first ); if ( last < 0 ) last = searchList.length(); - domains->append( qstrdup( searchList.mid( first, last-first ) ) ); + domains->append( tqstrdup( searchList.mid( first, last-first ) ) ); first = last+1; } while( first < (int)searchList.length() ); } diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index ec09fde4e..cb7af95a5 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -325,7 +325,7 @@ void TQFtpDTP::writeData() { if ( is_ba ) { #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::writeData: write %d bytes", data.ba->size() ); + tqDebug( "TQFtpDTP::writeData: write %d bytes", data.ba->size() ); #endif if ( data.ba->size() == 0 ) emit dataTransferProgress( 0, bytesTotal ); @@ -340,7 +340,7 @@ void TQFtpDTP::writeData() while ( !data.dev->atEnd() && socket.bytesToWrite()==0 ) { Q_LONG read = data.dev->readBlock( buf, blockSize ); #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::writeData: writeBlock() of size %d bytes", (int)read ); + tqDebug( "TQFtpDTP::writeData: writeBlock() of size %d bytes", (int)read ); #endif socket.writeBlock( buf, read ); if ( !data.dev ) @@ -375,7 +375,7 @@ inline void TQFtpDTP::clearError() void TQFtpDTP::abortConnection() { #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::abortConnection" ); + tqDebug( "TQFtpDTP::abortConnection" ); #endif callWriteData = FALSE; clearData(); @@ -526,7 +526,7 @@ void TQFtpDTP::socketConnected() bytesDone = 0; #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::connectState( CsConnected )" ); + tqDebug( "TQFtpDTP::connectState( CsConnected )" ); #endif emit connectState( TQFtpDTP::CsConnected ); } @@ -536,7 +536,7 @@ void TQFtpDTP::socketReadyRead() if ( pi->currentCommand().isEmpty() ) { socket.close(); #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::connectState( CsClosed )" ); + tqDebug( "TQFtpDTP::connectState( CsClosed )" ); #endif emit connectState( TQFtpDTP::CsClosed ); return; @@ -547,7 +547,7 @@ void TQFtpDTP::socketReadyRead() TQUrlInfo i; TQString line = socket.readLine(); #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP read (list): '%s'", line.latin1() ); + tqDebug( "TQFtpDTP read (list): '%s'", line.latin1() ); #endif if ( parseDir( line, "", &i ) ) { emit listInfo( i ); @@ -570,14 +570,14 @@ void TQFtpDTP::socketReadyRead() ba.resize( bytesRead ); bytesDone += bytesRead; #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP read: %d bytes (total %d bytes)", (int)bytesRead, bytesDone ); + tqDebug( "TQFtpDTP read: %d bytes (total %d bytes)", (int)bytesRead, bytesDone ); #endif emit dataTransferProgress( bytesDone, bytesTotal ); if (data.dev) // make sure it wasn't deleted in the slot data.dev->writeBlock( ba ); } else { #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP readyRead: %d bytes available (total %d bytes read)", (int)bytesAvailable(), bytesDone ); + tqDebug( "TQFtpDTP readyRead: %d bytes available (total %d bytes read)", (int)bytesAvailable(), bytesDone ); #endif emit dataTransferProgress( bytesDone+socket.bytesAvailable(), bytesTotal ); emit readyRead(); @@ -589,12 +589,12 @@ void TQFtpDTP::socketError( int e ) { if ( e == TQSocket::ErrHostNotFound ) { #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::connectState( CsHostNotFound )" ); + tqDebug( "TQFtpDTP::connectState( CsHostNotFound )" ); #endif emit connectState( TQFtpDTP::CsHostNotFound ); } else if ( e == TQSocket::ErrConnectionRefused ) { #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::connectState( CsConnectionRefused )" ); + tqDebug( "TQFtpDTP::connectState( CsConnectionRefused )" ); #endif emit connectState( TQFtpDTP::CsConnectionRefused ); } @@ -606,7 +606,7 @@ void TQFtpDTP::socketConnectionClosed() clearData(); } #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::connectState( CsClosed )" ); + tqDebug( "TQFtpDTP::connectState( CsClosed )" ); #endif emit connectState( TQFtpDTP::CsClosed ); } @@ -615,7 +615,7 @@ void TQFtpDTP::socketBytesWritten( int bytes ) { bytesDone += bytes; #if defined(TQFTPDTP_DEBUG) - qDebug( "TQFtpDTP::bytesWritten( %d )", bytesDone ); + tqDebug( "TQFtpDTP::bytesWritten( %d )", bytesDone ); #endif emit dataTransferProgress( bytesDone, bytesTotal ); if ( callWriteData ) @@ -701,7 +701,7 @@ void TQFtpPI::abort() abortState = AbortStarted; #if defined(TQFTPPI_DEBUG) - qDebug( "TQFtpPI send: ABOR" ); + tqDebug( "TQFtpPI send: ABOR" ); #endif commandSocket.writeBlock( "ABOR\r\n", 6 ); @@ -718,7 +718,7 @@ void TQFtpPI::connected() { state = Begin; #if defined(TQFTPPI_DEBUG) -// qDebug( "TQFtpPI state: %d [connected()]", state ); +// tqDebug( "TQFtpPI state: %d [connected()]", state ); #endif emit connectState( TQFtp::Connected ); } @@ -807,11 +807,11 @@ void TQFtpPI::readyRead() bool TQFtpPI::processReply() { #if defined(TQFTPPI_DEBUG) -// qDebug( "TQFtpPI state: %d [processReply() begin]", state ); +// tqDebug( "TQFtpPI state: %d [processReply() begin]", state ); if ( replyText.length() < 400 ) - qDebug( "TQFtpPI recv: %d %s", 100*replyCode[0]+10*replyCode[1]+replyCode[2], replyText.latin1() ); + tqDebug( "TQFtpPI recv: %d %s", 100*replyCode[0]+10*replyCode[1]+replyCode[2], replyText.latin1() ); else - qDebug( "TQFtpPI recv: %d (text skipped)", 100*replyCode[0]+10*replyCode[1]+replyCode[2] ); + tqDebug( "TQFtpPI recv: %d (text skipped)", 100*replyCode[0]+10*replyCode[1]+replyCode[2] ); #endif // process 226 replies ("Closing Data Connection") only when the data @@ -861,7 +861,7 @@ bool TQFtpPI::processReply() return TRUE; } #if defined(TQFTPPI_DEBUG) -// qDebug( "TQFtpPI state: %d [processReply() intermediate]", state ); +// tqDebug( "TQFtpPI state: %d [processReply() intermediate]", state ); #endif // special actions on certain replies @@ -878,7 +878,7 @@ bool TQFtpPI::processReply() TQRegExp addrPortPattern("(\\d+),(\\d+),(\\d+),(\\d+),(\\d+),(\\d+)"); if (addrPortPattern.search(replyText) == -1) { #if defined(TQFTPPI_DEBUG) - qDebug( "TQFtp: bad 227 response -- address and port information missing" ); + tqDebug( "TQFtp: bad 227 response -- address and port information missing" ); #endif // ### error handling } else { @@ -930,13 +930,13 @@ bool TQFtpPI::processReply() break; } #if defined(TQFTPPI_DEBUG) -// qDebug( "TQFtpPI state: %d [processReply() end]", state ); +// tqDebug( "TQFtpPI state: %d [processReply() end]", state ); #endif return TRUE; } #ifndef QT_NO_TEXTCODEC -TQM_EXPORT_FTP TQTextCodec *qt_ftp_filename_codec = 0; +TQM_EXPORT_FTP TQTextCodec *tqt_ftp_filename_codec = 0; #endif /* @@ -951,7 +951,7 @@ bool TQFtpPI::startNextCmd() #if defined(TQFTPPI_DEBUG) if ( state != Idle ) - qDebug( "TQFtpPI startNextCmd: Internal error! TQFtpPI called in non-Idle state %d", state ); + tqDebug( "TQFtpPI startNextCmd: Internal error! TQFtpPI called in non-Idle state %d", state ); #endif if ( pendingCommands.isEmpty() ) { currentCmd = TQString::null; @@ -961,13 +961,13 @@ bool TQFtpPI::startNextCmd() currentCmd = pendingCommands.first(); pendingCommands.pop_front(); #if defined(TQFTPPI_DEBUG) - qDebug( "TQFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() ); + tqDebug( "TQFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() ); #endif state = Waiting; #ifndef QT_NO_TEXTCODEC - if ( qt_ftp_filename_codec ) { + if ( tqt_ftp_filename_codec ) { int len = 0; - TQCString enc = qt_ftp_filename_codec->fromUnicode(currentCmd,len); + TQCString enc = tqt_ftp_filename_codec->fromUnicode(currentCmd,len); commandSocket.writeBlock( enc.data(), len ); } else #endif @@ -1042,7 +1042,7 @@ static TQFtpPrivate* d( const TQFtp* foo ) if ( !d_ptr ) { d_ptr = new TQPtrDict<TQFtpPrivate>; d_ptr->setAutoDelete( TRUE ); - qAddPostRoutine( cleanup_d_ptr ); + tqAddPostRoutine( cleanup_d_ptr ); } TQFtpPrivate* ret = d_ptr->find( (void*)foo ); if ( ! ret ) { @@ -1093,7 +1093,7 @@ static void delete_d( const TQFtp* foo ) \endcode This code will only work if the TQFtp class is registered; to - register the class, you must call qInitNetworkProtocols() before + register the class, you must call tqInitNetworkProtocols() before using a TQUrlOperator with TQFtp. The rest of this descrption describes the direct interface to FTP. diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index b8a110e58..1962557bb 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -1039,7 +1039,7 @@ TQString TQHttpRequestHeader::toString() const \endcode This code will only work if the TQHttp class is registered; to - register the class, you must call qInitNetworkProtocols() before + register the class, you must call tqInitNetworkProtocols() before using a TQUrlOperator with HTTP. The TQNetworkProtocol interface for HTTP only supports the @@ -1435,7 +1435,7 @@ void TQHttp::abort() Q_ULONG TQHttp::bytesAvailable() const { #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp::bytesAvailable(): %d bytes", (int)d->rba.size() ); + tqDebug( "TQHttp::bytesAvailable(): %d bytes", (int)d->rba.size() ); #endif return d->rba.size(); } @@ -1450,7 +1450,7 @@ Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen ) { if ( data == 0 && maxlen != 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQHttp::readBlock: Null pointer error" ); + tqWarning( "TQHttp::readBlock: Null pointer error" ); #endif return -1; } @@ -1460,7 +1460,7 @@ Q_LONG TQHttp::readBlock( char *data, Q_ULONG maxlen ) d->bytesDone += maxlen; #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp::readBlock(): read %d bytes (%d bytes done)", (int)maxlen, d->bytesDone ); + tqDebug( "TQHttp::readBlock(): read %d bytes (%d bytes done)", (int)maxlen, d->bytesDone ); #endif return maxlen; } @@ -1880,7 +1880,7 @@ void TQHttp::slotConnected() d->bytesTotal = str.length(); d->socket.writeBlock( str.latin1(), d->bytesTotal ); #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp: write request header:\n---{\n%s}---", str.latin1() ); + tqDebug( "TQHttp: write request header:\n---{\n%s}---", str.latin1() ); #endif if ( d->postDevice ) { @@ -1927,7 +1927,7 @@ void TQHttp::slotBytesWritten( int written ) int n = d->postDevice->readBlock( arr.data(), max ); if ( n != max ) { - qWarning("Could not read enough bytes from the device"); + tqWarning("Could not read enough bytes from the device"); close(); return; } @@ -1965,12 +1965,12 @@ void TQHttp::slotReadyRead() return; #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp: read response header:\n---{\n%s}---", d->headerStr.latin1() ); + tqDebug( "TQHttp: read response header:\n---{\n%s}---", d->headerStr.latin1() ); #endif d->response = TQHttpResponseHeader( d->headerStr ); d->headerStr = ""; #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp: read response header:\n---{\n%s}---", d->response.toString().latin1() ); + tqDebug( "TQHttp: read response header:\n---{\n%s}---", d->response.toString().latin1() ); #endif // Check header if ( !d->response.isValid() ) { @@ -2089,7 +2089,7 @@ void TQHttp::slotReadyRead() delete arr; d->bytesDone += n; #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp::slotReadyRead(): read %ld bytes (%d bytes done)", n, d->bytesDone ); + tqDebug( "TQHttp::slotReadyRead(): read %ld bytes (%d bytes done)", n, d->bytesDone ); #endif if ( d->response.hasContentLength() ) emit dataReadProgress( d->bytesDone, d->response.contentLength() ); @@ -2098,7 +2098,7 @@ void TQHttp::slotReadyRead() } else { d->rba.append( arr ); #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp::slotReadyRead(): read %ld bytes (%ld bytes done)", n, d->bytesDone + bytesAvailable() ); + tqDebug( "TQHttp::slotReadyRead(): read %ld bytes (%ld bytes done)", n, d->bytesDone + bytesAvailable() ); #endif if ( d->response.hasContentLength() ) emit dataReadProgress( d->bytesDone + bytesAvailable(), d->response.contentLength() ); @@ -2185,7 +2185,7 @@ void TQHttp::killIdleTimer() void TQHttp::setState( int s ) { #if defined(TQHTTP_DEBUG) - qDebug( "TQHttp state changed %d -> %d", d->state, s ); + tqDebug( "TQHttp state changed %d -> %d", d->state, s ); #endif d->state = (State)s; emit stateChanged( s ); diff --git a/src/network/qnetwork.cpp b/src/network/qnetwork.cpp index a3e8a7443..47c1c7ad5 100644 --- a/src/network/qnetwork.cpp +++ b/src/network/qnetwork.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Implementation of qInitNetworkProtocols function. +** Implementation of tqInitNetworkProtocols function. ** ** Created : 970521 ** @@ -58,7 +58,7 @@ This function is declared in \l ntqnetwork.h. */ -void qInitNetworkProtocols() +void tqInitNetworkProtocols() { #ifndef QT_NO_NETWORKPROTOCOL_FTP TQNetworkProtocol::registerNetworkProtocol( "ftp", new TQNetworkProtocolFactory< TQFtp > ); diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp index 04dc965ef..840ee231c 100644 --- a/src/network/qserversocket.cpp +++ b/src/network/qserversocket.cpp @@ -176,7 +176,7 @@ void TQServerSocket::init( const TQHostAddress & address, Q_UINT16 port, int bac connect( d->n, SIGNAL(activated(int)), this, SLOT(incomingConnection(int)) ); } else { - qWarning( "TQServerSocket: failed to bind or listen to the socket" ); + tqWarning( "TQServerSocket: failed to bind or listen to the socket" ); delete d->s; d->s = 0; } diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp index 8e69aa7cc..10cd2173e 100644 --- a/src/network/qsocket.cpp +++ b/src/network/qsocket.cpp @@ -321,7 +321,7 @@ TQSocket::TQSocket( TQObject *parent, const char *name ) TQSocket::~TQSocket() { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): Destroy", name() ); + tqDebug( "TQSocket (%s): Destroy", name() ); #endif if ( state() != Idle ) close(); @@ -411,7 +411,7 @@ TQSocket::State TQSocket::state() const void TQSocket::connectToHost( const TQString &host, Q_UINT16 port ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::connectToHost: host %s, port %d", + tqDebug( "TQSocket (%s)::connectToHost: host %s, port %d", name(), host.ascii(), port ); #endif setSocketIntern( -1 ); @@ -442,7 +442,7 @@ void TQSocket::connectToHost( const TQString &host, Q_UINT16 port ) void TQSocket::tryConnecting() { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::tryConnecting()", name() ); + tqDebug( "TQSocket (%s)::tryConnecting()", name() ); #endif // ### this ifdef isn't correct - addresses() also does /etc/hosts and // numeric-address-as-string handling. @@ -452,7 +452,7 @@ void TQSocket::tryConnecting() d->l4 = d->dns4->addresses(); if ( !d->l4.isEmpty() || !d->dns4->isWorking() ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::tryConnecting: host %s, port %d: " + tqDebug( "TQSocket (%s)::tryConnecting: host %s, port %d: " "%d IPv4 addresses", name(), d->host.ascii(), d->port, d->l4.count() ); #endif @@ -465,7 +465,7 @@ void TQSocket::tryConnecting() d->l6 = d->dns6->addresses(); if ( !d->l6.isEmpty() || !d->dns6->isWorking() ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::tryConnecting: host %s, port %d: " + tqDebug( "TQSocket (%s)::tryConnecting: host %s, port %d: " "%d IPv6 addresses", name(), d->host.ascii(), d->port, d->l6.count() ); #endif @@ -516,7 +516,7 @@ void TQSocket::tryConnecting() } #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::tryConnecting: " + tqDebug( "TQSocket (%s)::tryConnecting: " "Gave up on IP address %s", name(), d->socket->peerAddress().toString().ascii() ); #endif @@ -539,7 +539,7 @@ void TQSocket::tryConnecting() d->setSocketDevice( this, 0 ); stuck = TRUE; #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s)::tryConnecting: Trying IP address %s", + tqDebug( "TQSocket (%s)::tryConnecting: Trying IP address %s", name(), d->addr.toString().ascii() ); #endif } @@ -654,7 +654,7 @@ bool TQSocket::open( int m ) { if ( isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSocket::open: Already open" ); + tqWarning( "TQSocket::open: Already open" ); #endif return FALSE; } @@ -692,7 +692,7 @@ void TQSocket::close() if ( !d->rsn || !d->wsn ) return; #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): close socket", name() ); + tqDebug( "TQSocket (%s): close socket", name() ); #endif if ( d->socket && d->wsize ) { // there's data to be written d->state = Closing; @@ -721,7 +721,7 @@ bool TQSocket::consumeWriteBuf( Q_ULONG nbytes ) if ( nbytes <= 0 || nbytes > d->wsize ) return FALSE; #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): skipWriteBuf %d bytes", name(), (int)nbytes ); + tqDebug( "TQSocket (%s): skipWriteBuf %d bytes", name(), (int)nbytes ); #endif d->wsize -= nbytes; for ( ;; ) { @@ -754,7 +754,7 @@ void TQSocket::flush() int consumed = 0; while ( !osBufferFull && d->state >= Connecting && d->wsize > 0 ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): flush: Write data to the socket", name() ); + tqDebug( "TQSocket (%s): flush: Write data to the socket", name() ); #endif TQByteArray *a = d->wba.first(); int nwritten; @@ -798,14 +798,14 @@ void TQSocket::flush() } if ( consumed > 0 ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): flush: wrote %d bytes, %d left", + tqDebug( "TQSocket (%s): flush: wrote %d bytes, %d left", name(), consumed, (int)d->wsize ); #endif emit bytesWritten( consumed ); } if ( d->state == Closing && d->wsize == 0 ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): flush: Delayed close done. Terminating.", + tqDebug( "TQSocket (%s): flush: Delayed close done. Terminating.", name() ); #endif setFlags( IO_Sequential ); @@ -981,20 +981,20 @@ Q_LONG TQSocket::readBlock( char *data, Q_ULONG maxlen ) { if ( data == 0 && maxlen != 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQSocket::readBlock: Null pointer error" ); + tqWarning( "TQSocket::readBlock: Null pointer error" ); #endif return -1; } if ( !isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSocket::readBlock: Socket is not open" ); + tqWarning( "TQSocket::readBlock: Socket is not open" ); #endif return -1; } if ( maxlen >= d->rba.size() ) maxlen = d->rba.size(); #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): readBlock %d bytes", name(), (int)maxlen ); + tqDebug( "TQSocket (%s): readBlock %d bytes", name(), (int)maxlen ); #endif d->rba.consumeBytes( maxlen, data ); // After we read data from our internal buffer, if we use the @@ -1019,18 +1019,18 @@ Q_LONG TQSocket::writeBlock( const char *data, Q_ULONG len ) { #if defined(QT_CHECK_NULL) if ( data == 0 && len != 0 ) { - qWarning( "TQSocket::writeBlock: Null pointer error" ); + tqWarning( "TQSocket::writeBlock: Null pointer error" ); } #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQSocket::writeBlock: Socket is not open" ); + tqWarning( "TQSocket::writeBlock: Socket is not open" ); return -1; } #endif #if defined(QT_CHECK_STATE) if ( d->state == Closing ) { - qWarning( "TQSocket::writeBlock: Cannot write, socket is closing" ); + tqWarning( "TQSocket::writeBlock: Cannot write, socket is closing" ); } #endif if ( len == 0 || d->state == Closing || d->state == Idle ) @@ -1061,7 +1061,7 @@ Q_LONG TQSocket::writeBlock( const char *data, Q_ULONG len ) else if ( d->wsn ) d->wsn->setEnabled( TRUE ); #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): writeBlock %d bytes", name(), (int)len ); + tqDebug( "TQSocket (%s): writeBlock %d bytes", name(), (int)len ); #endif return len; } @@ -1121,7 +1121,7 @@ int TQSocket::ungetch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQSocket::ungetch: Socket not open" ); + tqWarning( "TQSocket::ungetch: Socket not open" ); return -1; } #endif @@ -1243,7 +1243,7 @@ void TQSocket::sn_read( bool force ) if ( nread == 0 ) { // really closed if ( !d->socket->isOpen() ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): sn_read: Connection closed", name() ); + tqDebug( "TQSocket (%s): sn_read: Connection closed", name() ); #endif d->connectionClosed(); emit connectionClosed(); @@ -1258,7 +1258,7 @@ void TQSocket::sn_read( bool force ) return; } #if defined(TQSOCKET_DEBUG) - qWarning( "TQSocket::sn_read (%s): Close error", name() ); + tqWarning( "TQSocket::sn_read (%s): Close error", name() ); #endif if ( d->rsn ) d->rsn->setEnabled( FALSE ); @@ -1272,7 +1272,7 @@ void TQSocket::sn_read( bool force ) } else { // data to be read #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): sn_read: %ld incoming bytes", name(), nbytes ); + tqDebug( "TQSocket (%s): sn_read: %ld incoming bytes", name(), nbytes ); #endif if ( nbytes > (int)sizeof(buf) ) { // big @@ -1289,7 +1289,7 @@ void TQSocket::sn_read( bool force ) } if ( nread == 0 ) { #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): sn_read: Connection closed", name() ); + tqDebug( "TQSocket (%s): sn_read: Connection closed", name() ); #endif // ### we should rather ask the socket device if it is closed d->connectionClosed(); @@ -1306,7 +1306,7 @@ void TQSocket::sn_read( bool force ) return; } #if defined(QT_CHECK_RANGE) - qWarning( "TQSocket::sn_read: Read error" ); + tqWarning( "TQSocket::sn_read: Read error" ); #endif if ( d->rsn ) d->rsn->setEnabled( FALSE ); @@ -1316,7 +1316,7 @@ void TQSocket::sn_read( bool force ) } if ( nread != (int)a->size() ) { // unexpected #if defined(CHECK_RANGE) && !defined(Q_OS_WIN32) - qWarning( "TQSocket::sn_read: Unexpected short read" ); + tqWarning( "TQSocket::sn_read: Unexpected short read" ); #endif a->resize( nread ); } @@ -1356,7 +1356,7 @@ void TQSocket::tryConnection() if ( d->socket->connect( d->addr, d->port ) ) { d->state = Connected; #if defined(TQSOCKET_DEBUG) - qDebug( "TQSocket (%s): sn_write: Got connection to %s", + tqDebug( "TQSocket (%s): sn_write: Got connection to %s", name(), peerName().ascii() ); #endif if ( d->rsn ) diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp index c09cbb59a..7be3accb1 100644 --- a/src/network/qsocketdevice.cpp +++ b/src/network/qsocketdevice.cpp @@ -163,7 +163,7 @@ TQSocketDevice::TQSocketDevice( int socket, Type type ) d(new TQSocketDevicePrivate(Unknown)) { #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice: Created TQSocketDevice %p (socket %x, type %d)", + tqDebug( "TQSocketDevice: Created TQSocketDevice %p (socket %x, type %d)", this, socket, type ); #endif init(); @@ -186,7 +186,7 @@ TQSocketDevice::TQSocketDevice( Type type ) d(new TQSocketDevicePrivate(IPv4)) { #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice: Created TQSocketDevice object %p, type %d", + tqDebug( "TQSocketDevice: Created TQSocketDevice object %p, type %d", this, type ); #endif init(); @@ -215,7 +215,7 @@ TQSocketDevice::TQSocketDevice( Type type, Protocol protocol, int ) d(new TQSocketDevicePrivate(protocol)) { #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice: Created TQSocketDevice object %p, type %d", + tqDebug( "TQSocketDevice: Created TQSocketDevice object %p, type %d", this, type ); #endif init(); @@ -231,7 +231,7 @@ TQSocketDevice::~TQSocketDevice() delete d; d = 0; #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice: Destroyed TQSocketDevice %p", this ); + tqDebug( "TQSocketDevice: Destroyed TQSocketDevice %p", this ); #endif } @@ -308,7 +308,7 @@ void TQSocketDevice::setSocket( int socket, Type type ) if ( fd != -1 ) // close any open socket close(); #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice::setSocket: socket %x, type %d", socket, type ); + tqDebug( "TQSocketDevice::setSocket: socket %x, type %d", socket, type ); #endif t = type; fd = socket; @@ -335,7 +335,7 @@ bool TQSocketDevice::open( int mode ) if ( isOpen() || !isValid() ) return FALSE; #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice::open: mode %x", mode ); + tqDebug( "TQSocketDevice::open: mode %x", mode ); #endif setMode( mode & IO_ReadWrite ); setState( IO_Open ); diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index a5adfef06..2d359f218 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -224,7 +224,7 @@ void TQSocketDevice::close() setState( 0 ); ::close( fd ); #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice::close: Closed socket %x", fd ); + tqDebug( "TQSocketDevice::close: Closed socket %x", fd ); #endif fd = -1; fetchConnectionParameters(); @@ -268,7 +268,7 @@ bool TQSocketDevice::blocking() const void TQSocketDevice::setBlocking( bool enable ) { #if defined(TQSOCKETDEVICE_DEBUG) - qDebug( "TQSocketDevice::setBlocking( %d )", enable ); + tqDebug( "TQSocketDevice::setBlocking( %d )", enable ); #endif if ( !isValid() ) return; @@ -760,20 +760,20 @@ Q_LONG TQSocketDevice::readBlock( char *data, Q_ULONG maxlen ) { #if defined(QT_CHECK_NULL) if ( data == 0 && maxlen != 0 ) { - qWarning( "TQSocketDevice::readBlock: Null pointer error" ); + tqWarning( "TQSocketDevice::readBlock: Null pointer error" ); } #endif #if defined(QT_CHECK_STATE) if ( !isValid() ) { - qWarning( "TQSocketDevice::readBlock: Invalid socket" ); + tqWarning( "TQSocketDevice::readBlock: Invalid socket" ); return -1; } if ( !isOpen() ) { - qWarning( "TQSocketDevice::readBlock: Device is not open" ); + tqWarning( "TQSocketDevice::readBlock: Device is not open" ); return -1; } if ( !isReadable() ) { - qWarning( "TQSocketDevice::readBlock: Read operation not permitted" ); + tqWarning( "TQSocketDevice::readBlock: Read operation not permitted" ); return -1; } #endif @@ -851,25 +851,25 @@ Q_LONG TQSocketDevice::writeBlock( const char *data, Q_ULONG len ) { if ( data == 0 && len != 0 ) { #if defined(QT_CHECK_NULL) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::writeBlock: Null pointer error" ); + tqWarning( "TQSocketDevice::writeBlock: Null pointer error" ); #endif return -1; } if ( !isValid() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::writeBlock: Invalid socket" ); + tqWarning( "TQSocketDevice::writeBlock: Invalid socket" ); #endif return -1; } if ( !isOpen() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::writeBlock: Device is not open" ); + tqWarning( "TQSocketDevice::writeBlock: Device is not open" ); #endif return -1; } if ( !isWritable() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::writeBlock: Write operation not permitted" ); + tqWarning( "TQSocketDevice::writeBlock: Write operation not permitted" ); #endif return -1; } @@ -939,32 +939,32 @@ Q_LONG TQSocketDevice::writeBlock( const char * data, Q_ULONG len, { if ( t != Datagram ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::sendBlock: Not datagram" ); + tqWarning( "TQSocketDevice::sendBlock: Not datagram" ); #endif return -1; // for now - later we can do t/tcp } if ( data == 0 && len != 0 ) { #if defined(QT_CHECK_NULL) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::sendBlock: Null pointer error" ); + tqWarning( "TQSocketDevice::sendBlock: Null pointer error" ); #endif return -1; } if ( !isValid() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::sendBlock: Invalid socket" ); + tqWarning( "TQSocketDevice::sendBlock: Invalid socket" ); #endif return -1; } if ( !isOpen() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::sendBlock: Device is not open" ); + tqWarning( "TQSocketDevice::sendBlock: Device is not open" ); #endif return -1; } if ( !isWritable() ) { #if defined(QT_CHECK_STATE) || defined(TQSOCKETDEVICE_DEBUG) - qWarning( "TQSocketDevice::sendBlock: Write operation not permitted" ); + tqWarning( "TQSocketDevice::sendBlock: Write operation not permitted" ); #endif return -1; } diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h index 7388c41ed..0ebe5a6b3 100644 --- a/src/opengl/ntqgl.h +++ b/src/opengl/ntqgl.h @@ -56,7 +56,7 @@ #define TQGL_VERSION 450 #define TQGL_VERSION_STR "4.5" TQM_EXPORT_OPENGL inline const char *qGLVersion() { - qObsolete( 0, "qGLVersion", "qVersion" ); + tqObsolete( 0, "qGLVersion", "qVersion" ); return TQGL_VERSION_STR; } #endif diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 95cbae5d7..d8f8914c4 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -159,7 +159,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format; if ( !w->format().stereo() ) { // ok, goggles off if ( !w->format().hasOverlay() ) { - qFatal( "Cool hardware required" ); + tqFatal( "Cool hardware required" ); } } \endcode @@ -211,9 +211,9 @@ TQGLFormat::TQGLFormat() : TQGLWidget( TQGLFormat( StencilBuffer | AlphaChannel ), parent, name ) { if ( !format().stencil() ) - qWarning( "Could not get stencil buffer; results will be suboptimal" ); + tqWarning( "Could not get stencil buffer; results will be suboptimal" ); if ( !format().alphaChannel() ) - qWarning( "Could not get alpha channel; results will be suboptimal" ); + tqWarning( "Could not get alpha channel; results will be suboptimal" ); ... } \endcode @@ -877,7 +877,7 @@ void TQGLContext::setDevice( TQPaintDevice *pDev ) if ( d->paintDevice && (d->paintDevice->devType() != TQInternal::Widget && d->paintDevice->devType() != TQInternal::Pixmap) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQGLContext: Unsupported paint device type" ); + tqWarning( "TQGLContext: Unsupported paint device type" ); #endif } } diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 8989a05b4..a738aa486 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -135,7 +135,7 @@ bool qt_resolve_gl_symbols(bool fatal) if (!qt_glCallLists) { // if this fails the rest will surely fail if (fatal) - qFatal("Unable to resolve GL/GLX symbols - please check your GL library installation."); + tqFatal("Unable to resolve GL/GLX symbols - please check your GL library installation."); return FALSE; } @@ -241,7 +241,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) const char *v = glXQueryServerString( dpy, vi->screen, GLX_VERSION ); if ( v ) mesa_gl = strstr(v,"Mesa") != 0; - qAddPostRoutine( cleanup_cmaps ); + tqAddPostRoutine( cleanup_cmaps ); } CMapEntry *x = cmap_dict->find( (long) vi->visualid + ( vi->screen * 256 ) ); @@ -253,11 +253,11 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) XStandardColormap *c; int n, i; - // qDebug( "Choosing cmap for vID %0x", vi->visualid ); + // tqDebug( "Choosing cmap for vID %0x", vi->visualid ); if ( vi->visualid == XVisualIDFromVisual( (Visual*)TQPaintDevice::x11AppVisual( vi->screen ) ) ) { - // qDebug( "Using x11AppColormap" ); + // tqDebug( "Using x11AppColormap" ); return TQPaintDevice::x11AppColormap( vi->screen ); } @@ -271,7 +271,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) if ( c[i].visualid == vi->visual->visualid ) { x->cmap = c[i].colormap; x->scmap = c[i]; - //qDebug( "Using HP_RGB scmap" ); + //tqDebug( "Using HP_RGB scmap" ); } i++; @@ -288,7 +288,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) _XmuLookupStandardColormap qt_XmuLookupStandardColormap; qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) TQLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap"); if (!qt_XmuLookupStandardColormap) - qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation."); + tqFatal("Unable to resolve Xmu symbols - please check your Xmu library installation."); #define XmuLookupStandardColormap qt_XmuLookupStandardColormap #endif @@ -302,7 +302,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) if ( c[i].visualid == vi->visualid ) { x->cmap = c[i].colormap; x->scmap = c[i]; - //qDebug( "Using RGB_DEFAULT scmap" ); + //tqDebug( "Using RGB_DEFAULT scmap" ); } i++; } @@ -315,7 +315,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) x->cmap = XCreateColormap( dpy, RootWindow(dpy,vi->screen), vi->visual, AllocNone ); x->alloc = TRUE; - // qDebug( "Allocating cmap" ); + // tqDebug( "Allocating cmap" ); } // associate cmap with visualid @@ -399,7 +399,7 @@ bool TQGLFormat::hasOpenGL() { if (!qt_resolve_gl_symbols(FALSE)) return FALSE; - return glXQueryExtension(qt_xdisplay(),0,0) != 0; + return glXQueryExtension(tqt_xdisplay(),0,0) != 0; } @@ -466,7 +466,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext ) if ( shareContext && ( !shareContext->isValid() || !shareContext->cx ) ) { #if defined(QT_CHECK_NULL) - qWarning("TQGLContext::chooseContext(): Cannot share with invalid context"); + tqWarning("TQGLContext::chooseContext(): Cannot share with invalid context"); #endif shareContext = 0; } @@ -703,7 +703,7 @@ void TQGLContext::makeCurrent() { if ( !d->valid ) { #if defined(QT_CHECK_STATE) - qWarning("TQGLContext::makeCurrent(): Cannot make invalid context current."); + tqWarning("TQGLContext::makeCurrent(): Cannot make invalid context current."); #endif return; } @@ -718,9 +718,9 @@ void TQGLContext::makeCurrent() ((TQWidget *)d->paintDevice)->winId(), (GLXContext)cx ); #if defined(QT_CHECK_NULL) - // qDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid ); + // tqDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid ); if ( !ok ) - qWarning("TQGLContext::makeCurrent(): Failed."); + tqWarning("TQGLContext::makeCurrent(): Failed."); #endif if ( ok ) currentCtx = this; @@ -881,13 +881,13 @@ void qgl_use_font(TQFontEngineXft *engine, int first, int count, int listBase) err = FT_Load_Glyph(face, FT_Get_Char_Index(face, i), FT_LOAD_DEFAULT); if (err) { - qDebug("failed loading glyph %d from font", i); + tqDebug("failed loading glyph %d from font", i); Q_ASSERT(!err); } err = FT_Render_Glyph(face->glyph, (antialiased ? ft_render_mode_normal : ft_render_mode_mono)); if (err) { - qDebug("failed rendering glyph %d from font", i); + tqDebug("failed rendering glyph %d from font", i); Q_ASSERT(!err); } @@ -1011,7 +1011,7 @@ void TQGLOverlayWidget::initializeGL() if ( transparentColor.isValid() ) qglClearColor( transparentColor ); else - qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" ); + tqWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" ); realWidget->initializeOverlayGL(); } @@ -1128,13 +1128,13 @@ void TQGLWidget::setContext( TQGLContext *context, { if ( context == 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGLWidget::setContext: Cannot set null context" ); + tqWarning( "TQGLWidget::setContext: Cannot set null context" ); #endif return; } if ( !context->deviceIsPixmap() && context->device() != this ) { #if defined(QT_CHECK_STATE) - qWarning( "TQGLWidget::setContext: Context must refer to this widget" ); + tqWarning( "TQGLWidget::setContext: Context must refer to this widget" ); #endif return; } @@ -1333,7 +1333,7 @@ void TQGLWidget::setColormap( const TQGLColormap & c ) return; if ( !cmap.d->cmapHandle && !qCanAllocColors( this ) ) { - qWarning( "TQGLWidget::setColormap: Cannot create a read/write " + tqWarning( "TQGLWidget::setColormap: Cannot create a read/write " "colormap for this visual" ); return; } diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp index d095a754c..541e309d6 100644 --- a/src/opengl/qglcolormap.cpp +++ b/src/opengl/qglcolormap.cpp @@ -173,7 +173,7 @@ void TQGLColormap::setEntry( int idx, TQRgb color ) #if defined(QT_CHECK_RANGE) if ( idx < 0 || idx > (int) d->cells.size() ) { - qWarning( "TQGLColormap::setRgb: Index out of range." ); + tqWarning( "TQGLColormap::setRgb: Index out of range." ); return; } #endif diff --git a/src/sql/drivers/ibase/qsql_ibase.cpp b/src/sql/drivers/ibase/qsql_ibase.cpp index f6aff5dbb..59d9f89a5 100644 --- a/src/sql/drivers/ibase/qsql_ibase.cpp +++ b/src/sql/drivers/ibase/qsql_ibase.cpp @@ -411,7 +411,7 @@ TQIBaseResult::~TQIBaseResult() bool TQIBaseResult::prepare(const TQString& query) { - //qDebug("prepare: %s", query.ascii()); + //tqDebug("prepare: %s", query.ascii()); if (!driver() || !driver()->isOpen() || driver()->isOpenError()) return FALSE; d->cleanup(); @@ -471,7 +471,7 @@ bool TQIBaseResult::exec() if (d->inda && extension()->index.count() > 0) { TQMap<int, TQString>::ConstIterator it; if ((int)extension()->index.count() > d->inda->sqld) { - qWarning("TQIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count()); + tqWarning("TQIBaseResult::exec: Parameter mismatch, expected %d, got %d parameters", d->inda->sqld, extension()->index.count()); return FALSE; } int para = 0; @@ -560,7 +560,7 @@ bool TQIBaseResult::exec() bool TQIBaseResult::reset (const TQString& query) { -// qDebug("reset: %s", query.ascii()); +// tqDebug("reset: %s", query.ascii()); if (!driver() || !driver()->isOpen() || driver()->isOpenError()) return FALSE; d->cleanup(); diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp index d34e58500..aca83545f 100644 --- a/src/sql/drivers/mysql/qsql_mysql.cpp +++ b/src/sql/drivers/mysql/qsql_mysql.cpp @@ -53,7 +53,7 @@ # define Q_NO_MYSQL_EMBEDDED #endif -TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); +TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); static int qMySqlConnectionCount = 0; static bool qMySqlInitHandledByUser = FALSE; @@ -237,7 +237,7 @@ bool TQMYSQLResult::fetchFirst() TQVariant TQMYSQLResult::data( int field ) { if ( !isSelect() || field >= (int) d->fieldTypes.count() ) { - qWarning( "TQMYSQLResult::data: column %d out of range", field ); + tqWarning( "TQMYSQLResult::data: column %d out of range", field ); return TQVariant(); } @@ -284,7 +284,7 @@ TQVariant TQMYSQLResult::data( int field ) return TQVariant( val ); } #ifdef QT_CHECK_RANGE - qWarning("TQMYSQLResult::data: unknown data type"); + tqWarning("TQMYSQLResult::data: unknown data type"); #endif return TQVariant(); } @@ -368,7 +368,7 @@ static void qServerInit() // but is vital for the embedded lib if ( mysql_server_init( 0, 0, 0 ) ) { # ifdef QT_CHECK_RANGE - qWarning( "TQMYSQLDriver::qServerInit: unable to start server." ); + tqWarning( "TQMYSQLDriver::qServerInit: unable to start server." ); # endif } @@ -404,7 +404,7 @@ TQMYSQLDriver::TQMYSQLDriver( MYSQL * con, TQObject * parent, const char * name void TQMYSQLDriver::init() { - qSqlOpenExtDict()->insert( this, new TQMYSQLOpenExtension(this) ); + tqSqlOpenExtDict()->insert( this, new TQMYSQLOpenExtension(this) ); d = new TQMYSQLDriverPrivate(); d->mysql = 0; qMySqlConnectionCount++; @@ -417,8 +417,8 @@ TQMYSQLDriver::~TQMYSQLDriver() qServerEnd(); delete d; - if ( !qSqlOpenExtDict()->isEmpty() ) { - TQSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + if ( !tqSqlOpenExtDict()->isEmpty() ) { + TQSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this ); delete ext; } } @@ -452,7 +452,7 @@ bool TQMYSQLDriver::open( const TQString&, const TQString&, int ) { - qWarning("TQMYSQLDriver::open(): This version of open() is no longer supported." ); + tqWarning("TQMYSQLDriver::open(): This version of open() is no longer supported." ); return FALSE; } @@ -482,7 +482,7 @@ bool TQMYSQLDriver::open( const TQString& db, if ( val == "TRUE" || val == "1" ) opts << tmp.left( idx ); else - qWarning( "TQMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() ); + tqWarning( "TQMYSQLDriver::open: Illegal connect option value '%s'", tmp.latin1() ); } else { opts << tmp; } @@ -505,7 +505,7 @@ bool TQMYSQLDriver::open( const TQString& db, else if ( opt == "CLIENT_SSL" ) optionFlags |= CLIENT_SSL; else - qWarning( "TQMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() ); + tqWarning( "TQMYSQLDriver::open: Unknown connect option '%s'", (*it).latin1() ); } if ( (d->mysql = mysql_init((MYSQL*) 0)) && @@ -696,7 +696,7 @@ bool TQMYSQLDriver::beginTransaction() #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQMYSQLDriver::beginTransaction: Database not open" ); + tqWarning( "TQMYSQLDriver::beginTransaction: Database not open" ); #endif return FALSE; } @@ -714,7 +714,7 @@ bool TQMYSQLDriver::commitTransaction() #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQMYSQLDriver::commitTransaction: Database not open" ); + tqWarning( "TQMYSQLDriver::commitTransaction: Database not open" ); #endif return FALSE; } @@ -732,7 +732,7 @@ bool TQMYSQLDriver::rollbackTransaction() #endif if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQMYSQLDriver::rollbackTransaction: Database not open" ); + tqWarning( "TQMYSQLDriver::rollbackTransaction: Database not open" ); #endif return FALSE; } diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp index 2a387f516..f1c9e8da7 100644 --- a/src/sql/drivers/odbc/qsql_odbc.cpp +++ b/src/sql/drivers/odbc/qsql_odbc.cpp @@ -127,7 +127,7 @@ public: TQODBCResult * result; }; -TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); +TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); class TQODBCOpenExtension : public TQSqlOpenExtension { @@ -190,7 +190,7 @@ static TQString qODBCWarn( const TQODBCPrivate* odbc) static void qSqlWarning( const TQString& message, const TQODBCPrivate* odbc ) { #ifdef QT_CHECK_RANGE - qWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() ); + tqWarning( "%s\tError: %s", message.local8Bit().data(), qODBCWarn( odbc ).local8Bit().data() ); #endif } @@ -309,7 +309,7 @@ static TQString qGetStringData( SQLHANDLE hStmt, int column, int colSize, bool& break; } else { #ifdef QT_CHECK_RANGE - qWarning( "qGetStringData: Error while fetching data (%d)", r ); + tqWarning( "qGetStringData: Error while fetching data (%d)", r ); #endif fieldVal = TQString::null; break; @@ -341,7 +341,7 @@ static TQByteArray qGetBinaryData( SQLHANDLE hStmt, int column, TQSQLLEN& length &nullable ); #ifdef QT_CHECK_RANGE if ( r != SQL_SUCCESS ) - qWarning( "qGetBinaryData: Unable to describe column %d", column ); + tqWarning( "qGetBinaryData: Unable to describe column %d", column ); #endif // SQLDescribeCol may return 0 if size cannot be determined if (!colSize) { @@ -524,7 +524,7 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) if ( (idx = tmp.find( '=' )) != -1 ) connMap[ tmp.left( idx ) ] = tmp.mid( idx + 1 ).simplifyWhiteSpace(); else - qWarning( "TQODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() ); + tqWarning( "TQODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() ); } if ( connMap.count() ) { TQMap<TQString, TQString>::ConstIterator it; @@ -540,7 +540,7 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) } else if ( val == "SQL_MODE_READ_WRITE" ) { v = SQL_MODE_READ_WRITE; } else { - qWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); + tqWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); break; } r = SQLSetConnectAttr( hDbc, SQL_ATTR_ACCESS_MODE, (SQLPOINTER) v, 0 ); @@ -565,7 +565,7 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) } else if ( val == "SQL_FALSE" ) { v = SQL_FALSE; } else { - qWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); + tqWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); break; } r = SQLSetConnectAttr( hDbc, SQL_ATTR_METADATA_ID, (SQLPOINTER) v, 0 ); @@ -587,14 +587,14 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) } else if ( val == "SQL_OPT_TRACE_ON" ) { v = SQL_OPT_TRACE_ON; } else { - qWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); + tqWarning( TQString( "TQODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); break; } r = SQLSetConnectAttr( hDbc, SQL_ATTR_TRACE, (SQLPOINTER) v, 0 ); } #ifdef QT_CHECK_RANGE else { - qWarning( TQString("TQODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) ); + tqWarning( TQString("TQODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) ); } #endif if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { @@ -860,7 +860,7 @@ bool TQODBCResult::fetchLast() TQVariant TQODBCResult::data( int field ) { if ( field >= (int) d->rInf.count() ) { - qWarning( "TQODBCResult::data: column %d out of range", field ); + tqWarning( "TQODBCResult::data: column %d out of range", field ); return TQVariant(); } if ( fieldCache.contains( field ) ) @@ -1230,7 +1230,7 @@ bool TQODBCResult::exec() para++; if ( r != SQL_SUCCESS ) { #ifdef QT_CHECK_RANGE - qWarning( "TQODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() ); + tqWarning( "TQODBCResult::exec: unable to bind variable: %s", qODBCWarn( d ).local8Bit().data() ); #endif setLastError( qMakeError( "Unable to bind variable", TQSqlError::Statement, d ) ); return FALSE; @@ -1240,7 +1240,7 @@ bool TQODBCResult::exec() r = SQLExecute( d->hStmt ); if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { #ifdef QT_CHECK_RANGE - qWarning( "TQODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() ); + tqWarning( "TQODBCResult::exec: Unable to execute statement: %s", qODBCWarn( d ).local8Bit().data() ); #endif setLastError( qMakeError( "Unable to execute statement", TQSqlError::Statement, d ) ); return FALSE; @@ -1345,7 +1345,7 @@ TQODBCDriver::TQODBCDriver( SQLHANDLE env, SQLHANDLE con, TQObject * parent, con void TQODBCDriver::init() { - qSqlOpenExtDict()->insert( this, new TQODBCOpenExtension(this) ); + tqSqlOpenExtDict()->insert( this, new TQODBCOpenExtension(this) ); d = new TQODBCPrivate(); } @@ -1353,8 +1353,8 @@ TQODBCDriver::~TQODBCDriver() { cleanup(); delete d; - if ( !qSqlOpenExtDict()->isEmpty() ) { - TQSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + if ( !tqSqlOpenExtDict()->isEmpty() ) { + TQSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this ); delete ext; } } @@ -1398,7 +1398,7 @@ bool TQODBCDriver::open( const TQString&, const TQString&, int ) { - qWarning("TQODBCDriver::open(): This version of open() is no longer supported." ); + tqWarning("TQODBCDriver::open(): This version of open() is no longer supported." ); return FALSE; } @@ -1603,7 +1603,7 @@ bool TQODBCPrivate::checkDriver() const #endif if ( sup == SQL_FALSE ) { #ifdef QT_CHECK_RANGE - qWarning ( "TQODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). " + tqWarning ( "TQODBCDriver::open: Warning - Driver doesn't support all needed functionality (%d). " "Please look at the TQt SQL Module Driver documentation for more information.", reqFunc[ i ] ); #endif return FALSE; @@ -1623,7 +1623,7 @@ bool TQODBCPrivate::checkDriver() const #endif if ( sup == SQL_FALSE ) { #ifdef QT_CHECK_RANGE - qWarning( "TQODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] ); + tqWarning( "TQODBCDriver::checkDriver: Warning - Driver doesn't support some non-critical functions (%d)", optFunc[ i ] ); #endif return TRUE; } @@ -1656,7 +1656,7 @@ bool TQODBCDriver::beginTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning(" TQODBCDriver::beginTransaction: Database not open" ); + tqWarning(" TQODBCDriver::beginTransaction: Database not open" ); #endif return FALSE; } @@ -1676,7 +1676,7 @@ bool TQODBCDriver::commitTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning(" TQODBCDriver::commitTransaction: Database not open" ); + tqWarning(" TQODBCDriver::commitTransaction: Database not open" ); #endif return FALSE; } @@ -1694,7 +1694,7 @@ bool TQODBCDriver::rollbackTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning(" TQODBCDriver::rollbackTransaction: Database not open" ); + tqWarning(" TQODBCDriver::rollbackTransaction: Database not open" ); #endif return FALSE; } diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp index b039a2474..033c69f35 100644 --- a/src/sql/drivers/psql/qsql_psql.cpp +++ b/src/sql/drivers/psql/qsql_psql.cpp @@ -64,8 +64,8 @@ # undef open #endif -TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict(); -TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); +TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict(); +TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); class TQPSQLPrivate { @@ -272,7 +272,7 @@ static TQPoint pointFromString( const TQString& s) TQVariant TQPSQLResult::data( int i ) { if ( i >= PQnfields( d->result ) ) { - qWarning( "TQPSQLResult::data: column %d out of range", i ); + tqWarning( "TQPSQLResult::data: column %d out of range", i ); return TQVariant(); } int ptype = PQftype( d->result, i ); @@ -395,7 +395,7 @@ TQVariant TQPSQLResult::data( int i ) int fd = lo_open( d->connection, oid, INV_READ ); #ifdef QT_CHECK_RANGE if ( fd < 0) { - qWarning( "TQPSQLResult::data: unable to open large object for read" ); + tqWarning( "TQPSQLResult::data: unable to open large object for read" ); ((TQSqlDriver*)driver())->commitTransaction(); return TQVariant( ba ); } @@ -429,7 +429,7 @@ TQVariant TQPSQLResult::data( int i ) #endif if (retval < 0) { - qWarning( "TQPSQLResult::data: unable to read large object" ); + tqWarning( "TQPSQLResult::data: unable to read large object" ); } else { ba.duplicate( buf, size ); } @@ -441,7 +441,7 @@ TQVariant TQPSQLResult::data( int i ) default: case TQVariant::Invalid: #ifdef QT_CHECK_RANGE - qWarning("TQPSQLResult::data: unknown data type"); + tqWarning("TQPSQLResult::data: unknown data type"); #endif ; } @@ -512,7 +512,7 @@ static void setDatestyle( PGconn* connection ) #ifdef QT_CHECK_RANGE int status = PQresultStatus( result ); if ( status != PGRES_COMMAND_OK ) - qWarning( "%s", PQerrorMessage( connection ) ); + tqWarning( "%s", PQerrorMessage( connection ) ); #endif PQclear( result ); } @@ -531,7 +531,7 @@ static TQPSQLDriver::Protocol getPSQLVersion( PGconn* connection ) int vMin = rx.cap( 2 ).toInt(); if ( vMaj < 6 ) { #ifdef QT_CHECK_RANGE - qWarning( "This version of PostgreSQL is not supported and may not work." ); + tqWarning( "This version of PostgreSQL is not supported and may not work." ); #endif return TQPSQLDriver::Version6; } @@ -547,7 +547,7 @@ static TQPSQLDriver::Protocol getPSQLVersion( PGconn* connection ) } } else { #ifdef QT_CHECK_RANGE - qWarning( "This version of PostgreSQL is not supported and may not work." ); + tqWarning( "This version of PostgreSQL is not supported and may not work." ); #endif } @@ -574,8 +574,8 @@ TQPSQLDriver::TQPSQLDriver( PGconn * conn, TQObject * parent, const char * name void TQPSQLDriver::init() { - qSqlDriverExtDict()->insert( this, new TQPSQLDriverExtension(this) ); - qSqlOpenExtDict()->insert( this, new TQPSQLOpenExtension(this) ); + tqSqlDriverExtDict()->insert( this, new TQPSQLDriverExtension(this) ); + tqSqlOpenExtDict()->insert( this, new TQPSQLOpenExtension(this) ); d = new TQPSQLPrivate(); } @@ -585,12 +585,12 @@ TQPSQLDriver::~TQPSQLDriver() if ( d->connection ) PQfinish( d->connection ); delete d; - if ( !qSqlDriverExtDict()->isEmpty() ) { - TQSqlDriverExtension *ext = qSqlDriverExtDict()->take( this ); + if ( !tqSqlDriverExtDict()->isEmpty() ) { + TQSqlDriverExtension *ext = tqSqlDriverExtDict()->take( this ); delete ext; } - if ( !qSqlOpenExtDict()->isEmpty() ) { - TQSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + if ( !tqSqlOpenExtDict()->isEmpty() ) { + TQSqlOpenExtension *ext = tqSqlOpenExtDict()->take( this ); delete ext; } } @@ -623,7 +623,7 @@ bool TQPSQLDriver::open( const TQString&, const TQString&, int ) { - qWarning("TQPSQLDriver::open(): This version of open() is no longer supported." ); + tqWarning("TQPSQLDriver::open(): This version of open() is no longer supported." ); return FALSE; } @@ -688,7 +688,7 @@ bool TQPSQLDriver::beginTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQPSQLDriver::beginTransaction: Database not open" ); + tqWarning( "TQPSQLDriver::beginTransaction: Database not open" ); #endif return FALSE; } @@ -706,7 +706,7 @@ bool TQPSQLDriver::commitTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQPSQLDriver::commitTransaction: Database not open" ); + tqWarning( "TQPSQLDriver::commitTransaction: Database not open" ); #endif return FALSE; } @@ -724,7 +724,7 @@ bool TQPSQLDriver::rollbackTransaction() { if ( !isOpen() ) { #ifdef QT_CHECK_RANGE - qWarning( "TQPSQLDriver::rollbackTransaction: Database not open" ); + tqWarning( "TQPSQLDriver::rollbackTransaction: Database not open" ); #endif return FALSE; } diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index f300c43e5..3fbdc3260 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -112,10 +112,10 @@ public: #ifdef QT_DEBUG_DATATABLE void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) { - qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); - qDebug(msg); + tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + tqDebug(msg); for ( uint j = 0; j < cursor->count(); ++j ) { - qDebug(cursor->field(j)->name() + " type:" + TQString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() ); + tqDebug(cursor->field(j)->name() + " type:" + TQString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString() ); } } #endif @@ -1047,7 +1047,7 @@ bool TQDataTable::insertCurrent() return FALSE; if ( !sqlCursor()->canInsert() ) { #ifdef QT_CHECK_RANGE - qWarning("TQDataTable::insertCurrent: insert not allowed for %s", + tqWarning("TQDataTable::insertCurrent: insert not allowed for %s", sqlCursor()->name().latin1() ); #endif endInsert(); @@ -1121,7 +1121,7 @@ bool TQDataTable::updateCurrent() return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("TQDataTable::updateCurrent: no primary index for %s", + tqWarning("TQDataTable::updateCurrent: no primary index for %s", sqlCursor()->name().latin1() ); #endif endUpdate(); @@ -1129,7 +1129,7 @@ bool TQDataTable::updateCurrent() } if ( !sqlCursor()->canUpdate() ) { #ifdef QT_CHECK_RANGE - qWarning("TQDataTable::updateCurrent: updates not allowed for %s", + tqWarning("TQDataTable::updateCurrent: updates not allowed for %s", sqlCursor()->name().latin1() ); #endif endUpdate(); @@ -1195,7 +1195,7 @@ bool TQDataTable::deleteCurrent() return FALSE; if ( sqlCursor()->primaryIndex().count() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("TQDataTable::deleteCurrent: no primary index %s", + tqWarning("TQDataTable::deleteCurrent: no primary index %s", sqlCursor()->name().latin1() ); #endif return FALSE; diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp index 3ddd2c9e0..b2a53dbdd 100644 --- a/src/sql/qsqlcursor.cpp +++ b/src/sql/qsqlcursor.cpp @@ -400,7 +400,7 @@ void TQSqlCursor::setName( const TQString& name, bool autopopulate ) } #ifdef QT_CHECK_RANGE if ( isEmpty() ) - qWarning("TQSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() ); + tqWarning("TQSqlCursor::setName: unable to build record, does '%s' exist?", name.latin1() ); #endif } } @@ -1533,7 +1533,7 @@ bool TQSqlCursor::isNull( const TQString& name ) const void TQSqlCursor::setValue( int i, const TQVariant& val ) { #ifdef QT_DEBUG - qDebug("TQSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete()."); + tqDebug("TQSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete()."); #endif TQSqlRecord::setValue( i, val ); } @@ -1542,7 +1542,7 @@ void TQSqlCursor::setValue( int i, const TQVariant& val ) void TQSqlCursor::setValue( const TQString& name, const TQVariant& val ) { #ifdef QT_DEBUG - qDebug("TQSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete()."); + tqDebug("TQSqlCursor::setValue(): This will not affect actual database values. Use primeInsert(), primeUpdate() or primeDelete()."); #endif TQSqlRecord::setValue( name, val ); } diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 582219b49..be51271b3 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -92,7 +92,7 @@ TQPtrDict<TQSqlOpenExtension> *qt_open_extension_dict = 0; static TQSingleCleanupHandler< TQPtrDict<TQSqlDriverExtension> > qt_driver_ext_cleanup; static TQSingleCleanupHandler< TQPtrDict<TQSqlOpenExtension> > qt_open_ext_cleanup; -Q_EXPORT TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict() +Q_EXPORT TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict() { if ( !qt_driver_extension_dict ) { qt_driver_extension_dict = new TQPtrDict<TQSqlDriverExtension>; @@ -101,7 +101,7 @@ Q_EXPORT TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict() return qt_driver_extension_dict; } -Q_EXPORT TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict() +Q_EXPORT TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict() { if ( !qt_open_extension_dict ) { qt_open_extension_dict = new TQPtrDict<TQSqlOpenExtension>; @@ -212,7 +212,7 @@ TQSqlDatabaseManager* TQSqlDatabaseManager::instance() static TQGuardedPtr<TQSqlDatabaseManager> sqlConnection = 0; if ( !sqlConnection ) { if( tqApp == 0 ){ - qFatal( "TQSqlDatabaseManager: A TQApplication object has to be " + tqFatal( "TQSqlDatabaseManager: A TQApplication object has to be " "instantiated in order to use the SQL module." ); return 0; } @@ -238,7 +238,7 @@ TQSqlDatabase* TQSqlDatabaseManager::database( const TQString& name, bool open ) db->open(); #ifdef QT_CHECK_RANGE if ( !db->isOpen() ) - qWarning("TQSqlDatabaseManager::database: unable to open database: %s: %s", + tqWarning("TQSqlDatabaseManager::database: unable to open database: %s: %s", db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() ); #endif } @@ -690,8 +690,8 @@ void TQSqlDatabase::init( const TQString& type, const TQString& ) if ( !d->driver ) { #ifdef QT_CHECK_RANGE - qWarning( "TQSqlDatabase: %s driver not loaded", type.latin1() ); - qWarning( "TQSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); + tqWarning( "TQSqlDatabase: %s driver not loaded", type.latin1() ); + tqWarning( "TQSqlDatabase: available drivers: %s", drivers().join(" ").latin1() ); #endif d->driver = new TQNullDriver(); d->driver->setLastError( TQSqlError( "Driver not loaded", "Driver not loaded" ) ); diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp index 3bce7ee43..f4798c9af 100644 --- a/src/sql/qsqldriver.cpp +++ b/src/sql/qsqldriver.cpp @@ -50,8 +50,8 @@ #define DBState_OpenError 0x0002 // ### This needs to go in 4.0! -TQPtrDict<TQSqlDriverExtension> *qSqlDriverExtDict(); -TQPtrDict<TQSqlOpenExtension> *qSqlOpenExtDict(); +TQPtrDict<TQSqlDriverExtension> *tqSqlDriverExtDict(); +TQPtrDict<TQSqlOpenExtension> *tqSqlOpenExtDict(); /*! \class TQSqlDriver ntqsqldriver.h @@ -132,8 +132,8 @@ TQSqlDriver::~TQSqlDriver() bool TQSqlDriver::isOpen() const { - if ( !qSqlDriverExtDict()->isEmpty() ) { - TQSqlDriverExtension *ext = qSqlDriverExtDict()->find( (TQSqlDriver *) this ); + if ( !tqSqlDriverExtDict()->isEmpty() ) { + TQSqlDriverExtension *ext = tqSqlDriverExtDict()->find( (TQSqlDriver *) this ); if ( ext ) return ext->isOpen(); } @@ -498,8 +498,8 @@ bool TQSqlDriver::open( const TQString& db, int port, const TQString& connOpts ) { - if ( !qSqlOpenExtDict()->isEmpty() ) { - TQSqlOpenExtension *ext = qSqlOpenExtDict()->find( (TQSqlDriver *) this ); + if ( !tqSqlOpenExtDict()->isEmpty() ) { + TQSqlOpenExtension *ext = tqSqlOpenExtDict()->find( (TQSqlDriver *) this ); if ( ext ) return ext->open( db, user, password, host, port, connOpts ); } diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp index ca7edc3d5..0dec46790 100644 --- a/src/sql/qsqlfield.cpp +++ b/src/sql/qsqlfield.cpp @@ -193,7 +193,7 @@ void TQSqlField::setValue( const TQVariant& value ) return; if ( value.type() != d->type ) { if ( !val.canCast( d->type ) ) - qWarning("TQSqlField::setValue: %s cannot cast from %s to %s", + tqWarning("TQSqlField::setValue: %s cannot cast from %s to %s", nm.local8Bit().data(), value.typeName(), TQVariant::typeToName( d->type ) ); } val = value; diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp index d0df39788..6f69ae27d 100644 --- a/src/sql/qsqlindex.cpp +++ b/src/sql/qsqlindex.cpp @@ -277,7 +277,7 @@ TQSqlIndex TQSqlIndex::fromStringList( const TQStringList& l, const TQSqlCursor* if ( field ) newSort.append( *field, desc ); else - qWarning( "TQSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); + tqWarning( "TQSqlIndex::fromStringList: unknown field: '%s'", f.latin1()); } return newSort; } diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp index c7c3ec3c5..563406772 100644 --- a/src/sql/qsqlmanager_p.cpp +++ b/src/sql/qsqlmanager_p.cpp @@ -307,10 +307,10 @@ static int compare_recs( const TQSqlRecord* buf1, const TQSqlRecord* buf2, #ifdef QT_DEBUG_DATAMANAGER static void debug_datamanager_buffer( const TQString& msg, TQSqlRecord* cursor ) { - qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); - qDebug( "%s", msg.latin1() ); + tqDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); + tqDebug( "%s", msg.latin1() ); for ( uint j = 0; j < cursor->count(); ++j ) { - qDebug( "%s", (cursor->field(j)->name() + " type:" + tqDebug( "%s", (cursor->field(j)->name() + " type:" + TQString(cursor->field(j)->value().typeName()) + " value:" + cursor->field(j)->value().toString()) .latin1() ); @@ -348,7 +348,7 @@ update. For example: bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) { #ifdef QT_DEBUG_DATAMANAGER - qDebug("TQSqlCursorManager::findBuffer:"); + tqDebug("TQSqlCursorManager::findBuffer:"); #endif TQSqlCursor* cur = cursor(); if ( !cur ) @@ -363,7 +363,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) TQSqlRecord* buf = cur->editBuffer(); bool indexEquals = FALSE; #ifdef QT_DEBUG_DATAMANAGER - qDebug(" Checking hint..."); + tqDebug(" Checking hint..."); #endif /* check the hint */ if ( cur->seek( atHint ) ) @@ -371,7 +371,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) if ( !indexEquals ) { #ifdef QT_DEBUG_DATAMANAGER - qDebug(" Checking current page..."); + tqDebug(" Checking current page..."); #endif /* check current page */ int pageSize = 20; @@ -389,7 +389,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) if ( !indexEquals && cur->driver()->hasFeature( TQSqlDriver::QuerySize ) && cur->sort().count() ) { #ifdef QT_DEBUG_DATAMANAGER - qDebug(" Using binary search..."); + tqDebug(" Using binary search..."); #endif // binary search based on record buffer and current sort fields int lo = 0; @@ -442,7 +442,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) if ( !indexEquals ) { #ifdef QT_DEBUG_DATAMANAGER - qDebug(" Using brute search..."); + tqDebug(" Using brute search..."); #endif #ifndef QT_NO_CURSOR TQApplication::setOverrideCursor( TQt::waitCursor ); @@ -465,7 +465,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) #endif } #ifdef QT_DEBUG_DATAMANAGER - qDebug(" Done, result:" + TQString::number( indexEquals ) ); + tqDebug(" Done, result:" + TQString::number( indexEquals ) ); #endif return indexEquals; } diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp index 9d619a016..2d32583c3 100644 --- a/src/sql/qsqlpropertymap.cpp +++ b/src/sql/qsqlpropertymap.cpp @@ -221,7 +221,7 @@ TQVariant TQSqlPropertyMap::property( TQWidget * widget ) if ( !mo ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() ); + tqWarning("TQSqlPropertyMap::property: %s does not exist", widget->metaObject()->className() ); #endif return TQVariant(); } @@ -240,7 +240,7 @@ void TQSqlPropertyMap::setProperty( TQWidget * widget, const TQVariant & value ) mo = mo->superClass(); if ( !mo ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlPropertyMap::setProperty: %s not handled by TQSqlPropertyMap", widget->metaObject()->className() ); + tqWarning("TQSqlPropertyMap::setProperty: %s not handled by TQSqlPropertyMap", widget->metaObject()->className() ); #endif return; } diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp index 94325d507..ac4631b1a 100644 --- a/src/sql/qsqlquery.cpp +++ b/src/sql/qsqlquery.cpp @@ -353,7 +353,7 @@ bool TQSqlQuery::exec ( const TQString& query ) d->sqlResult->setAt( TQSql::BeforeFirst ); if ( !driver() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::exec: no driver" ); + tqWarning("TQSqlQuery::exec: no driver" ); #endif return FALSE; } @@ -363,18 +363,18 @@ bool TQSqlQuery::exec ( const TQString& query ) d->executedQuery = d->sqlResult->lastQuery(); if ( !driver()->isOpen() || driver()->isOpenError() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::exec: database not open" ); + tqWarning("TQSqlQuery::exec: database not open" ); #endif return FALSE; } if ( query.isNull() || query.length() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::exec: empty query" ); + tqWarning("TQSqlQuery::exec: empty query" ); #endif return FALSE; } #ifdef QT_DEBUG_SQL - qDebug( "\n TQSqlQuery: " + query ); + tqDebug( "\n TQSqlQuery: " + query ); #endif return d->sqlResult->reset( query ); } @@ -403,7 +403,7 @@ TQVariant TQSqlQuery::value( int i ) const return d->sqlResult->data( i ); } else { #ifdef QT_CHECK_RANGE - qWarning( "TQSqlQuery::value: not positioned on a valid record" ); + tqWarning( "TQSqlQuery::value: not positioned on a valid record" ); #endif } return TQVariant(); @@ -544,7 +544,7 @@ bool TQSqlQuery::seek( int i, bool relative ) // let drivers optimize if ( isForwardOnly() && actualIdx < at() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); + tqWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); #endif afterSeek(); return FALSE; @@ -661,7 +661,7 @@ bool TQSqlQuery::prev() return FALSE; if ( isForwardOnly() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); + tqWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); #endif return FALSE; } @@ -705,7 +705,7 @@ bool TQSqlQuery::first() return FALSE; if ( isForwardOnly() && at() > TQSql::BeforeFirst ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); + tqWarning("TQSqlQuery::seek: cannot seek backwards in a forward only query" ); #endif return FALSE; } @@ -937,7 +937,7 @@ bool TQSqlQuery::prepare( const TQString& query ) d->sqlResult->extension()->clear(); if ( !driver() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::prepare: no driver" ); + tqWarning("TQSqlQuery::prepare: no driver" ); #endif return FALSE; } @@ -946,18 +946,18 @@ bool TQSqlQuery::prepare( const TQString& query ) d->sqlResult->setQuery( query.stripWhiteSpace() ); if ( !driver()->isOpen() || driver()->isOpenError() ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::prepare: database not open" ); + tqWarning("TQSqlQuery::prepare: database not open" ); #endif return FALSE; } if ( query.isNull() || query.length() == 0 ) { #ifdef QT_CHECK_RANGE - qWarning("TQSqlQuery::prepare: empty query" ); + tqWarning("TQSqlQuery::prepare: empty query" ); #endif return FALSE; } #ifdef QT_DEBUG_SQL - qDebug( "\n TQSqlQuery: " + query ); + tqDebug( "\n TQSqlQuery: " + query ); #endif TQString q = query; TQRegExp rx(TQString::fromLatin1("'[^']*'|:([a-zA-Z0-9_]+)")); @@ -1176,7 +1176,7 @@ TQVariant TQSqlQuery::boundValue( int pos ) const TQMap<TQString, TQVariant>::ConstIterator it; TQMap<TQString, TQVariant> vals = query.boundValues(); for ( it = vals.begin(); it != vals.end(); ++it ) - qWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() ); + tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() ); ... // Examine the bound values - bound using positional binding @@ -1184,7 +1184,7 @@ TQVariant TQSqlQuery::boundValue( int pos ) const TQValueList<TQVariant> list = query.boundValues().values(); int i = 0; for ( it = list.begin(); it != list.end(); ++it ) - qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); + tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); ... \endcode diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp index 998ba0a71..b1e0aa8e3 100644 --- a/src/sql/qsqlrecord.cpp +++ b/src/sql/qsqlrecord.cpp @@ -302,7 +302,7 @@ int TQSqlRecord::position( const TQString& name ) const return i; } #ifdef QT_CHECK_RANGE - qWarning( "TQSqlRecord::position: unable to find field %s", name.latin1() ); + tqWarning( "TQSqlRecord::position: unable to find field %s", name.latin1() ); #endif return -1; } @@ -317,7 +317,7 @@ TQSqlField* TQSqlRecord::field( int i ) checkDetach(); if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "TQSqlRecord::field: index out of range: %d", i ); + tqWarning( "TQSqlRecord::field: index out of range: %d", i ); #endif return 0; } @@ -348,7 +348,7 @@ const TQSqlField* TQSqlRecord::field( int i ) const { if ( !sh->d->contains( i ) ) { #ifdef QT_CHECK_RANGE - qWarning( "TQSqlRecord::field: index out of range: %d", i ); + tqWarning( "TQSqlRecord::field: index out of range: %d", i ); #endif // QT_CHECK_RANGE return 0; } diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index fb04f7e52..fa95124e4 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -611,7 +611,7 @@ void TQCommonStyle::drawControl( ControlElement element, { #if defined(QT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::drawControl: widget parameter cannot be zero!"); + tqWarning("TQCommonStyle::drawControl: widget parameter cannot be zero!"); return; } #endif @@ -1139,7 +1139,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQWidget *widget) const { #if defined(QT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::subRect: widget parameter cannot be zero!"); + tqWarning("TQCommonStyle::subRect: widget parameter cannot be zero!"); return TQRect(); } #endif @@ -1491,7 +1491,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control, { #if defined(QT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::drawComplexControl: widget parameter cannot be zero!"); + tqWarning("TQCommonStyle::drawComplexControl: widget parameter cannot be zero!"); return; } #endif @@ -1917,7 +1917,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control, { #if defined(QT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::querySubControlMetrics: widget parameter cannot be zero!"); + tqWarning("TQCommonStyle::querySubControlMetrics: widget parameter cannot be zero!"); return TQRect(); } #endif @@ -2468,7 +2468,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents, #if defined(QT_CHECK_STATE) if (! widget) { - qWarning("TQCommonStyle::sizeFromContents: widget parameter cannot be zero!"); + tqWarning("TQCommonStyle::sizeFromContents: widget parameter cannot be zero!"); return sz; } #endif diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index 0a1d9c62f..94ee53938 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -72,7 +72,7 @@ static bool qt_table_clipper_enabled = TRUE; #ifndef QT_INTERNAL_TABLE Q_EXPORT #endif -void qt_set_table_clipper_enabled( bool enabled ) +void tqt_set_table_clipper_enabled( bool enabled ) { qt_table_clipper_enabled = enabled; } @@ -7290,8 +7290,8 @@ bool TQTableHeader::isSectionStretchable( int s ) const void TQTableHeader::swapSections( int oldIdx, int newIdx, bool swapTable ) { - extern bool qt_qheader_label_return_null_strings; // qheader.cpp - qt_qheader_label_return_null_strings = TRUE; + extern bool tqt_qheader_label_return_null_strings; // qheader.cpp + tqt_qheader_label_return_null_strings = TRUE; TQIconSet oldIconSet, newIconSet; if ( iconSet( oldIdx ) ) @@ -7307,7 +7307,7 @@ void TQTableHeader::swapSections( int oldIdx, int newIdx, bool swapTable ) setLabel( newIdx, oldIconSet, oldLabel ); } - qt_qheader_label_return_null_strings = FALSE; + tqt_qheader_label_return_null_strings = FALSE; int w1 = sectionSize( oldIdx ); int w2 = sectionSize( newIdx ); diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h index 18837ad34..7c60c1f44 100644 --- a/src/tools/ntqcstring.h +++ b/src/tools/ntqcstring.h @@ -53,9 +53,9 @@ Safe and portable C string functions; extensions to standard string.h *****************************************************************************/ -Q_EXPORT void *qmemmove( void *dst, const void *src, uint len ); +Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len ); -Q_EXPORT char *qstrdup( const char * ); +Q_EXPORT char *tqstrdup( const char * ); Q_EXPORT inline uint tqstrlen( const char *str ) { return str ? (uint)strlen(str) : 0u; } @@ -63,7 +63,7 @@ Q_EXPORT inline uint tqstrlen( const char *str ) Q_EXPORT inline char *qstrcpy( char *dst, const char *src ) { return src ? strcpy(dst, src) : 0; } -Q_EXPORT char *qstrncpy( char *dst, const char *src, uint len ); +Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 ) { @@ -77,9 +77,9 @@ Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT int qstricmp( const char *, const char * ); +Q_EXPORT int tqstricmp( const char *, const char * ); -Q_EXPORT int qstrnicmp( const char *, const char *, uint len ); +Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); #ifndef QT_CLEAN_NAMESPACE Q_EXPORT inline uint cstrlen( const char *str ) @@ -96,9 +96,9 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len ) #endif -// qChecksum: Internet checksum +// tqChecksum: Internet checksum -Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len ); +Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len ); /***************************************************************************** TQByteArray class @@ -120,10 +120,10 @@ typedef TQMemArray<char> TQByteArray; #endif #ifndef QT_NO_COMPRESS -Q_EXPORT TQByteArray qCompress( const uchar* data, int nbytes ); +Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); -Q_EXPORT inline TQByteArray qCompress( const TQByteArray& data) -{ return qCompress( (const uchar*)data.data(), data.size() ); } +Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) +{ return tqCompress( (const uchar*)data.data(), data.size() ); } Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) { return tqUncompress( (const uchar*)data.data(), data.size() ); } #endif diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index 385156f0b..b2a6413a3 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -914,9 +914,9 @@ extern Q_EXPORT bool qt_winunicode; // System information // -Q_EXPORT const char *qVersion(); -Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool qSharedBuild(); +Q_EXPORT const char *tqVersion(); +Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); +Q_EXPORT bool tqSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) @@ -975,25 +975,25 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void qDebug( const char *, ... ) // print debug message +Q_EXPORT void tqDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qWarning( const char *, ... ) // print warning message +Q_EXPORT void tqWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit +Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void qSystemWarning( const char *, int code = -1 ); +Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); #if !defined(QT_CLEAN_NAMESPACE) // compatibility with TQt 1 @@ -1021,9 +1021,9 @@ Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit #if !defined(Q_ASSERT) # if defined(QT_CHECK_STATE) # if defined(QT_FATAL_ASSERT) -# define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # else -# define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # endif # else # define Q_ASSERT(x) @@ -1039,10 +1039,10 @@ Q_EXPORT void fatal( const char *, ... ) // print fatal message and exit #endif // QT_NO_COMPAT -Q_EXPORT bool qt_check_pointer( bool c, const char *, int ); +Q_EXPORT bool tqt_check_pointer( bool c, const char *, int ); #if defined(QT_CHECK_NULL) -# define TQ_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__)) +# define TQ_CHECK_PTR(p) (tqt_check_pointer((p)==0,__FILE__,__LINE__)) #else # define TQ_CHECK_PTR(p) #endif @@ -1062,27 +1062,27 @@ Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler ); typedef TQtMsgHandler msg_handler; #endif // QT_NO_COMPAT -Q_EXPORT void qSuppressObsoleteWarnings( bool = TRUE ); +Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void qObsolete( const char *obj, const char *oldfunc, +Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void qObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void qObsolete( const char *message ); +Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); +Q_EXPORT void tqObsolete( const char *message ); // // Install paths from configure // -Q_EXPORT const char *qInstallPath(); -Q_EXPORT const char *qInstallPathDocs(); -Q_EXPORT const char *qInstallPathHeaders(); -Q_EXPORT const char *qInstallPathLibs(); -Q_EXPORT const char *qInstallPathBins(); -Q_EXPORT const char *qInstallPathPlugins(); -Q_EXPORT const char *qInstallPathData(); -Q_EXPORT const char *qInstallPathTranslations(); -Q_EXPORT const char *qInstallPathSysconf(); +Q_EXPORT const char *tqInstallPath(); +Q_EXPORT const char *tqInstallPathDocs(); +Q_EXPORT const char *tqInstallPathHeaders(); +Q_EXPORT const char *tqInstallPathLibs(); +Q_EXPORT const char *tqInstallPathBins(); +Q_EXPORT const char *tqInstallPathPlugins(); +Q_EXPORT const char *tqInstallPathData(); +Q_EXPORT const char *tqInstallPathTranslations(); +Q_EXPORT const char *tqInstallPathSysconf(); #endif /* __cplusplus */ @@ -1097,7 +1097,7 @@ Q_EXPORT const char *qInstallPathSysconf(); #ifdef Q_FULL_TEMPLATE_INSTANTIATION # define Q_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ - qWarning( #C"::operator==( const "#C"& ) got called." ); \ + tqWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h index 7c0d375cf..02dd289ca 100644 --- a/src/tools/ntqmap.h +++ b/src/tools/ntqmap.h @@ -577,7 +577,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>: #ifdef QT_CHECK_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() ); # else # define QT_CHECK_INVALID_MAP_ELEMENT diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h index 04b319aeb..54fb170a2 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/ntqstring.h @@ -225,7 +225,7 @@ public: static bool networkOrdered() { int wordSize; bool bigEndian = FALSE; - qSysInfo( &wordSize, &bigEndian ); + tqSysInfo( &wordSize, &bigEndian ); return bigEndian; } diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h index 67d88048e..1f346ad5d 100644 --- a/src/tools/ntqstrlist.h +++ b/src/tools/ntqstrlist.h @@ -64,7 +64,7 @@ public: TQStrList& operator=( const TQStrList & ); private: - TQPtrCollection::Item newItem( TQPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } + TQPtrCollection::Item newItem( TQPtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; } void deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } @@ -85,7 +85,7 @@ public: ~TQStrIList() { clear(); } private: int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { return qstricmp((const char*)s1, + { return tqstricmp((const char*)s1, (const char*)s2); } }; diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h index 8eb7afd8b..f69f6273b 100644 --- a/src/tools/ntqstrvec.h +++ b/src/tools/ntqstrvec.h @@ -54,7 +54,7 @@ public: TQStrVec( uint size, bool deepc = TRUE ) : TQPtrVector<char>(size) {dc=deepc;} ~TQStrVec() { clear(); } 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; } int compareItems( Item s1, Item s2 ) { return qstrcmp((const char*)s1, @@ -77,7 +77,7 @@ public: ~TQStrIVec() { clear(); } private: int compareItems( Item s1, Item s2 ) - { return qstricmp((const char*)s1, + { return tqstricmp((const char*)s1, (const char*)s2); } }; diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h index 411c2dd75..91a437a98 100644 --- a/src/tools/ntqvaluelist.h +++ b/src/tools/ntqvaluelist.h @@ -396,7 +396,7 @@ Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() #ifdef QT_CHECK_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() ); # else # define QT_CHECK_INVALID_LIST_ELEMENT diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp index a374cc6ca..49074ad93 100644 --- a/src/tools/qbitarray.cpp +++ b/src/tools/qbitarray.cpp @@ -296,7 +296,7 @@ bool TQBitArray::testBit( uint index ) const { #if defined(QT_CHECK_RANGE) if ( index >= size() ) { - qWarning( "TQBitArray::testBit: Index %d out of range", index ); + tqWarning( "TQBitArray::testBit: Index %d out of range", index ); return FALSE; } #endif @@ -315,7 +315,7 @@ void TQBitArray::setBit( uint index ) { #if defined(QT_CHECK_RANGE) if ( index >= size() ) { - qWarning( "TQBitArray::setBit: Index %d out of range", index ); + tqWarning( "TQBitArray::setBit: Index %d out of range", index ); return; } #endif @@ -348,7 +348,7 @@ void TQBitArray::clearBit( uint index ) { #if defined(QT_CHECK_RANGE) if ( index >= size() ) { - qWarning( "TQBitArray::clearBit: Index %d out of range", index ); + tqWarning( "TQBitArray::clearBit: Index %d out of range", index ); return; } #endif @@ -368,7 +368,7 @@ bool TQBitArray::toggleBit( uint index ) { #if defined(QT_CHECK_RANGE) if ( index >= size() ) { - qWarning( "TQBitArray::toggleBit: Index %d out of range", index ); + tqWarning( "TQBitArray::toggleBit: Index %d out of range", index ); return FALSE; } #endif @@ -653,7 +653,7 @@ TQDataStream &operator>>( TQDataStream &s, TQBitArray &a ) s >> len; // read size of array if ( !a.resize( (uint)len ) ) { // resize array #if defined(QT_CHECK_NULL) - qWarning( "TQDataStream: Not enough memory to read TQBitArray" ); + tqWarning( "TQDataStream: Not enough memory to read TQBitArray" ); #endif len = 0; } diff --git a/src/tools/qbuffer.cpp b/src/tools/qbuffer.cpp index 75bb35da7..342309808 100644 --- a/src/tools/qbuffer.cpp +++ b/src/tools/qbuffer.cpp @@ -150,7 +150,7 @@ bool TQBuffer::setBuffer( TQByteArray buf ) { if ( isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQBuffer::setBuffer: Buffer is open" ); + tqWarning( "TQBuffer::setBuffer: Buffer is open" ); #endif return FALSE; } @@ -193,7 +193,7 @@ bool TQBuffer::open( int m ) { if ( isOpen() ) { // buffer already open #if defined(QT_CHECK_STATE) - qWarning( "TQBuffer::open: Buffer already open" ); + tqWarning( "TQBuffer::open: Buffer already open" ); #endif return FALSE; } @@ -262,16 +262,16 @@ bool TQBuffer::at( Offset pos ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQBuffer::at: Buffer is not open" ); + tqWarning( "TQBuffer::at: Buffer is not open" ); return FALSE; } #endif if ( pos > a_len ) { #if defined(QT_CHECK_RANGE) #if defined(QT_ABI_QT4) - qWarning( "TQBuffer::at: Index %lld out of range", pos ); + tqWarning( "TQBuffer::at: Index %lld out of range", pos ); #else - qWarning( "TQBuffer::at: Index %lu out of range", pos ); + tqWarning( "TQBuffer::at: Index %lu out of range", pos ); #endif #endif return FALSE; @@ -289,15 +289,15 @@ Q_LONG TQBuffer::readBlock( char *p, Q_ULONG len ) { #if defined(QT_CHECK_STATE) if ( !p ) { - qWarning( "TQBuffer::readBlock: Null pointer error" ); + tqWarning( "TQBuffer::readBlock: Null pointer error" ); return -1; } if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::readBlock: Buffer not open" ); + tqWarning( "TQBuffer::readBlock: Buffer not open" ); return -1; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQBuffer::readBlock: Read operation not permitted" ); + tqWarning( "TQBuffer::readBlock: Read operation not permitted" ); return -1; } #endif @@ -337,17 +337,17 @@ Q_LONG TQBuffer::writeBlock( const char *p, Q_ULONG len ) #if defined(QT_CHECK_NULL) if ( p == 0 ) { - qWarning( "TQBuffer::writeBlock: Null pointer error" ); + tqWarning( "TQBuffer::writeBlock: Null pointer error" ); return -1; } #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::writeBlock: Buffer not open" ); + tqWarning( "TQBuffer::writeBlock: Buffer not open" ); return -1; } if ( !isWritable() ) { // writing not permitted - qWarning( "TQBuffer::writeBlock: Write operation not permitted" ); + tqWarning( "TQBuffer::writeBlock: Write operation not permitted" ); return -1; } #endif @@ -355,7 +355,7 @@ Q_LONG TQBuffer::writeBlock( const char *p, Q_ULONG len ) Q_ULONG new_len = a_len + a_inc*((ioIndex+len-a_len)/a_inc+1); if ( !a.resize( new_len ) ) { // could not resize #if defined(QT_CHECK_NULL) - qWarning( "TQBuffer::writeBlock: Memory allocation error" ); + tqWarning( "TQBuffer::writeBlock: Memory allocation error" ); #endif setStatus( IO_ResourceError ); return -1; @@ -380,17 +380,17 @@ Q_LONG TQBuffer::readLine( char *p, Q_ULONG maxlen ) { #if defined(QT_CHECK_NULL) if ( p == 0 ) { - qWarning( "TQBuffer::readLine: Null pointer error" ); + tqWarning( "TQBuffer::readLine: Null pointer error" ); return -1; } #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::readLine: Buffer not open" ); + tqWarning( "TQBuffer::readLine: Buffer not open" ); return -1; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQBuffer::readLine: Read operation not permitted" ); + tqWarning( "TQBuffer::readLine: Read operation not permitted" ); return -1; } #endif @@ -419,11 +419,11 @@ int TQBuffer::getch() { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::getch: Buffer not open" ); + tqWarning( "TQBuffer::getch: Buffer not open" ); return -1; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQBuffer::getch: Read operation not permitted" ); + tqWarning( "TQBuffer::getch: Read operation not permitted" ); return -1; } #endif @@ -450,11 +450,11 @@ int TQBuffer::putch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::putch: Buffer not open" ); + tqWarning( "TQBuffer::putch: Buffer not open" ); return -1; } if ( !isWritable() ) { // writing not permitted - qWarning( "TQBuffer::putch: Write operation not permitted" ); + tqWarning( "TQBuffer::putch: Write operation not permitted" ); return -1; } #endif @@ -479,11 +479,11 @@ int TQBuffer::ungetch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // buffer not open - qWarning( "TQBuffer::ungetch: Buffer not open" ); + tqWarning( "TQBuffer::ungetch: Buffer not open" ); return -1; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQBuffer::ungetch: Read operation not permitted" ); + tqWarning( "TQBuffer::ungetch: Read operation not permitted" ); return -1; } #endif diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp index 5869d3e37..7097b287a 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/qcomlibrary.cpp @@ -100,25 +100,25 @@ static bool qt_verify( const TQString& library, uint version, uint flags, if ( (flags & 1) == 0 ) { if ( warn ) - qWarning( "Conflict in %s:\n" + tqWarning( "Conflict in %s:\n" " Plugin cannot be queried successfully!", (const char*) TQFile::encodeName(library) ); } else if ( ( version > TQT_VERSION ) || ( ( TQT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) { if ( warn ) - qWarning( "Conflict in %s:\n" + tqWarning( "Conflict in %s:\n" " Plugin uses incompatible TQt library (%d.%d.%d)!", (const char*) TQFile::encodeName(library), (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff ); } else if ( (flags & 2) != (our_flags & 2) ) { if ( warn ) - qWarning( "Conflict in %s:\n" + tqWarning( "Conflict in %s:\n" " Plugin uses %s TQt library!", (const char*) TQFile::encodeName(library), (flags & 2) ? "multi threaded" : "single threaded" ); } else if ( key != TQT_BUILD_KEY ) { if ( warn ) - qWarning( "Conflict in %s:\n" + tqWarning( "Conflict in %s:\n" " Plugin uses incompatible TQt library!\n" " expected build key \"%s\", got \"%s\".", (const char*) TQFile::encodeName(library), @@ -326,7 +326,7 @@ static bool qt_unix_query( const TQString &library, uint *version, uint *flags, { TQFile file( library ); if (! file.open( IO_ReadOnly ) ) { - qWarning( "%s: %s", (const char*) TQFile::encodeName(library), + tqWarning( "%s: %s", (const char*) TQFile::encodeName(library), strerror( errno ) ); return FALSE; } @@ -345,7 +345,7 @@ static bool qt_unix_query( const TQString &library, uint *version, uint *flags, fdlen = maplen; } else { // mmap failed - qWarning( "mmap: %s", strerror( errno ) ); + tqWarning( "mmap: %s", strerror( errno ) ); #endif // USE_MMAP // try reading the data into memory instead data = file.readAll(); @@ -367,7 +367,7 @@ static bool qt_unix_query( const TQString &library, uint *version, uint *flags, #ifdef USE_MMAP if ( mapaddr != MAP_FAILED && munmap(mapaddr, maplen) != 0 ) { - qWarning( "munmap: %s", strerror( errno ) ); + tqWarning( "munmap: %s", strerror( errno ) ); } #endif // USE_MMAP @@ -399,8 +399,8 @@ void TQComLibrary::createInstanceInternal() bool warn_mismatch = TRUE; #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &cache ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &cache ) : 0 ); #endif // QT_THREAD_SUPPORT if ( ! cache ) { @@ -474,7 +474,7 @@ void TQComLibrary::createInstanceInternal() if ( ! query_done ) { if ( warn_mismatch ) { - qWarning( "Conflict in %s:\n Plugin cannot be queried successfully!", + tqWarning( "Conflict in %s:\n Plugin cannot be queried successfully!", (const char*) TQFile::encodeName( library() ) ); } unload(); @@ -499,7 +499,7 @@ void TQComLibrary::createInstanceInternal() ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" ); #if defined(QT_DEBUG_COMPONENT) if ( !ucmInstanceProc ) - qWarning( "%s: Not a UCOM library.", (const char*) TQFile::encodeName(library()) ); + tqWarning( "%s: Not a UCOM library.", (const char*) TQFile::encodeName(library()) ); #endif entry = ucmInstanceProc ? ucmInstanceProc() : 0; @@ -514,7 +514,7 @@ void TQComLibrary::createInstanceInternal() } } else { #if defined(QT_DEBUG_COMPONENT) - qWarning( "%s: No exported component provided.", (const char*) TQFile::encodeName(library()) ); + tqWarning( "%s: No exported component provided.", (const char*) TQFile::encodeName(library()) ); #endif unload(); } diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp index 22e871409..09bb358ad 100644 --- a/src/tools/qcomponentfactory.cpp +++ b/src/tools/qcomponentfactory.cpp @@ -116,7 +116,7 @@ static TQPtrList<TQComLibrary> *liblist() if ( !libraries ) { libraries = new TQPtrList<TQComLibrary>(); libraries->setAutoDelete( TRUE ); - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); } return libraries; } diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 8e7a1d14d..f6f4f1ff8 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -70,7 +70,7 @@ is copied correctly even if \a src and \a dst overlap. */ -void *qmemmove( void *dst, const void *src, uint len ) +void *tqmemmove( void *dst, const void *src, uint len ) { register char *d; register char *s; @@ -100,7 +100,7 @@ void *qmemmove( void *dst, const void *src, uint len ) The returned string must be deleted using \c delete[]. */ -char *qstrdup( const char *src ) +char *tqstrdup( const char *src ) { if ( !src ) return 0; @@ -133,7 +133,7 @@ char *qstrdup( const char *src ) \sa qstrcpy() */ -char *qstrncpy( char *dst, const char *src, uint len ) +char *tqstrncpy( char *dst, const char *src, uint len ) { if ( !src || !dst ) return 0; @@ -170,7 +170,7 @@ char *qstrncpy( char *dst, const char *src, uint len ) Special case II: Returns a random nonzero value if \a str1 is 0 or \a str2 is 0 (but not both). - \sa tqstrncmp() qstricmp() qstrnicmp() + \sa tqstrncmp() tqstricmp() tqstrnicmp() \link #asciinotion Note on character comparisons \endlink */ @@ -192,7 +192,7 @@ char *qstrncpy( char *dst, const char *src, uint len ) Special case II: Returns a random nonzero value if \a str1 is 0 or \a str2 is 0 (but not both). - \sa qstrcmp(), qstricmp(), qstrnicmp() + \sa qstrcmp(), tqstricmp(), tqstrnicmp() \link #asciinotion Note on character comparisons \endlink */ @@ -212,11 +212,11 @@ char *qstrncpy( char *dst, const char *src, uint len ) Special case II: Returns a random nonzero value if \a str1 is 0 or \a str2 is 0 (but not both). - \sa qstrcmp(), tqstrncmp(), qstrnicmp() + \sa qstrcmp(), tqstrncmp(), tqstrnicmp() \link #asciinotion Note on character comparisons \endlink */ -int qstricmp( const char *str1, const char *str2 ) +int tqstricmp( const char *str1, const char *str2 ) { register const uchar *s1 = (const uchar *)str1; register const uchar *s2 = (const uchar *)str2; @@ -246,11 +246,11 @@ int qstricmp( const char *str1, const char *str2 ) Special case II: Returns a random nonzero value if \a str1 is 0 or \a str2 is 0 (but not both). - \sa qstrcmp(), tqstrncmp() qstricmp() + \sa qstrcmp(), tqstrncmp() tqstricmp() \link #asciinotion Note on character comparisons \endlink */ -int qstrnicmp( const char *str1, const char *str2, uint len ) +int tqstrnicmp( const char *str1, const char *str2, uint len ) { register const uchar *s1 = (const uchar *)str1; register const uchar *s2 = (const uchar *)str2; @@ -308,13 +308,13 @@ static void createCRC16Table() // build CRC16 lookup table The checksum is independent of the byte order (endianness). */ -Q_UINT16 qChecksum( const char *data, uint len ) +Q_UINT16 tqChecksum( const char *data, uint len ) { if ( !crc_tbl_init ) { // create lookup table #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &crc_tbl_init ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &crc_tbl_init ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !crc_tbl_init ) { @@ -335,7 +335,7 @@ Q_UINT16 qChecksum( const char *data, uint len ) } /*! - \fn TQByteArray qCompress( const TQByteArray& data ) + \fn TQByteArray tqCompress( const TQByteArray& data ) \relates TQByteArray @@ -355,7 +355,7 @@ Q_UINT16 qChecksum( const char *data, uint len ) */ #ifndef QT_NO_COMPRESS -TQByteArray qCompress( const uchar* data, int nbytes ) +TQByteArray tqCompress( const uchar* data, int nbytes ) { if ( nbytes == 0 ) { TQByteArray tmp( 4 ); @@ -364,7 +364,7 @@ TQByteArray qCompress( const uchar* data, int nbytes ) } if ( !data ) { #if defined(QT_CHECK_RANGE) - qWarning( "qCompress: data is NULL." ); + tqWarning( "qCompress: data is NULL." ); #endif return TQByteArray(); } @@ -386,7 +386,7 @@ TQByteArray qCompress( const uchar* data, int nbytes ) break; case Z_MEM_ERROR: #if defined(QT_CHECK_RANGE) - qWarning( "qCompress: Z_MEM_ERROR: Not enough memory." ); + tqWarning( "qCompress: Z_MEM_ERROR: Not enough memory." ); #endif bazip.resize( 0 ); break; @@ -411,12 +411,12 @@ TQByteArray qCompress( const uchar* data, int nbytes ) Returns an empty TQByteArray if the input data was corrupt. \omit ADD THE FOLLOWING FOR TQt 4.0 - This function will uncompress data compressed with qCompress() + This function will uncompress data compressed with tqCompress() from this and any earlier TQt version, back to TQt 3.1 when this feature was added. \endomit - \sa qCompress() + \sa tqCompress() */ /*! @@ -433,14 +433,14 @@ TQByteArray tqUncompress( const uchar* data, int nbytes ) { if ( !data ) { #if defined(QT_CHECK_RANGE) - qWarning( "qUncompress: data is NULL." ); + tqWarning( "qUncompress: data is NULL." ); #endif return TQByteArray(); } if ( nbytes <= 4 ) { #if defined(QT_CHECK_RANGE) if ( nbytes < 4 || ( data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0 ) ) - qWarning( "qUncompress: Input data is corrupted." ); + tqWarning( "qUncompress: Input data is corrupted." ); #endif return TQByteArray(); } @@ -463,7 +463,7 @@ TQByteArray tqUncompress( const uchar* data, int nbytes ) break; case Z_MEM_ERROR: #if defined(QT_CHECK_RANGE) - qWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." ); + tqWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." ); #endif break; case Z_BUF_ERROR: @@ -471,7 +471,7 @@ TQByteArray tqUncompress( const uchar* data, int nbytes ) break; case Z_DATA_ERROR: #if defined(QT_CHECK_RANGE) - qWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." ); + tqWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." ); #endif break; } @@ -552,7 +552,7 @@ TQDataStream &operator>>( TQDataStream &s, TQByteArray &a ) } if ( !a.resize( (uint)len ) ) { // resize array #if defined(QT_CHECK_NULL) - qWarning( "TQDataStream: Not enough memory to read TQByteArray" ); + tqWarning( "TQDataStream: Not enough memory to read TQByteArray" ); #endif len = 0; } @@ -1031,7 +1031,7 @@ int TQCString::find( const char *str, int index, bool cs, uint l ) const while ( haystack <= end ) { hashHaystack += tolower(*(haystack+sl_minus_1)); if ( hashHaystack == hashNeedle - && qstrnicmp( needle, haystack, sl ) == 0 ) + && tqstrnicmp( needle, haystack, sl ) == 0 ) return haystack - data(); REHASH( tolower(*haystack) ); @@ -1136,7 +1136,7 @@ int TQCString::findRev( const char *str, int index, bool cs ) const hashHaystack -= tolower(*haystack); while ( haystack >= end ) { hashHaystack += tolower(*haystack); - if ( hashHaystack == hashNeedle && qstrnicmp( needle, haystack, sl ) == 0 ) + if ( hashHaystack == hashNeedle && tqstrnicmp( needle, haystack, sl ) == 0 ) return haystack-data(); --haystack; REHASH( tolower(*(haystack+sl)) ); @@ -2192,7 +2192,7 @@ TQCString &TQCString::setNum( double n, char f, int prec ) { #if defined(QT_CHECK_RANGE) if ( !(f=='f' || f=='F' || f=='e' || f=='E' || f=='g' || f=='G') ) - qWarning( "TQCString::setNum: Invalid format char '%c'", f ); + tqWarning( "TQCString::setNum: Invalid format char '%c'", f ); #endif char format[20]; register char *fs = format; // generate format string @@ -2323,7 +2323,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCString &str ) } if ( !str.TQByteArray::resize( (uint)len )) {// resize string #if defined(QT_CHECK_NULL) - qWarning( "TQDataStream: Not enough memory to read TQCString" ); + tqWarning( "TQDataStream: Not enough memory to read TQCString" ); #endif len = 0; } diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp index deab90bb6..1af0d649b 100644 --- a/src/tools/qdatastream.cpp +++ b/src/tools/qdatastream.cpp @@ -219,7 +219,7 @@ #if defined(QT_CHECK_STATE) #undef CHECK_STREAM_PRECOND #define CHECK_STREAM_PRECOND if ( !dev ) { \ - qWarning( "TQDataStream: No device" ); \ + tqWarning( "TQDataStream: No device" ); \ return *this; } #else #define CHECK_STREAM_PRECOND @@ -248,7 +248,7 @@ static const int DefaultStreamVersion = 6; TQDataStream::TQDataStream() { if ( systemWordSize == 0 ) // get system features - qSysInfo( &systemWordSize, &systemBigEndian ); + tqSysInfo( &systemWordSize, &systemBigEndian ); dev = 0; // no device set owndev = FALSE; byteorder = BigEndian; // default byte order @@ -272,7 +272,7 @@ TQDataStream::TQDataStream() TQDataStream::TQDataStream( TQIODevice *d ) { if ( systemWordSize == 0 ) // get system features - qSysInfo( &systemWordSize, &systemBigEndian ); + tqSysInfo( &systemWordSize, &systemBigEndian ); dev = d; // set device owndev = FALSE; byteorder = BigEndian; // default byte order @@ -303,7 +303,7 @@ TQDataStream::TQDataStream( TQIODevice *d ) TQDataStream::TQDataStream( TQByteArray a, int mode ) { if ( systemWordSize == 0 ) // get system features - qSysInfo( &systemWordSize, &systemBigEndian ); + tqSysInfo( &systemWordSize, &systemBigEndian ); dev = new TQBuffer( a ); // create device ((TQBuffer *)dev)->open( mode ); // open device owndev = TRUE; diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index d1358cc87..00eba97d3 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -513,7 +513,7 @@ TQString TQDate::shortMonthName( int month ) { #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - qWarning( "TQDate::shortMonthName: Parameter out ouf range" ); + tqWarning( "TQDate::shortMonthName: Parameter out ouf range" ); month = 1; } #endif @@ -559,7 +559,7 @@ TQString TQDate::longMonthName( int month ) { #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - qWarning( "TQDate::longMonthName: Parameter out ouf range" ); + tqWarning( "TQDate::longMonthName: Parameter out ouf range" ); month = 1; } #endif @@ -613,7 +613,7 @@ TQString TQDate::shortDayName( int weekday ) { #if defined(QT_CHECK_RANGE) if ( weekday < 1 || weekday > 7 ) { - qWarning( "TQDate::shortDayName: Parameter out of range" ); + tqWarning( "TQDate::shortDayName: Parameter out of range" ); weekday = 1; } #endif @@ -661,7 +661,7 @@ TQString TQDate::longDayName( int weekday ) { #if defined(QT_CHECK_RANGE) if ( weekday < 1 || weekday > 7 ) { - qWarning( "TQDate::longDayName: Parameter out of range" ); + tqWarning( "TQDate::longDayName: Parameter out of range" ); weekday = 1; } #endif @@ -850,7 +850,7 @@ bool TQDate::setYMD( int y, int m, int d ) return isValid(); if ( !isValid(y,m,d) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d ); + tqWarning( "TQDate::setYMD: Invalid date %04d-%02d-%02d", y, m, d ); #endif return FALSE; } @@ -1073,7 +1073,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == TQt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQDate::fromString: Parameter out of range" ); + tqWarning( "TQDate::fromString: Parameter out of range" ); #endif TQDate d; d.jd = 0; @@ -1122,7 +1122,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f ) } #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - qWarning( "TQDate::fromString: Parameter out of range" ); + tqWarning( "TQDate::fromString: Parameter out of range" ); TQDate d; d.jd = 0; return d; @@ -1493,7 +1493,7 @@ bool TQTime::setHMS( int h, int m, int s, int ms ) { if ( !isValid(h,m,s,ms) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s, + tqWarning( "TQTime::setHMS Invalid time %02d:%02d:%02d.%03d", h, m, s, ms ); #endif ds = MSECS_PER_DAY; // make this invalid @@ -1664,7 +1664,7 @@ TQTime TQTime::fromString( const TQString& s, TQt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == TQt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQTime::fromString: Parameter out of range" ); + tqWarning( "TQTime::fromString: Parameter out of range" ); #endif TQTime t; t.ds = MSECS_PER_DAY; @@ -1708,7 +1708,7 @@ bool TQTime::currentTime( TQTime *ct, TQt::TimeSpec ts ) { if ( !ct ) { #if defined(QT_CHECK_NULL) - qWarning( "TQTime::currentTime(TQTime *): Null pointer not allowed" ); + tqWarning( "TQTime::currentTime(TQTime *): Null pointer not allowed" ); #endif return FALSE; } @@ -1789,7 +1789,7 @@ bool TQTime::isValid( int h, int m, int s, int ms ) TQTime t; t.start(); some_lengthy_task(); - qDebug( "Time elapsed: %d ms", t.elapsed() ); + tqDebug( "Time elapsed: %d ms", t.elapsed() ); \endcode \sa restart(), elapsed(), currentTime() @@ -2320,7 +2320,7 @@ int TQDateTime::daysTo( const TQDateTime &dt ) const \code TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime xmas( TQDate(dt.date().year(),12,24), TQTime(17,00) ); - qDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); + tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); \endcode \sa addSecs(), daysTo(), TQTime::secsTo() @@ -2449,7 +2449,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) { if ( ( s.isEmpty() ) || ( f == TQt::LocalDate ) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQDateTime::fromString: Parameter out of range" ); + tqWarning( "TQDateTime::fromString: Parameter out of range" ); #endif TQDateTime dt; dt.d.jd = 0; @@ -2482,7 +2482,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) } #if defined(QT_CHECK_RANGE) if ( month < 1 || month > 12 ) { - qWarning( "TQDateTime::fromString: Parameter out of range" ); + tqWarning( "TQDateTime::fromString: Parameter out of range" ); TQDateTime dt; dt.d.jd = 0; return dt; diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp index 17b748510..4079b7ea5 100644 --- a/src/tools/qdir.cpp +++ b/src/tools/qdir.cpp @@ -132,18 +132,18 @@ const bool CaseSensitiveFS = TRUE; \code TQDir d( "example" ); // "./example" if ( !d.exists() ) - qWarning( "Cannot find the example directory" ); + tqWarning( "Cannot find the example directory" ); \endcode Traversing directories and reading a file. \code TQDir d = TQDir::root(); // "/" if ( !d.cd("tmp") ) { // "/tmp" - qWarning( "Cannot find the \"/tmp\" directory" ); + tqWarning( "Cannot find the \"/tmp\" directory" ); } else { TQFile f( d.filePath("ex1.txt") ); // "/tmp/ex1.txt" if ( !f.open(IO_ReadWrite) ) - qWarning( "Cannot create the file %s", f.name() ); + tqWarning( "Cannot create the file %s", f.name() ); } \endcode @@ -1005,7 +1005,7 @@ TQDir &TQDir::operator=( const TQString &path ) TQDir d1( "/usr/local/bin" ); TQDir d2( "bin" ); if ( d1 != d2 ) - qDebug( "They differ" ); + tqDebug( "They differ" ); \endcode */ @@ -1021,7 +1021,7 @@ TQDir &TQDir::operator=( const TQString &path ) TQDir d2( "bin" ); d2.convertToAbs(); if ( d1 == d2 ) - qDebug( "They're the same" ); + tqDebug( "They're the same" ); \endcode */ @@ -1051,7 +1051,7 @@ bool TQDir::remove( const TQString &fileName, bool acceptAbsPath ) { if ( fileName.isEmpty() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQDir::remove: Empty or null file name" ); + tqWarning( "TQDir::remove: Empty or null file name" ); #endif return FALSE; } @@ -1076,7 +1076,7 @@ bool TQDir::exists( const TQString &name, bool acceptAbsPath ) //### const in 4. { if ( name.isEmpty() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQDir::exists: Empty or null file name" ); + tqWarning( "TQDir::exists: Empty or null file name" ); #endif return FALSE; } diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 54ca9df56..7f316ad71 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -142,7 +142,7 @@ bool TQDir::rename( const TQString &name, const TQString &newName, { if ( name.isEmpty() || newName.isEmpty() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQDir::rename: Empty or null file name(s)" ); + tqWarning( "TQDir::rename: Empty or null file name(s)" ); #endif return FALSE; } @@ -178,11 +178,11 @@ TQString TQDir::currentDirPath() #endif /* __GLIBC__ && !PATH_MAX */ #if defined(QT_DEBUG) if ( result.isNull() ) - qWarning( "TQDir::currentDirPath: getcwd() failed" ); + tqWarning( "TQDir::currentDirPath: getcwd() failed" ); #endif } else { #if defined(QT_DEBUG) - qWarning( "TQDir::currentDirPath: stat(\".\") failed" ); + tqWarning( "TQDir::currentDirPath: stat(\".\") failed" ); #endif } slashify( result ); @@ -269,7 +269,7 @@ bool TQDir::readDirEntries( const TQString &nameFilter, } if ( closedir(dir) != 0 ) { #if defined(QT_CHECK_NULL) - qWarning( "TQDir::readDirEntries: Cannot close the directory: %s", + tqWarning( "TQDir::readDirEntries: Cannot close the directory: %s", dPath.local8Bit().data() ); #endif } @@ -312,8 +312,8 @@ const TQFileInfoList * TQDir::drives() if ( !knownMemoryLeak ) { #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &knownMemoryLeak ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &knownMemoryLeak ) : 0 ); #endif // QT_THREAD_SUPPORT if ( !knownMemoryLeak ) { diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp index 78c08c7dd..eee256836 100644 --- a/src/tools/qfile.cpp +++ b/src/tools/qfile.cpp @@ -247,7 +247,7 @@ void TQFile::setName( const TQString &name ) { if ( isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQFile::setName: File is open" ); + tqWarning( "TQFile::setName: File is open" ); #endif close(); } @@ -336,7 +336,7 @@ bool TQFile::atEnd() const { if ( !isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQFile::atEnd: File is not open" ); + tqWarning( "TQFile::atEnd: File is not open" ); #endif return FALSE; } @@ -373,11 +373,11 @@ Q_LONG TQFile::readLine( char *p, Q_ULONG maxlen ) #if defined(QT_CHECK_STATE) TQ_CHECK_PTR( p ); if ( !isOpen() ) { // file not open - qWarning( "TQFile::readLine: File not open" ); + tqWarning( "TQFile::readLine: File not open" ); return -1; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQFile::readLine: Read operation not permitted" ); + tqWarning( "TQFile::readLine: Read operation not permitted" ); return -1; } #endif @@ -444,11 +444,11 @@ int TQFile::getch() { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // file not open - qWarning( "TQFile::getch: File not open" ); + tqWarning( "TQFile::getch: File not open" ); return EOF; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQFile::getch: Read operation not permitted" ); + tqWarning( "TQFile::getch: Read operation not permitted" ); return EOF; } #endif @@ -489,11 +489,11 @@ int TQFile::putch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // file not open - qWarning( "TQFile::putch: File not open" ); + tqWarning( "TQFile::putch: File not open" ); return EOF; } if ( !isWritable() ) { // writing not permitted - qWarning( "TQFile::putch: Write operation not permitted" ); + tqWarning( "TQFile::putch: Write operation not permitted" ); return EOF; } #endif @@ -530,11 +530,11 @@ int TQFile::ungetch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // file not open - qWarning( "TQFile::ungetch: File not open" ); + tqWarning( "TQFile::ungetch: File not open" ); return EOF; } if ( !isReadable() ) { // reading not permitted - qWarning( "TQFile::ungetch: Read operation not permitted" ); + tqWarning( "TQFile::ungetch: Read operation not permitted" ); return EOF; } #endif diff --git a/src/tools/qfile_unix.cpp b/src/tools/qfile_unix.cpp index c65bf9228..90decadb5 100644 --- a/src/tools/qfile_unix.cpp +++ b/src/tools/qfile_unix.cpp @@ -75,7 +75,7 @@ bool TQFile::remove( const TQString &fileName ) { if ( fileName.isEmpty() ) { #if defined(QT_CHECK_NULL) - qWarning( "TQFile::remove: Empty or null file name" ); + tqWarning( "TQFile::remove: Empty or null file name" ); #endif return FALSE; } @@ -168,13 +168,13 @@ bool TQFile::open( int m ) { if ( isOpen() ) { // file already open #if defined(QT_CHECK_STATE) - qWarning( "TQFile::open: File already open" ); + tqWarning( "TQFile::open: File already open" ); #endif return FALSE; } if ( fn.isEmpty() ) { // no file name defined #if defined(QT_CHECK_NULL) - qWarning( "TQFile::open: No file name specified" ); + tqWarning( "TQFile::open: No file name specified" ); #endif return FALSE; } @@ -182,7 +182,7 @@ bool TQFile::open( int m ) setMode( m ); if ( !(isReadable() || isWritable()) ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFile::open: File access not specified" ); + tqWarning( "TQFile::open: File access not specified" ); #endif return FALSE; } @@ -340,7 +340,7 @@ bool TQFile::open( int m, FILE *f ) { if ( isOpen() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFile::open: File already open" ); + tqWarning( "TQFile::open: File already open" ); #endif return FALSE; } @@ -412,7 +412,7 @@ bool TQFile::open( int m, int f ) { if ( isOpen() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQFile::open: File already open" ); + tqWarning( "TQFile::open: File already open" ); #endif return FALSE; } @@ -508,7 +508,7 @@ bool TQFile::at( Offset pos ) { if ( !isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQFile::at: File is not open" ); + tqWarning( "TQFile::at: File is not open" ); #endif return FALSE; } @@ -535,9 +535,9 @@ bool TQFile::at( Offset pos ) #if defined(QT_CHECK_RANGE) else #if defined(QT_ABI_QT4) - qWarning( "TQFile::at: Cannot set file position %lld", pos ); + tqWarning( "TQFile::at: Cannot set file position %lld", pos ); #else - qWarning( "TQFile::at: Cannot set file position %lu", pos ); + tqWarning( "TQFile::at: Cannot set file position %lu", pos ); #endif #endif return ok; @@ -560,15 +560,15 @@ Q_LONG TQFile::readBlock( char *p, Q_ULONG len ) #if defined(QT_CHECK_NULL) if ( !p ) - qWarning( "TQFile::readBlock: Null pointer error" ); + tqWarning( "TQFile::readBlock: Null pointer error" ); #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQFile::readBlock: File not open" ); + tqWarning( "TQFile::readBlock: File not open" ); return -1; } if ( !isReadable() ) { - qWarning( "TQFile::readBlock: Read operation not permitted" ); + tqWarning( "TQFile::readBlock: Read operation not permitted" ); return -1; } #endif @@ -629,15 +629,15 @@ Q_LONG TQFile::writeBlock( const char *p, Q_ULONG len ) #if defined(QT_CHECK_NULL) if ( p == 0 && len != 0 ) - qWarning( "TQFile::writeBlock: Null pointer error" ); + tqWarning( "TQFile::writeBlock: Null pointer error" ); #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { // file not open - qWarning( "TQFile::writeBlock: File not open" ); + tqWarning( "TQFile::writeBlock: File not open" ); return -1; } if ( !isWritable() ) { // writing not permitted - qWarning( "TQFile::writeBlock: Write operation not permitted" ); + tqWarning( "TQFile::writeBlock: Write operation not permitted" ); return -1; } #endif diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp index 5f10a2074..a78452fdf 100644 --- a/src/tools/qfileinfo_unix.cpp +++ b/src/tools/qfileinfo_unix.cpp @@ -277,9 +277,9 @@ uint TQFileInfo::groupId() const \code TQFileInfo fi( "/tmp/archive.tar.gz" ); if ( fi.permission( TQFileInfo::WriteUser | TQFileInfo::ReadGroup ) ) - qWarning( "I can change the file; my group can read the file" ); + tqWarning( "I can change the file; my group can read the file" ); if ( fi.permission( TQFileInfo::WriteGroup | TQFileInfo::WriteOther ) ) - qWarning( "The group or others can change the file" ); + tqWarning( "The group or others can change the file" ); \endcode \sa isReadable(), isWritable(), isExecutable() @@ -319,7 +319,7 @@ bool TQFileInfo::permission( int permissionSpec ) const return (fic->st.st_mode & mask) == mask; } else { #if defined(QT_CHECK_NULL) - qWarning( "TQFileInfo::permission: permissionSpec is 0" ); + tqWarning( "TQFileInfo::permission: permissionSpec is 0" ); #endif return TRUE; } diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp index 8eba534ca..31e881790 100644 --- a/src/tools/qgarray.cpp +++ b/src/tools/qgarray.cpp @@ -138,7 +138,7 @@ TQGArray::TQGArray( int size ) { if ( size < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQGArray: Cannot allocate array with negative length" ); + tqWarning( "TQGArray: Cannot allocate array with negative length" ); #endif size = 0; } @@ -578,7 +578,7 @@ void TQGArray::resetRawData( const char *d, uint len ) { if ( d != shd->data || len != shd->len ) { #if defined(QT_CHECK_STATE) - qWarning( "TQGArray::resetRawData: Inconsistent arguments" ); + tqWarning( "TQGArray::resetRawData: Inconsistent arguments" ); #endif return; } @@ -601,7 +601,7 @@ int TQGArray::find( const char *d, uint index, uint sz ) const index *= sz; if ( index >= shd->len ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQGArray::find: Index %d out of range", index/sz ); + tqWarning( "TQGArray::find: Index %d out of range", index/sz ); #endif return -1; } @@ -734,8 +734,8 @@ void TQGArray::sort( uint sz ) return; #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &cmp_item_size ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &cmp_item_size ) : 0 ); #endif // QT_THREAD_SUPPORT cmp_item_size = sz; @@ -753,8 +753,8 @@ int TQGArray::bsearch( const char *d, uint sz ) const return -1; #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &cmp_item_size ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &cmp_item_size ) : 0 ); #endif // QT_THREAD_SUPPORT cmp_item_size = sz; @@ -803,7 +803,7 @@ bool TQGArray::setExpand( uint index, const char *d, uint sz ) void TQGArray::msg_index( uint index ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQGArray::at: Absolute index %d out of range", index ); + tqWarning( "TQGArray::at: Absolute index %d out of range", index ); #else Q_UNUSED( index ) #endif diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp index a67112f9c..7d6d7d415 100644 --- a/src/tools/qgcache.cpp +++ b/src/tools/qgcache.cpp @@ -283,7 +283,7 @@ TQGCache::TQGCache( const TQGCache & ) : TQPtrCollection() { #if defined(QT_CHECK_NULL) - qFatal( "TQGCache::TQGCache(TQGCache &): Cannot copy a cache" ); + tqFatal( "TQGCache::TQGCache(TQGCache &): Cannot copy a cache" ); #endif } @@ -305,7 +305,7 @@ TQGCache::~TQGCache() TQGCache &TQGCache::operator=( const TQGCache & ) { #if defined(QT_CHECK_NULL) - qFatal( "TQGCache::operator=: Cannot copy a cache" ); + tqFatal( "TQGCache::operator=: Cannot copy a cache" ); #endif return *this; } @@ -413,7 +413,7 @@ bool TQGCache::insert_other( const char *key, TQPtrCollection::Item data, lruList->insertCosts += cost; #endif if ( keytype == AsciiKey && copyk ) - key = qstrdup( key ); + key = tqstrdup( key ); if ( priority < -32768 ) priority = -32768; else if ( priority > 32767 ) @@ -641,28 +641,28 @@ void TQGCache::statistics() const #if defined(QT_DEBUG) TQString line; line.fill( '*', 80 ); - qDebug( "%s", line.ascii() ); - qDebug( "CACHE STATISTICS:" ); - qDebug( "cache contains %d item%s, with a total cost of %d", + tqDebug( "%s", line.ascii() ); + tqDebug( "CACHE STATISTICS:" ); + tqDebug( "cache contains %d item%s, with a total cost of %d", count(), count() != 1 ? "s" : "", tCost ); - qDebug( "maximum cost is %d, cache is %d%% full.", + tqDebug( "maximum cost is %d, cache is %d%% full.", mCost, (200*tCost + mCost) / (mCost*2) ); - qDebug( "find() has been called %d time%s", + tqDebug( "find() has been called %d time%s", lruList->finds, lruList->finds != 1 ? "s" : "" ); - qDebug( "%d of these were hits, items found had a total cost of %d.", + tqDebug( "%d of these were hits, items found had a total cost of %d.", lruList->hits,lruList->hitCosts ); - qDebug( "%d item%s %s been inserted with a total cost of %d.", + tqDebug( "%d item%s %s been inserted with a total cost of %d.", lruList->inserts,lruList->inserts != 1 ? "s" : "", lruList->inserts != 1 ? "have" : "has", lruList->insertCosts ); - qDebug( "%d item%s %s too large or had too low priority to be inserted.", + tqDebug( "%d item%s %s too large or had too low priority to be inserted.", lruList->insertMisses, lruList->insertMisses != 1 ? "s" : "", lruList->insertMisses != 1 ? "were" : "was" ); - qDebug( "%d item%s %s been thrown away with a total cost of %d.", + tqDebug( "%d item%s %s been thrown away with a total cost of %d.", lruList->dumps, lruList->dumps != 1 ? "s" : "", lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts ); - qDebug( "Statistics from internal dictionary class:" ); + tqDebug( "Statistics from internal dictionary class:" ); dict->statistics(); - qDebug( "%s", line.ascii() ); + tqDebug( "%s", line.ascii() ); #endif } diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp index ac54098fc..225745243 100644 --- a/src/tools/qgdict.cpp +++ b/src/tools/qgdict.cpp @@ -92,7 +92,7 @@ int TQGDict::hashKeyString( const TQString &key ) { #if defined(QT_CHECK_NULL) if ( key.isNull() ) - qWarning( "TQGDict::hashKeyString: Invalid null key" ); + tqWarning( "TQGDict::hashKeyString: Invalid null key" ); #endif int i; register uint h=0; @@ -127,7 +127,7 @@ int TQGDict::hashKeyAscii( const char *key ) { #if defined(QT_CHECK_NULL) if ( key == 0 ) - qWarning( "TQGDict::hashAsciiKey: Invalid null key" ); + tqWarning( "TQGDict::hashAsciiKey: Invalid null key" ); #endif register const char *k = key; register uint h=0; @@ -361,7 +361,7 @@ TQPtrCollection::Item TQGDict::look_string( const TQString &key, TQPtrCollection TQ_CHECK_PTR( n ); #if defined(QT_CHECK_NULL) if ( n->getData() == 0 ) - qWarning( "TQDict: Cannot insert null item" ); + tqWarning( "TQDict: Cannot insert null item" ); #endif vec[index] = n; numItems++; @@ -382,7 +382,7 @@ TQPtrCollection::Item TQGDict::look_ascii( const char *key, TQPtrCollection::Ite } else { for ( n=(TQAsciiBucket*)vec[index]; n; n=(TQAsciiBucket*)n->getNext() ) { - if ( qstricmp(n->getKey(),key) == 0 ) + if ( tqstricmp(n->getKey(),key) == 0 ) return n->getData(); // item found } } @@ -393,11 +393,11 @@ TQPtrCollection::Item TQGDict::look_ascii( const char *key, TQPtrCollection::Ite remove_ascii( key ); } // op_insert or op_replace - n = new TQAsciiBucket(copyk ? qstrdup(key) : key,newItem(d),vec[index]); + n = new TQAsciiBucket(copyk ? tqstrdup(key) : key,newItem(d),vec[index]); TQ_CHECK_PTR( n ); #if defined(QT_CHECK_NULL) if ( n->getData() == 0 ) - qWarning( "TQAsciiDict: Cannot insert null item" ); + tqWarning( "TQAsciiDict: Cannot insert null item" ); #endif vec[index] = n; numItems++; @@ -425,7 +425,7 @@ TQPtrCollection::Item TQGDict::look_int( long key, TQPtrCollection::Item d, int TQ_CHECK_PTR( n ); #if defined(QT_CHECK_NULL) if ( n->getData() == 0 ) - qWarning( "TQIntDict: Cannot insert null item" ); + tqWarning( "TQIntDict: Cannot insert null item" ); #endif vec[index] = n; numItems++; @@ -453,7 +453,7 @@ TQPtrCollection::Item TQGDict::look_ptr( void *key, TQPtrCollection::Item d, int TQ_CHECK_PTR( n ); #if defined(QT_CHECK_NULL) if ( n->getData() == 0 ) - qWarning( "TQPtrDict: Cannot insert null item" ); + tqWarning( "TQPtrDict: Cannot insert null item" ); #endif vec[index] = n; numItems++; @@ -610,7 +610,7 @@ TQAsciiBucket *TQGDict::unlink_ascii( const char *key, TQPtrCollection::Item d ) int index = hashKeyAscii(key) % vlen; for ( n=(TQAsciiBucket *)vec[index]; n; n=(TQAsciiBucket *)n->getNext() ) { bool found = (cases ? qstrcmp(n->getKey(),key) - : qstricmp(n->getKey(),key)) == 0; + : tqstricmp(n->getKey(),key)) == 0; if ( found && d ) found = (n->getData() == d); if ( found ) { @@ -846,11 +846,11 @@ void TQGDict::statistics() const TQString line; line.fill( '-', 60 ); double real, ideal; - qDebug( "%s", line.ascii() ); - qDebug( "DICTIONARY STATISTICS:" ); + tqDebug( "%s", line.ascii() ); + tqDebug( "DICTIONARY STATISTICS:" ); if ( count() == 0 ) { - qDebug( "Empty!" ); - qDebug( "%s", line.ascii() ); + tqDebug( "Empty!" ); + tqDebug( "%s", line.ascii() ); return; } real = 0.0; @@ -871,15 +871,15 @@ void TQGDict::statistics() const while ( b-- ) *pbuf++ = '*'; *pbuf = '\0'; - qDebug( "%s", buf ); + tqDebug( "%s", buf ); i++; } - qDebug( "Array size = %d", size() ); - qDebug( "# items = %d", count() ); - qDebug( "Real dist = %g", real ); - qDebug( "Rand dist = %g", ideal ); - qDebug( "Real/Rand = %g", real/ideal ); - qDebug( "%s", line.ascii() ); + tqDebug( "Array size = %d", size() ); + tqDebug( "# items = %d", count() ); + tqDebug( "Real dist = %g", real ); + tqDebug( "Rand dist = %g", ideal ); + tqDebug( "Real/Rand = %g", real/ideal ); + tqDebug( "%s", line.ascii() ); #endif // QT_DEBUG } @@ -1072,7 +1072,7 @@ TQPtrCollection::Item TQGDictIterator::toFirst() { if ( !dict ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGDictIterator::toFirst: Dictionary has been deleted" ); + tqWarning( "TQGDictIterator::toFirst: Dictionary has been deleted" ); #endif return 0; } @@ -1098,7 +1098,7 @@ TQPtrCollection::Item TQGDictIterator::operator()() { if ( !dict ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGDictIterator::operator(): Dictionary has been deleted" ); + tqWarning( "TQGDictIterator::operator(): Dictionary has been deleted" ); #endif return 0; } @@ -1117,7 +1117,7 @@ TQPtrCollection::Item TQGDictIterator::operator++() { if ( !dict ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGDictIterator::operator++: Dictionary has been deleted" ); + tqWarning( "TQGDictIterator::operator++: Dictionary has been deleted" ); #endif return 0; } diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index b67b11540..f1c89023b 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -516,7 +516,7 @@ bool TQGList::removeNode( TQLNode *n ) #if defined(QT_CHECK_NULL) if ( n == 0 || (n->prev && n->prev->next != n) || (n->next && n->next->prev != n) ) { - qWarning( "TQGList::removeNode: Corrupted node" ); + tqWarning( "TQGList::removeNode: Corrupted node" ); return FALSE; } #endif @@ -618,7 +618,7 @@ TQPtrCollection::Item TQGList::takeNode( TQLNode *n ) #if defined(QT_CHECK_NULL) if ( n == 0 || (n->prev && n->prev->next != n) || (n->next && n->next->prev != n) ) { - qWarning( "TQGList::takeNode: Corrupted node" ); + tqWarning( "TQGList::takeNode: Corrupted node" ); return 0; } #endif @@ -1171,7 +1171,7 @@ TQPtrCollection::Item TQGListIterator::toFirst() { if ( !list ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGListIterator::toFirst: List has been deleted" ); + tqWarning( "TQGListIterator::toFirst: List has been deleted" ); #endif return 0; } @@ -1187,7 +1187,7 @@ TQPtrCollection::Item TQGListIterator::toLast() { if ( !list ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGListIterator::toLast: List has been deleted" ); + tqWarning( "TQGListIterator::toLast: List has been deleted" ); #endif return 0; } diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index baf6e6f69..f2c92c2e0 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -63,12 +63,12 @@ 3.0.5's \c TQT_VERSION is 0x030005. */ -const char *qVersion() +const char *tqVersion() { return TQT_VERSION_STR; } -bool qSharedBuild() +bool tqSharedBuild() { #ifdef QT_SHARED return TRUE; @@ -94,12 +94,12 @@ static bool si_bigEndian; *wordSize. The \a *bigEndian is set to TRUE if this is a big-endian machine, or to FALSE if this is a little-endian machine. - In debug mode, this function calls qFatal() with a message if the + In debug mode, this function calls tqFatal() with a message if the computer is truly weird (i.e. different endianness for 16 bit and 32 bit integers); in release mode it returns FALSE. */ -bool qSysInfo( int *wordSize, bool *bigEndian ) +bool tqSysInfo( int *wordSize, bool *bigEndian ) { #if defined(QT_CHECK_NULL) Q_ASSERT( wordSize != 0 ); @@ -124,14 +124,14 @@ bool qSysInfo( int *wordSize, bool *bigEndian ) *wordSize != 32 && *wordSize != 16 ) { // word size: 16, 32 or 64 #if defined(QT_CHECK_RANGE) - qFatal( "qSysInfo: Unsupported system word size %d", *wordSize ); + tqFatal( "qSysInfo: Unsupported system word size %d", *wordSize ); #endif return FALSE; } if ( sizeof(Q_INT8) != 1 || sizeof(Q_INT16) != 2 || sizeof(Q_INT32) != 4 || sizeof(Q_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) { #if defined(QT_CHECK_RANGE) - qFatal( "qSysInfo: Unsupported system data type size" ); + tqFatal( "qSysInfo: Unsupported system data type size" ); #endif return FALSE; } @@ -154,7 +154,7 @@ bool qSysInfo( int *wordSize, bool *bigEndian ) if ( be16 != be32 ) { // strange machine! #if defined(QT_CHECK_RANGE) - qFatal( "qSysInfo: Inconsistent system byte order" ); + tqFatal( "qSysInfo: Inconsistent system byte order" ); #endif return FALSE; } @@ -321,7 +321,7 @@ int qWinVersion() } else if ( osver.dwMinorVersion == 2 ) { winver = TQt::WV_2003; } else { - qWarning("Untested Windows version detected!"); + tqWarning("Untested Windows version detected!"); winver = TQt::WV_NT_based; } } @@ -346,7 +346,7 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); *****************************************************************************/ /*! - \fn void qDebug( const char *msg, ... ) + \fn void tqDebug( const char *msg, ... ) \relates TQApplication @@ -358,7 +358,7 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); Example: \code - qDebug( "my window handle = %x", myWidget->id() ); + tqDebug( "my window handle = %x", myWidget->id() ); \endcode Under X11, the text is printed to stderr. Under Windows, the text @@ -367,15 +367,15 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); \warning The internal buffer is limited to 8196 bytes (including the '\0'-terminator). - \warning Passing (const char *)0 as argument to qDebug might lead + \warning Passing (const char *)0 as argument to tqDebug might lead to crashes on certain platforms due to the platforms printf implementation. - \sa qWarning(), qFatal(), qInstallMsgHandler(), + \sa tqWarning(), tqFatal(), qInstallMsgHandler(), \link debug.html Debugging\endlink */ /*! - \fn void qWarning( const char *msg, ... ) + \fn void tqWarning( const char *msg, ... ) \relates TQApplication @@ -390,7 +390,7 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); void f( int c ) { if ( c > 200 ) - qWarning( "f: bad argument, c == %d", c ); + tqWarning( "f: bad argument, c == %d", c ); } \endcode @@ -400,15 +400,15 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); \warning The internal buffer is limited to 8196 bytes (including the '\0'-terminator). - \warning Passing (const char *)0 as argument to qWarning might lead + \warning Passing (const char *)0 as argument to tqWarning might lead to crashes on certain platforms due to the platforms printf implementation. - \sa qDebug(), qFatal(), qInstallMsgHandler(), + \sa tqDebug(), tqFatal(), qInstallMsgHandler(), \link debug.html Debugging\endlink */ /*! - \fn void qFatal( const char *msg, ... ) + \fn void tqFatal( const char *msg, ... ) \relates TQApplication @@ -423,7 +423,7 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); int divide( int a, int b ) { if ( b == 0 ) // program error - qFatal( "divide: cannot divide by zero" ); + tqFatal( "divide: cannot divide by zero" ); return a/b; } \endcode @@ -434,10 +434,10 @@ TQt::WindowsVersion qt_winver = (TQt::WindowsVersion)qWinVersion(); \warning The internal buffer is limited to 8196 bytes (including the '\0'-terminator). - \warning Passing (const char *)0 as argument to qFatal might lead + \warning Passing (const char *)0 as argument to tqFatal might lead to crashes on certain platforms due to the platforms printf implementation. - \sa qDebug(), qWarning(), qInstallMsgHandler(), + \sa tqDebug(), tqWarning(), qInstallMsgHandler(), \link debug.html Debugging\endlink */ @@ -465,7 +465,7 @@ static void mac_default_handler( const char *msg ) #endif -void qDebug( const char *msg, ... ) +void tqDebug( const char *msg, ... ) { char buf[QT_BUFFER_LENGTH]; va_list ap; @@ -516,7 +516,7 @@ void debug( const char *msg, ... ) } } -void qWarning( const char *msg, ... ) +void tqWarning( const char *msg, ... ) { char buf[QT_BUFFER_LENGTH]; va_list ap; @@ -568,7 +568,7 @@ void warning( const char *msg, ... ) } } -void qFatal( const char *msg, ... ) +void tqFatal( const char *msg, ... ) { char buf[QT_BUFFER_LENGTH]; va_list ap; @@ -646,7 +646,7 @@ void fatal( const char *msg, ... ) This function does nothing when TQt is built with \c QT_NO_DEBUG defined. */ -void qSystemWarning( const char* msg, int code ) +void tqSystemWarning( const char* msg, int code ) { #ifndef QT_NO_DEBUG #if defined(Q_OS_WIN32) @@ -666,7 +666,7 @@ void qSystemWarning( const char* msg, int code ) 0, NULL ); - qWarning( "%s\n\tError code %d - %s", msg, code, TQString::fromUcs2(string).latin1() ); + tqWarning( "%s\n\tError code %d - %s", msg, code, TQString::fromUcs2(string).latin1() ); }, { FormatMessageA( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM, NULL, @@ -676,14 +676,14 @@ void qSystemWarning( const char* msg, int code ) 0, NULL ); - qWarning( "%s\n\tError code %d - %s", msg, code, (const char*)string ); + tqWarning( "%s\n\tError code %d - %s", msg, code, (const char*)string ); } ); LocalFree( (HLOCAL)string ); #else if ( code != -1 ) - qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); + tqWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) ); else - qWarning( "%s", msg ); + tqWarning( "%s", msg ); #endif #else Q_UNUSED( msg ); @@ -719,12 +719,12 @@ void qSystemWarning( const char* msg, int code ) \endcode If \c b is zero, the Q_ASSERT statement will output the following - message using the qWarning() function: + message using the tqWarning() function: \code ASSERT: "b != 0" in div.cpp (9) \endcode - \sa qWarning(), \link debug.html Debugging\endlink + \sa tqWarning(), \link debug.html Debugging\endlink */ @@ -748,7 +748,7 @@ void qSystemWarning( const char* msg, int code ) TQ_CHECK_PTR( a ); \endcode - \sa qWarning(), \link debug.html Debugging\endlink + \sa tqWarning(), \link debug.html Debugging\endlink */ @@ -757,14 +757,14 @@ void qSystemWarning( const char* msg, int code ) // #if (TQT_VERSION-0 >= 0x040000) #if defined(Q_CC_GNU) -#warning "Change TQ_CHECK_PTR to '{if ((p)==0) qt_check_pointer(__FILE__,__LINE__);}'" -#warning "No need for qt_check_pointer() to return a value - make it void!" +#warning "Change TQ_CHECK_PTR to '{if ((p)==0) tqt_check_pointer(__FILE__,__LINE__);}'" +#warning "No need for tqt_check_pointer() to return a value - make it void!" #endif #endif -bool qt_check_pointer( bool c, const char *n, int l ) +bool tqt_check_pointer( bool c, const char *n, int l ) { if ( c ) - qWarning( "In file %s, line %d: Out of memory", n, l ); + tqWarning( "In file %s, line %d: Out of memory", n, l ); return TRUE; } @@ -775,7 +775,7 @@ static bool firstObsoleteWarning(const char *obj, const char *oldfunc ) if ( !obsoleteDict ) { // first time func is called obsoleteDict = new TQAsciiDict<int>; #if defined(QT_DEBUG) - qDebug( + tqDebug( "You are using obsolete functions in the TQt library. Call the function\n" "qSuppressObsoleteWarnings() to suppress obsolete warnings.\n" ); @@ -793,44 +793,44 @@ static bool firstObsoleteWarning(const char *obj, const char *oldfunc ) static bool suppressObsolete = FALSE; -void qSuppressObsoleteWarnings( bool suppress ) +void tqSuppressObsoleteWarnings( bool suppress ) { suppressObsolete = suppress; } -void qObsolete( const char *obj, const char *oldfunc, const char *newfunc ) +void tqObsolete( const char *obj, const char *oldfunc, const char *newfunc ) { if ( suppressObsolete ) return; if ( !firstObsoleteWarning(obj, oldfunc) ) return; if ( obj ) - qDebug( "%s::%s: This function is obsolete, use %s instead.", + tqDebug( "%s::%s: This function is obsolete, use %s instead.", obj, oldfunc, newfunc ); else - qDebug( "%s: This function is obsolete, use %s instead.", + tqDebug( "%s: This function is obsolete, use %s instead.", oldfunc, newfunc ); } -void qObsolete( const char *obj, const char *oldfunc ) +void tqObsolete( const char *obj, const char *oldfunc ) { if ( suppressObsolete ) return; if ( !firstObsoleteWarning(obj, oldfunc) ) return; if ( obj ) - qDebug( "%s::%s: This function is obsolete.", obj, oldfunc ); + tqDebug( "%s::%s: This function is obsolete.", obj, oldfunc ); else - qDebug( "%s: This function is obsolete.", oldfunc ); + tqDebug( "%s: This function is obsolete.", oldfunc ); } -void qObsolete( const char *message ) +void tqObsolete( const char *message ) { if ( suppressObsolete ) return; if ( !firstObsoleteWarning( "TQt", message) ) return; - qDebug( "%s", message ); + tqDebug( "%s", message ); } @@ -886,7 +886,7 @@ void qObsolete( const char *message ) } \endcode - \sa qDebug(), qWarning(), qFatal(), \link debug.html Debugging\endlink + \sa tqDebug(), tqWarning(), tqFatal(), \link debug.html Debugging\endlink */ TQtMsgHandler qInstallMsgHandler( TQtMsgHandler h ) diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp index 5c428f924..ac8a2eebe 100644 --- a/src/tools/qgpluginmanager.cpp +++ b/src/tools/qgpluginmanager.cpp @@ -501,12 +501,12 @@ bool TQGPluginManager::addLibrary( TQLibrary* lib ) if ( !takeFirst ) { useful = TRUE; plugDict.replace( *f, plugin ); - qWarning("%s: Discarding feature %s in %s!", + tqWarning("%s: Discarding feature %s in %s!", (const char*) TQFile::encodeName( plugin->library()), (*f).latin1(), (const char*) TQFile::encodeName( old->library() ) ); } else { - qWarning("%s: Feature %s already defined in %s!", + tqWarning("%s: Feature %s already defined in %s!", (const char*) TQFile::encodeName( old->library() ), (*f).latin1(), (const char*) TQFile::encodeName( plugin->library() ) ); diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp index 90bb88e07..af896ab72 100644 --- a/src/tools/qgvector.cpp +++ b/src/tools/qgvector.cpp @@ -236,7 +236,7 @@ bool TQGVector::insert( uint index, Item d ) // insert item at index { #if defined(QT_CHECK_RANGE) if ( index >= len ) { // range error - qWarning( "TQGVector::insert: Index %d out of range", index ); + tqWarning( "TQGVector::insert: Index %d out of range", index ); return FALSE; } #endif @@ -259,7 +259,7 @@ bool TQGVector::remove( uint index ) // remove item at index { #if defined(QT_CHECK_RANGE) if ( index >= len ) { // range error - qWarning( "TQGVector::remove: Index %d out of range", index ); + tqWarning( "TQGVector::remove: Index %d out of range", index ); return FALSE; } #endif @@ -275,7 +275,7 @@ TQPtrCollection::Item TQGVector::take( uint index ) // take out item { #if defined(QT_CHECK_RANGE) if ( index >= len ) { // range error - qWarning( "TQGVector::take: Index %d out of range", index ); + tqWarning( "TQGVector::take: Index %d out of range", index ); return 0; } #endif @@ -406,8 +406,8 @@ void TQGVector::sort() // sort vector } #ifdef QT_THREAD_SUPPORT - TQMutexLocker locker( qt_global_mutexpool ? - qt_global_mutexpool->get( &sort_vec ) : 0 ); + TQMutexLocker locker( tqt_global_mutexpool ? + tqt_global_mutexpool->get( &sort_vec ) : 0 ); #endif // QT_THREAD_SUPPORT sort_vec = (TQGVector*)this; @@ -421,7 +421,7 @@ int TQGVector::bsearch( Item d ) const // binary search; when sorted return -1; if ( !d ) { #if defined(QT_CHECK_NULL) - qWarning( "TQGVector::bsearch: Cannot search for null object" ); + tqWarning( "TQGVector::bsearch: Cannot search for null object" ); #endif return -1; } @@ -457,7 +457,7 @@ int TQGVector::findRef( Item d, uint index) const // find exact item in vector { #if defined(QT_CHECK_RANGE) if ( index > len ) { // range error - qWarning( "TQGVector::findRef: Index %d out of range", index ); + tqWarning( "TQGVector::findRef: Index %d out of range", index ); return -1; } #endif @@ -472,7 +472,7 @@ int TQGVector::find( Item d, uint index ) const // find equal item in vector { #if defined(QT_CHECK_RANGE) if ( index >= len ) { // range error - qWarning( "TQGVector::find: Index %d out of range", index ); + tqWarning( "TQGVector::find: Index %d out of range", index ); return -1; } #endif @@ -530,7 +530,7 @@ void TQGVector::toList( TQGList *list ) const // store items in list void TQGVector::warningIndexRange( uint i ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQGVector::operator[]: Index %d out of range", i ); + tqWarning( "TQGVector::operator[]: Index %d out of range", i ); #else Q_UNUSED( i ) #endif diff --git a/src/tools/qiodevice.cpp b/src/tools/qiodevice.cpp index 64c39915f..6e584ec45 100644 --- a/src/tools/qiodevice.cpp +++ b/src/tools/qiodevice.cpp @@ -431,7 +431,7 @@ void TQIODevice::setType( int t ) { #if defined(QT_CHECK_RANGE) if ( (t & IO_TypeMask) != t ) - qWarning( "TQIODevice::setType: Specified type out of range" ); + tqWarning( "TQIODevice::setType: Specified type out of range" ); #endif ioMode &= ~IO_TypeMask; // reset type bits ioMode |= t; @@ -447,7 +447,7 @@ void TQIODevice::setMode( int m ) { #if defined(QT_CHECK_RANGE) if ( (m & IO_ModeMask) != m ) - qWarning( "TQIODevice::setMode: Specified mode out of range" ); + tqWarning( "TQIODevice::setMode: Specified mode out of range" ); #endif ioMode &= ~IO_ModeMask; // reset mode bits ioMode |= m; @@ -463,7 +463,7 @@ void TQIODevice::setState( int s ) { #if defined(QT_CHECK_RANGE) if ( ((uint)s & IO_StateMask) != (uint)s ) - qWarning( "TQIODevice::setState: Specified state out of range" ); + tqWarning( "TQIODevice::setState: Specified state out of range" ); #endif ioMode &= ~IO_StateMask; // reset state bits ioMode |= (uint)s; @@ -569,9 +569,9 @@ bool TQIODevice::at( Offset pos ) #if defined(QT_CHECK_RANGE) if ( pos > size() ) { #if defined(QT_ABI_QT4) - qWarning( "TQIODevice::at: Index %lld out of range", pos ); + tqWarning( "TQIODevice::at: Index %lld out of range", pos ); #else - qWarning( "TQIODevice::at: Index %lu out of range", pos ); + tqWarning( "TQIODevice::at: Index %lu out of range", pos ); #endif return FALSE; } diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp index a96e0c068..80a328d8b 100644 --- a/src/tools/qlibrary.cpp +++ b/src/tools/qlibrary.cpp @@ -342,13 +342,13 @@ bool TQLibrary::unload() #if !defined(QT_NO_LIBRARY_UNLOAD) if ( !d->freeLibrary() ) { # if defined(QT_DEBUG_COMPONENT) - qWarning( "%s could not be unloaded", (const char*) TQFile::encodeName(library()) ); + tqWarning( "%s could not be unloaded", (const char*) TQFile::encodeName(library()) ); # endif return FALSE; } # if defined(QT_DEBUG_COMPONENT) && QT_DEBUG_COMPONENT == 2 - qWarning( "%s has been unloaded", (const char*) TQFile::encodeName(library()) ); + tqWarning( "%s has been unloaded", (const char*) TQFile::encodeName(library()) ); # endif d->pHnd = 0; #endif diff --git a/src/tools/qlibrary_unix.cpp b/src/tools/qlibrary_unix.cpp index 6ca49a37e..09962d283 100644 --- a/src/tools/qlibrary_unix.cpp +++ b/src/tools/qlibrary_unix.cpp @@ -68,7 +68,7 @@ bool TQLibraryPrivate::loadLibrary() pHnd = (void*)shl_load( filename.latin1(), BIND_DEFERRED | BIND_NONFATAL | DYNAMIC_PATH, 0 ); #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) if ( !pHnd ) - qWarning( "%s: failed to load library!", filename.latin1() ); + tqWarning( "%s: failed to load library!", filename.latin1() ); #endif return pHnd != 0; } @@ -81,7 +81,7 @@ bool TQLibraryPrivate::freeLibrary() if ( shl_unload( (shl_t)pHnd ) ) { #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) TQString filename = library->library(); - qWarning( "%s: Failed to unload library!", filename.latin1() ); + tqWarning( "%s: Failed to unload library!", filename.latin1() ); #endif return FALSE; } @@ -98,7 +98,7 @@ void* TQLibraryPrivate::resolveSymbol( const char* symbol ) if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) { #if defined(QT_DEBUG_COMPONENT) TQString filename = library->library(); - qWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol ); + tqWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol ); #endif } return address; @@ -120,7 +120,7 @@ bool TQLibraryPrivate::loadLibrary() pHnd = DL_PREFIX(dlopen)( filename.latin1(), RTLD_LAZY ); #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) if ( !pHnd ) - qWarning( "%s", DL_PREFIX(dlerror)() ); + tqWarning( "%s", DL_PREFIX(dlerror)() ); #endif return pHnd != 0; } @@ -132,7 +132,7 @@ bool TQLibraryPrivate::freeLibrary() if ( DL_PREFIX(dlclose)( pHnd ) ) { #if defined(QT_DEBUG) || defined(QT_DEBUG_COMPONENT) - qWarning( "%s", DL_PREFIX(dlerror)() ); + tqWarning( "%s", DL_PREFIX(dlerror)() ); #endif return FALSE; } @@ -159,7 +159,7 @@ void* TQLibraryPrivate::resolveSymbol( const char* symbol ) #if defined(QT_DEBUG_COMPONENT) const char* error = DL_PREFIX(dlerror)(); if ( error ) - qWarning( "%s", error ); + tqWarning( "%s", error ); #endif return address; } diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp index ce2e1647b..3dabc3ee6 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/qlocale.cpp @@ -3071,7 +3071,7 @@ static char digitToCLocale(TQChar zero, TQChar d) && zero.unicode() + 10 > d.unicode()) return '0' + d.unicode() - zero.unicode(); - qWarning("TQLocalePrivate::digitToCLocale(): bad digit: row=%d, cell=%d", d.row(), d.cell()); + tqWarning("TQLocalePrivate::digitToCLocale(): bad digit: row=%d, cell=%d", d.row(), d.cell()); return TQChar(0); } @@ -3246,7 +3246,7 @@ TQString TQLocalePrivate::doubleToString(double d, #ifdef QT_QLOCALE_USES_FCVT #ifdef QT_THREAD_SUPPORT static bool dummy_for_mutex; - TQMutex *fcvt_mutex = qt_global_mutexpool ? qt_global_mutexpool->get( &dummy_for_mutex ) : 0; + TQMutex *fcvt_mutex = tqt_global_mutexpool ? tqt_global_mutexpool->get( &dummy_for_mutex ) : 0; # define FCVT_LOCK if (fcvt_mutex) fcvt_mutex->lock() # define FCVT_UNLOCK if (fcvt_mutex) fcvt_mutex->unlock() #else diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp index 146edbec9..b69661ad1 100644 --- a/src/tools/qmutex_unix.cpp +++ b/src/tools/qmutex_unix.cpp @@ -119,7 +119,7 @@ TQMutexPrivate::~TQMutexPrivate() #ifdef QT_CHECK_RANGE if ( ret ) - qWarning( "Mutex destroy failure: %s", strerror( ret ) ); + tqWarning( "Mutex destroy failure: %s", strerror( ret ) ); #endif } @@ -136,7 +136,7 @@ TQRealMutexPrivate::TQRealMutexPrivate(bool recurs) #ifdef QT_CHECK_RANGE if( ret ) - qWarning( "Mutex init failure: %s", strerror( ret ) ); + tqWarning( "Mutex init failure: %s", strerror( ret ) ); #endif // QT_CHECK_RANGE } @@ -146,7 +146,7 @@ void TQRealMutexPrivate::lock() #ifdef QT_CHECK_RANGE if (ret) - qWarning("Mutex lock failure: %s", strerror(ret)); + tqWarning("Mutex lock failure: %s", strerror(ret)); #endif } @@ -156,7 +156,7 @@ void TQRealMutexPrivate::unlock() #ifdef QT_CHECK_RANGE if (ret) - qWarning("Mutex unlock failure: %s", strerror(ret)); + tqWarning("Mutex unlock failure: %s", strerror(ret)); #endif } @@ -168,7 +168,7 @@ bool TQRealMutexPrivate::locked() return TRUE; } else if (ret) { #ifdef QT_CHECK_RANGE - qWarning("Mutex locktest failure: %s", strerror(ret)); + tqWarning("Mutex locktest failure: %s", strerror(ret)); #endif } else pthread_mutex_unlock(&handle); @@ -184,7 +184,7 @@ bool TQRealMutexPrivate::trylock() return FALSE; } else if (ret) { #ifdef QT_CHECK_RANGE - qWarning("Mutex trylock failure: %s", strerror(ret)); + tqWarning("Mutex trylock failure: %s", strerror(ret)); #endif return FALSE; } @@ -210,7 +210,7 @@ TQRecursiveMutexPrivate::TQRecursiveMutexPrivate() # ifdef QT_CHECK_RANGE if (ret) - qWarning( "Mutex init failure: %s", strerror(ret) ); + tqWarning( "Mutex init failure: %s", strerror(ret) ); # endif pthread_mutexattr_init(&attr); @@ -219,7 +219,7 @@ TQRecursiveMutexPrivate::TQRecursiveMutexPrivate() # ifdef QT_CHECK_RANGE if (ret) - qWarning( "Mutex init failure: %s", strerror(ret) ); + tqWarning( "Mutex init failure: %s", strerror(ret) ); # endif } @@ -229,7 +229,7 @@ TQRecursiveMutexPrivate::~TQRecursiveMutexPrivate() # ifdef QT_CHECK_RANGE if (ret) - qWarning( "Mutex destroy failure: %s", strerror(ret) ); + tqWarning( "Mutex destroy failure: %s", strerror(ret) ); # endif } @@ -263,8 +263,8 @@ void TQRecursiveMutexPrivate::unlock() } } else { #ifdef QT_CHECK_RANGE - qWarning("TQMutex::unlock: unlock from different thread than locker"); - qWarning(" was locked by %d, unlock attempt from %d", + tqWarning("TQMutex::unlock: unlock from different thread than locker"); + tqWarning(" was locked by %d, unlock attempt from %d", (int)owner, (int)pthread_self()); #endif } @@ -284,7 +284,7 @@ bool TQRecursiveMutexPrivate::locked() } else { #ifdef QT_CHECK_RANGE if (code) - qWarning("Mutex trylock failure: %s", strerror(code)); + tqWarning("Mutex trylock failure: %s", strerror(code)); #endif pthread_mutex_unlock(&handle); @@ -311,7 +311,7 @@ bool TQRecursiveMutexPrivate::trylock() ret = FALSE; } else if (code) { #ifdef QT_CHECK_RANGE - qWarning("Mutex trylock failure: %s", strerror(code)); + tqWarning("Mutex trylock failure: %s", strerror(code)); #endif ret = FALSE; } else { diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp index 48f1beeb4..5bc6cce2f 100644 --- a/src/tools/qmutexpool.cpp +++ b/src/tools/qmutexpool.cpp @@ -42,7 +42,7 @@ #include <ntqthread.h> -Q_EXPORT TQMutexPool *qt_global_mutexpool = 0; +Q_EXPORT TQMutexPool *tqt_global_mutexpool = 0; /*! diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h index 67bd23c03..e560c994c 100644 --- a/src/tools/qmutexpool_p.h +++ b/src/tools/qmutexpool_p.h @@ -73,7 +73,7 @@ private: bool recurs; }; -extern Q_EXPORT TQMutexPool *qt_global_mutexpool; +extern Q_EXPORT TQMutexPool *tqt_global_mutexpool; #endif // QT_THREAD_SUPPORT diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 5338e6dbb..7330f4f1a 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -1516,49 +1516,49 @@ void TQRegExpEngine::heuristicallyChooseHeuristic() void TQRegExpEngine::dump() const { int i, j; - qDebug( "Case %ssensitive engine", cs ? "" : "in" ); - qDebug( " States" ); + tqDebug( "Case %ssensitive engine", cs ? "" : "in" ); + tqDebug( " States" ); for ( i = 0; i < ns; i++ ) { - qDebug( " %d%s", i, + tqDebug( " %d%s", i, i == InitialState ? " (initial)" : i == FinalState ? " (final)" : "" ); #ifndef QT_NO_REGEXP_CAPTURE - qDebug( " in atom %d", s[i]->atom ); + tqDebug( " in atom %d", s[i]->atom ); #endif int m = s[i]->match; if ( (m & CharClassBit) != 0 ) { - qDebug( " match character class %d", m ^ CharClassBit ); + tqDebug( " match character class %d", m ^ CharClassBit ); #ifndef QT_NO_REGEXP_CCLASS cl[m ^ CharClassBit]->dump(); #else - qDebug( " negative character class" ); + tqDebug( " negative character class" ); #endif } else if ( (m & BackRefBit) != 0 ) { - qDebug( " match back-reference %d", m ^ BackRefBit ); + tqDebug( " match back-reference %d", m ^ BackRefBit ); } else if ( m >= 0x20 && m <= 0x7e ) { - qDebug( " match 0x%.4x (%c)", m, m ); + tqDebug( " match 0x%.4x (%c)", m, m ); } else { - qDebug( " match 0x%.4x", m ); + tqDebug( " match 0x%.4x", m ); } for ( j = 0; j < (int) s[i]->outs.size(); j++ ) { int next = s[i]->outs[j]; - qDebug( " -> %d", next ); + tqDebug( " -> %d", next ); if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) ) - qDebug( " [reenter %d]", (*s[i]->reenter)[next] ); + tqDebug( " [reenter %d]", (*s[i]->reenter)[next] ); if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 ) - qDebug( " [anchors 0x%.8x]", (*s[i]->anchors)[next] ); + tqDebug( " [anchors 0x%.8x]", (*s[i]->anchors)[next] ); } } #ifndef QT_NO_REGEXP_CAPTURE if ( nf > 0 ) { - qDebug( " Atom Parent Capture" ); + tqDebug( " Atom Parent Capture" ); for ( i = 0; i < nf; i++ ) - qDebug( " %6d %6d %6d", i, f[i].parent, f[i].capture ); + tqDebug( " %6d %6d %6d", i, f[i].parent, f[i].capture ); } #endif #ifndef QT_NO_REGEXP_ANCHOR_ALT for ( i = 0; i < (int) aa.size(); i++ ) - qDebug( " Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, + tqDebug( " Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a, aa[i].b ); #endif } @@ -2290,13 +2290,13 @@ bool TQRegExpEngine::CharClass::in( TQChar ch ) const void TQRegExpEngine::CharClass::dump() const { int i; - qDebug( " %stive character class", n ? "nega" : "posi" ); + tqDebug( " %stive character class", n ? "nega" : "posi" ); #ifndef QT_NO_REGEXP_CCLASS if ( c != 0 ) - qDebug( " categories 0x%.8x", c ); + tqDebug( " categories 0x%.8x", c ); #endif for ( i = 0; i < (int) r.size(); i++ ) - qDebug( " 0x%.4x through 0x%.4x", r[i].from, r[i].to ); + tqDebug( " 0x%.4x through 0x%.4x", r[i].from, r[i].to ); } #endif #endif @@ -2559,22 +2559,22 @@ void TQRegExpEngine::Box::setupHeuristics() void TQRegExpEngine::Box::dump() const { int i; - qDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" ); - qDebug( " Left states:" ); + tqDebug( "Box of at least %d character%s", minl, minl == 1 ? "" : "s" ); + tqDebug( " Left states:" ); for ( i = 0; i < (int) ls.size(); i++ ) { if ( at(lanchors, ls[i]) == 0 ) - qDebug( " %d", ls[i] ); + tqDebug( " %d", ls[i] ); else - qDebug( " %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] ); + tqDebug( " %d [anchors 0x%.8x]", ls[i], lanchors[ls[i]] ); } - qDebug( " Right states:" ); + tqDebug( " Right states:" ); for ( i = 0; i < (int) rs.size(); i++ ) { if ( at(ranchors, rs[i]) == 0 ) - qDebug( " %d", rs[i] ); + tqDebug( " %d", rs[i] ); else - qDebug( " %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] ); + tqDebug( " %d [anchors 0x%.8x]", rs[i], ranchors[rs[i]] ); } - qDebug( " Skip anchors: 0x%.8x", skipanchors ); + tqDebug( " Skip anchors: 0x%.8x", skipanchors ); } #endif diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp index 52fbd2765..ed3c328be 100644 --- a/src/tools/qsemaphore.cpp +++ b/src/tools/qsemaphore.cpp @@ -178,7 +178,7 @@ int TQSemaphore::operator+=(int n) if ( n < 0 || n > d->max ) { #ifdef QT_CHECK_RANGE - qWarning( "TQSemaphore::operator+=: paramter %d out of range", n ); + tqWarning( "TQSemaphore::operator+=: paramter %d out of range", n ); #endif // QT_CHECK_RANGE n = n < 0 ? 0 : d->max; } @@ -201,7 +201,7 @@ int TQSemaphore::operator-=(int n) if ( n < 0 || n > d->value ) { #ifdef QT_CHECK_RANGE - qWarning( "TQSemaphore::operator-=: paramter %d out of range", n ); + tqWarning( "TQSemaphore::operator-=: paramter %d out of range", n ); #endif // QT_CHECK_RANGE n = n < 0 ? 0 : d->value; } diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index 640d5643c..d5e9f81c0 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -345,7 +345,7 @@ void TQSettingsHeading::read(const TQString &filename) TQFile file(filename); if (! file.open(IO_ReadOnly)) { #if defined(QT_CHECK_STATE) - qWarning("TQSettings: failed to open file '%s'", filename.latin1()); + tqWarning("TQSettings: failed to open file '%s'", filename.latin1()); #endif return; } @@ -391,7 +391,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) } else { if (git == end()) { #if defined(QT_CHECK_STATE) - qWarning("TQSettings: line '%s' out of group", line.latin1()); + tqWarning("TQSettings: line '%s' out of group", line.latin1()); #endif return; } @@ -399,7 +399,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) int i = line.find('='); if (i == -1) { #if defined(QT_CHECK_STATE) - qWarning("TQSettings: malformed line '%s' in group '%s'", + tqWarning("TQSettings: malformed line '%s' in group '%s'", line.latin1(), git.key().latin1()); #endif return; @@ -430,7 +430,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) // still escaped at EOL - manually escaped "newline" if (stream.atEnd()) { #if defined(QT_CHECK_STATE) - qWarning("TQSettings: reached end of file, expected continued line"); + tqWarning("TQSettings: reached end of file, expected continued line"); #endif break; } @@ -503,13 +503,13 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format ) } ); #endif // Q_OS_TEMP #else - defPath = qInstallPathSysconf(); + defPath = tqInstallPathSysconf(); #endif TQDir dir(appSettings); if (! dir.exists()) { if (! dir.mkdir(dir.path())) #if defined(QT_CHECK_STATE) - qWarning("TQSettings: error creating %s", dir.path().latin1()); + tqWarning("TQSettings: error creating %s", dir.path().latin1()); #else ; #endif @@ -804,7 +804,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path) if ( !qt_verify_key( path ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() ); + tqWarning( "TQSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() ); #endif return; } @@ -844,7 +844,7 @@ void TQSettings::removeSearchPath( System s, const TQString &path) { if ( !qt_verify_key( path ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() ); + tqWarning( "TQSettings::insertSearchPath: Invalid key: '%s'", path.isNull() ? "(null)" : path.latin1() ); #endif return; } @@ -985,7 +985,7 @@ bool TQSettings::sync() if ( filename.isEmpty() ) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::sync: filename is null/empty"); + tqWarning("TQSettings::sync: filename is null/empty"); #endif // QT_CHECK_STATE success = FALSE; @@ -1000,7 +1000,7 @@ bool TQSettings::sync() if (! file.open(IO_WriteOnly)) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::sync: failed to open '%s' for writing", + tqWarning("TQSettings::sync: failed to open '%s' for writing", file.name().latin1()); #endif // QT_CHECK_STATE @@ -1041,7 +1041,7 @@ bool TQSettings::sync() if (file.status() != IO_Ok) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::sync: error at end of write"); + tqWarning("TQSettings::sync: error at end of write"); #endif // QT_CHECK_STATE success = FALSE; @@ -1055,7 +1055,7 @@ bool TQSettings::sync() !dir.rename( file.name(), filename, TRUE ) ) { #ifdef QT_CHECK_STATE - qWarning( "TQSettings::sync: error writing file '%s'", + tqWarning( "TQSettings::sync: error writing file '%s'", TQFile::encodeName( filename ).data() ); #endif // QT_CHECK_STATE @@ -1096,7 +1096,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok ) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::readBoolEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::readBoolEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif if ( ok ) *ok = FALSE; @@ -1121,7 +1121,7 @@ bool TQSettings::readBoolEntry(const TQString &key, bool def, bool *ok ) return FALSE; if (! value.isEmpty()) - qWarning("TQSettings::readBoolEntry: '%s' is not 'true' or 'false'", + tqWarning("TQSettings::readBoolEntry: '%s' is not 'true' or 'false'", value.latin1()); if ( ok ) *ok = FALSE; @@ -1148,7 +1148,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok ) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::readDoubleEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::readDoubleEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif if ( ok ) *ok = FALSE; @@ -1167,7 +1167,7 @@ double TQSettings::readDoubleEntry(const TQString &key, double def, bool *ok ) if ( conv_ok ) return retval; if ( ! value.isEmpty() ) - qWarning( "TQSettings::readDoubleEntry: '%s' is not a number", + tqWarning( "TQSettings::readDoubleEntry: '%s' is not a number", value.latin1() ); if ( ok ) *ok = FALSE; @@ -1194,7 +1194,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok ) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::readNumEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::readNumEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif if ( ok ) *ok = FALSE; @@ -1212,7 +1212,7 @@ int TQSettings::readNumEntry(const TQString &key, int def, bool *ok ) if ( conv_ok ) return retval; if ( ! value.isEmpty() ) - qWarning( "TQSettings::readNumEntry: '%s' is not a number", + tqWarning( "TQSettings::readNumEntry: '%s' is not a number", value.latin1() ); if ( ok ) *ok = FALSE; @@ -1239,7 +1239,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::readEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::readEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif if ( ok ) *ok = FALSE; @@ -1263,7 +1263,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o if (list.count() < 2) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::readEntry: invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::readEntry: invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE if ( ok ) *ok = FALSE; @@ -1321,7 +1321,7 @@ bool TQSettings::writeEntry(const TQString &key, bool value) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return FALSE; } @@ -1352,7 +1352,7 @@ bool TQSettings::writeEntry(const TQString &key, double value) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return FALSE; } @@ -1382,7 +1382,7 @@ bool TQSettings::writeEntry(const TQString &key, int value) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return FALSE; } @@ -1435,7 +1435,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::writeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return FALSE; } @@ -1454,7 +1454,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQString &value) if (list.count() < 2) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::writeEntry: invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::writeEntry: invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE return FALSE; @@ -1498,7 +1498,7 @@ bool TQSettings::removeEntry(const TQString &key) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::removeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::removeEntry: Invalid key: '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return FALSE; } @@ -1515,7 +1515,7 @@ bool TQSettings::removeEntry(const TQString &key) if (list.count() < 2) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::removeEntry: invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::removeEntry: invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE return FALSE; @@ -1578,7 +1578,7 @@ TQStringList TQSettings::entryList(const TQString &key) const TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::entryList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::entryList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return TQStringList(); } @@ -1595,7 +1595,7 @@ TQStringList TQSettings::entryList(const TQString &key) const if (list.count() < 1) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::listEntries: invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::listEntries: invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE return TQStringList(); @@ -1686,7 +1686,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::subkeyList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::subkeyList: Invalid key: %s", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return TQStringList(); } @@ -1704,7 +1704,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const if (list.count() < 1) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::subkeyList: invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::subkeyList: invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE return TQStringList(); @@ -1781,7 +1781,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key ) TQString grp_key( groupKey( group(), key ) ); if ( !qt_verify_key( grp_key ) ) { #if defined(QT_CHECK_STATE) - qWarning( "TQSettings::lastModificationTime: Invalid key '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); + tqWarning( "TQSettings::lastModificationTime: Invalid key '%s'", grp_key.isNull() ? "(null)" : grp_key.latin1() ); #endif return TQDateTime(); } @@ -1797,7 +1797,7 @@ TQDateTime TQSettings::lastModificationTime( const TQString &key ) if (list.count() < 2) { #ifdef QT_CHECK_STATE - qWarning("TQSettings::lastModificationTime: Invalid key '%s'", grp_key.latin1()); + tqWarning("TQSettings::lastModificationTime: Invalid key '%s'", grp_key.latin1()); #endif // QT_CHECK_STATE return TQDateTime(); @@ -2030,7 +2030,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope if (scope == User) actualSearchPath = TQDir::homeDirPath() + "/."; else - actualSearchPath = TQString(qInstallPathSysconf()) + "/"; + actualSearchPath = TQString(tqInstallPathSysconf()) + "/"; actualSearchPath += domain.mid( 0, lastDot ) + "/" + product; insertSearchPath( Unix, actualSearchPath ); #endif diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 756f12477..bb521868c 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -1986,7 +1986,7 @@ static TQString replaceArgEscapes(const TQString &s, const ArgEscapeData &d, int differ between languages. If there is no place marker (\c %1, \c %2, etc.), a warning - message (qWarning()) is output and the result is undefined. + message (tqWarning()) is output and the result is undefined. \warning If any placeholder occurs more than once, the result is undefined. @@ -1996,7 +1996,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning( "TQString::arg(): Argument missing: %s, %s", latin1(), + tqWarning( "TQString::arg(): Argument missing: %s, %s", latin1(), a.latin1() ); return *this; } @@ -2103,7 +2103,7 @@ TQString TQString::arg( Q_LLONG a, int fieldWidth, int base ) const ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning( "TQString::arg(): Argument missing: %s, %lld", latin1(), + tqWarning( "TQString::arg(): Argument missing: %s, %lld", latin1(), a ); return *this; } @@ -2133,7 +2133,7 @@ TQString TQString::arg( Q_ULLONG a, int fieldWidth, int base ) const ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning( "TQString::arg(): Argument missing: %s, %llu", latin1(), + tqWarning( "TQString::arg(): Argument missing: %s, %llu", latin1(), a ); return *this; } @@ -2249,7 +2249,7 @@ TQString TQString::arg( double a, int fieldWidth, char fmt, int prec ) const ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { - qWarning( "TQString::arg(): Argument missing: %s, %g", latin1(), + tqWarning( "TQString::arg(): Argument missing: %s, %g", latin1(), a ); return *this; } @@ -2281,7 +2281,7 @@ TQString TQString::arg( double a, int fieldWidth, char fmt, int prec ) const break; default: #if defined(QT_CHECK_RANGE) - qWarning( "TQString::setNum: Invalid format char '%c'", fmt ); + tqWarning( "TQString::setNum: Invalid format char '%c'", fmt ); #endif break; } @@ -2329,7 +2329,7 @@ TQString TQString::multiArg( int numArgs, const TQString& a1, const TQString& a2 } while ( lastDigit < 10 && digitUsed[lastDigit] == 0 ); if ( lastDigit == 10 ) { - qWarning( "TQString::arg(): Argument missing: %s, %s", + tqWarning( "TQString::arg(): Argument missing: %s, %s", latin1(), args[i]->latin1() ); numArgs = i; lastDigit = 9; @@ -4735,7 +4735,7 @@ Q_LLONG TQString::toLongLong( bool *ok, int base ) const { #if defined(QT_CHECK_RANGE) if ( base != 0 && (base < 2 || base > 36) ) { - qWarning( "TQString::toLongLong: Invalid base (%d)", base ); + tqWarning( "TQString::toLongLong: Invalid base (%d)", base ); base = 10; } #endif @@ -4825,7 +4825,7 @@ Q_ULLONG TQString::toULongLong( bool *ok, int base ) const { #if defined(QT_CHECK_RANGE) if ( base != 0 && (base < 2 || base > 36) ) { - qWarning( "TQString::toULongLong: Invalid base %d", base ); + tqWarning( "TQString::toULongLong: Invalid base %d", base ); base = 10; } #endif @@ -5153,7 +5153,7 @@ TQString &TQString::setNum( Q_LLONG n, int base ) { #if defined(QT_CHECK_RANGE) if ( base < 2 || base > 36 ) { - qWarning( "TQString::setNum: Invalid base %d", base ); + tqWarning( "TQString::setNum: Invalid base %d", base ); base = 10; } #endif @@ -5175,7 +5175,7 @@ TQString &TQString::setNum( Q_ULLONG n, int base ) { #if defined(QT_CHECK_RANGE) if ( base < 2 || base > 36 ) { - qWarning( "TQString::setNum: Invalid base %d", base ); + tqWarning( "TQString::setNum: Invalid base %d", base ); base = 10; } #endif @@ -5282,7 +5282,7 @@ TQString &TQString::setNum( double n, char f, int prec ) break; default: #if defined(QT_CHECK_RANGE) - qWarning( "TQString::setNum: Invalid format char '%c'", f ); + tqWarning( "TQString::setNum: Invalid format char '%c'", f ); #endif break; } @@ -7128,7 +7128,7 @@ TQCString qt_winTQString2MB( const TQString& s, int uclen ) } else { #ifndef QT_NO_DEBUG // Fail. - qWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)", + tqWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)", r, s.utf8().data()); #endif break; @@ -7154,7 +7154,7 @@ TQString qt_winMB2TQString( const char* mb, int mblen ) int r = GetLastError(); if ( r == ERROR_INSUFFICIENT_BUFFER ) { if ( wc != wc_auto ) { - qWarning("Size changed in MultiByteToWideChar"); + tqWarning("Size changed in MultiByteToWideChar"); break; } else { wclen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED, @@ -7164,7 +7164,7 @@ TQString qt_winMB2TQString( const char* mb, int mblen ) } } else { // Fail. - qWarning("MultiByteToWideChar cannot convert multibyte text"); + tqWarning("MultiByteToWideChar cannot convert multibyte text"); break; } } diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp index e3633600f..e5ccf8bad 100644 --- a/src/tools/qtextstream.cpp +++ b/src/tools/qtextstream.cpp @@ -185,7 +185,7 @@ #if defined(QT_CHECK_STATE) #undef CHECK_STREAM_PRECOND #define CHECK_STREAM_PRECOND if ( !dev ) { \ - qWarning( "TQTextStream: No device" ); \ + tqWarning( "TQTextStream: No device" ); \ return *this; } #else #define CHECK_STREAM_PRECOND @@ -327,13 +327,13 @@ bool TQStringBuffer::open( int m ) { if ( !s ) { #if defined(QT_CHECK_STATE) - qWarning( "TQStringBuffer::open: No string" ); + tqWarning( "TQStringBuffer::open: No string" ); #endif return FALSE; } if ( isOpen() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQStringBuffer::open: Buffer already open" ); + tqWarning( "TQStringBuffer::open: Buffer already open" ); #endif return FALSE; } @@ -377,16 +377,16 @@ bool TQStringBuffer::at( Offset pos ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQStringBuffer::at: Buffer is not open" ); + tqWarning( "TQStringBuffer::at: Buffer is not open" ); return FALSE; } #endif if ( pos >= s->length()*2 ) { #if defined(QT_CHECK_RANGE) #if defined(QT_ABI_QT4) - qWarning( "TQStringBuffer::at: Index %lld out of range", pos ); + tqWarning( "TQStringBuffer::at: Index %lld out of range", pos ); #else - qWarning( "TQStringBuffer::at: Index %lu out of range", pos ); + tqWarning( "TQStringBuffer::at: Index %lu out of range", pos ); #endif #endif return FALSE; @@ -401,11 +401,11 @@ Q_LONG TQStringBuffer::readBlock( char *p, Q_ULONG len ) #if defined(QT_CHECK_STATE) TQ_CHECK_PTR( p ); if ( !isOpen() ) { - qWarning( "TQStringBuffer::readBlock: Buffer not open" ); + tqWarning( "TQStringBuffer::readBlock: Buffer not open" ); return -1; } if ( !isReadable() ) { - qWarning( "TQStringBuffer::readBlock: Read operation not permitted" ); + tqWarning( "TQStringBuffer::readBlock: Read operation not permitted" ); return -1; } #endif @@ -427,23 +427,23 @@ Q_LONG TQStringBuffer::writeBlock( const char *p, Q_ULONG len ) { #if defined(QT_CHECK_NULL) if ( p == 0 && len != 0 ) - qWarning( "TQStringBuffer::writeBlock: Null pointer error" ); + tqWarning( "TQStringBuffer::writeBlock: Null pointer error" ); #endif #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQStringBuffer::writeBlock: Buffer not open" ); + tqWarning( "TQStringBuffer::writeBlock: Buffer not open" ); return -1; } if ( !isWritable() ) { - qWarning( "TQStringBuffer::writeBlock: Write operation not permitted" ); + tqWarning( "TQStringBuffer::writeBlock: Write operation not permitted" ); return -1; } if ( ioIndex&1 ) { - qWarning( "TQStringBuffer::writeBlock: non-even index - non Unicode" ); + tqWarning( "TQStringBuffer::writeBlock: non-even index - non Unicode" ); return -1; } if ( len&1 ) { - qWarning( "TQStringBuffer::writeBlock: non-even length - non Unicode" ); + tqWarning( "TQStringBuffer::writeBlock: non-even length - non Unicode" ); return -1; } #endif @@ -456,11 +456,11 @@ int TQStringBuffer::getch() { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQStringBuffer::getch: Buffer not open" ); + tqWarning( "TQStringBuffer::getch: Buffer not open" ); return -1; } if ( !isReadable() ) { - qWarning( "TQStringBuffer::getch: Read operation not permitted" ); + tqWarning( "TQStringBuffer::getch: Read operation not permitted" ); return -1; } #endif @@ -484,11 +484,11 @@ int TQStringBuffer::ungetch( int ch ) { #if defined(QT_CHECK_STATE) if ( !isOpen() ) { - qWarning( "TQStringBuffer::ungetch: Buffer not open" ); + tqWarning( "TQStringBuffer::ungetch: Buffer not open" ); return -1; } if ( !isReadable() ) { - qWarning( "TQStringBuffer::ungetch: Read operation not permitted" ); + tqWarning( "TQStringBuffer::ungetch: Read operation not permitted" ); return -1; } #endif @@ -1702,7 +1702,7 @@ TQString TQTextStream::readLine() { #if defined(QT_CHECK_STATE) if ( !dev ) { - qWarning( "TQTextStream::readLine: No device" ); + tqWarning( "TQTextStream::readLine: No device" ); return TQString::null; } #endif @@ -1785,7 +1785,7 @@ TQString TQTextStream::read() { #if defined(QT_CHECK_STATE) if ( !dev ) { - qWarning( "TQTextStream::read: No device" ); + tqWarning( "TQTextStream::read: No device" ); return TQString::null; } #endif diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/qthreadstorage_unix.cpp index 05b86b954..df4c3866f 100644 --- a/src/tools/qthreadstorage_unix.cpp +++ b/src/tools/qthreadstorage_unix.cpp @@ -80,7 +80,7 @@ TQThreadStorageData::TQThreadStorageData( void (*func)( void * ) ) thread_storage_usage[id].func = func; #ifdef TQTHREADSTORAGE_DEBUG - qDebug( "TQThreadStorageData: allocated id %d", id ); + tqDebug( "TQThreadStorageData: allocated id %d", id ); #endif // TQTHREADSTORAGE_DEBUG pthread_mutex_unlock( &thread_storage_mutex ); @@ -93,7 +93,7 @@ TQThreadStorageData::~TQThreadStorageData() thread_storage_usage[id].func = 0; #ifdef TQTHREADSTORAGE_DEBUG - qDebug( "TQThreadStorageData: released id %d", id ); + tqDebug( "TQThreadStorageData: released id %d", id ); #endif // TQTHREADSTORAGE_DEBUG pthread_mutex_unlock( &thread_storage_mutex ); @@ -103,7 +103,7 @@ void **TQThreadStorageData::get() const { TQThreadInstance *d = TQThreadInstance::current(); if (!d) { - qWarning("TQThreadStorage can only be used with threads started with TQThread"); + tqWarning("TQThreadStorage can only be used with threads started with TQThread"); return 0; } TQMutexLocker locker( d->mutex() ); @@ -114,13 +114,13 @@ void **TQThreadStorageData::set( void *p ) { TQThreadInstance *d = TQThreadInstance::current(); if (!d) { - qWarning("TQThreadStorage can only be used with threads started with TQThread"); + tqWarning("TQThreadStorage can only be used with threads started with TQThread"); return 0; } TQMutexLocker locker( d->mutex() ); if ( !d->thread_storage ) { #ifdef TQTHREADSTORAGE_DEBUG - qDebug( "TQThreadStorageData: allocating storage for thread %lx", + tqDebug( "TQThreadStorageData: allocating storage for thread %lx", (unsigned long) pthread_self() ); #endif // TQTHREADSTORAGE_DEBUG @@ -142,7 +142,7 @@ void TQThreadStorageData::finish( void **thread_storage ) if ( ! thread_storage ) return; // nothing to do #ifdef TQTHREADSTORAGE_DEBUG - qDebug( "TQThreadStorageData: destroying storage for thread %lx", + tqDebug( "TQThreadStorageData: destroying storage for thread %lx", (unsigned long) pthread_self() ); #endif // TQTHREADSTORAGE_DEBUG @@ -150,7 +150,7 @@ void TQThreadStorageData::finish( void **thread_storage ) if ( ! thread_storage[i] ) continue; if ( ! thread_storage_usage[i].used ) { #ifdef QT_CHECK_STATE - qWarning( "TQThreadStorage: thread %lx exited after TQThreadStorage destroyed", + tqWarning( "TQThreadStorage: thread %lx exited after TQThreadStorage destroyed", (unsigned long) pthread_self() ); #endif // QT_CHECK_STATE continue; diff --git a/src/tools/qucom.cpp b/src/tools/qucom.cpp index e05893bed..6035d6622 100644 --- a/src/tools/qucom.cpp +++ b/src/tools/qucom.cpp @@ -514,7 +514,7 @@ bool TQUType_TQString::convertTo( TQUObject *o, TQUType *t ) { TQString *str = (TQString *)o->payload.ptr; if ( isEqual( t, &static_QUType_charstar ) ) { - o->payload.charstar.ptr = qstrdup( str->local8Bit().data() ); + o->payload.charstar.ptr = tqstrdup( str->local8Bit().data() ); o->payload.charstar.owner = TRUE; o->type = &static_QUType_charstar; } else if ( isEqual( t, &static_QUType_int ) ) { diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/qwaitcondition_unix.cpp index 2f1e5b98a..2d985332b 100644 --- a/src/tools/qwaitcondition_unix.cpp +++ b/src/tools/qwaitcondition_unix.cpp @@ -153,7 +153,7 @@ TQWaitCondition::TQWaitCondition() #ifdef QT_CHECK_RANGE if (ret) - qWarning( "Wait condition init failure: %s", strerror( ret ) ); + tqWarning( "Wait condition init failure: %s", strerror( ret ) ); #endif } @@ -167,7 +167,7 @@ TQWaitCondition::~TQWaitCondition() if (ret) { #ifdef QT_CHECK_RANGE - qWarning( "Wait condition destroy failure: %s", strerror( ret ) ); + tqWarning( "Wait condition destroy failure: %s", strerror( ret ) ); #endif // seems we have threads waiting on us, lets wake them up @@ -190,7 +190,7 @@ void TQWaitCondition::wakeOne() #ifdef QT_CHECK_RANGE if (ret) - qWarning("Wait condition wakeOne failure: %s", strerror(ret)); + tqWarning("Wait condition wakeOne failure: %s", strerror(ret)); #endif } @@ -207,7 +207,7 @@ void TQWaitCondition::wakeAll() #ifdef QT_CHECK_RANGE if (ret) - qWarning("Wait condition wakeAll failure: %s", strerror(ret)); + tqWarning("Wait condition wakeAll failure: %s", strerror(ret)); #endif } @@ -246,7 +246,7 @@ bool TQWaitCondition::wait(unsigned long time) #ifdef QT_CHECK_RANGE if (ret && ret != ETIMEDOUT) - qWarning("Wait condition wait failure: %s",strerror(ret)); + tqWarning("Wait condition wait failure: %s",strerror(ret)); #endif pthread_mutex_unlock( &mutex ); @@ -285,7 +285,7 @@ bool TQWaitCondition::wait(TQMutex *mutex, unsigned long time) if (mutex->d->type() == Q_MUTEX_RECURSIVE) { #ifdef QT_CHECK_RANGE - qWarning("Wait condition warning: using recursive mutexes with\n" + tqWarning("Wait condition warning: using recursive mutexes with\n" " wait conditions is undefined!"); #endif return FALSE; @@ -307,7 +307,7 @@ bool TQWaitCondition::wait(TQMutex *mutex, unsigned long time) #ifdef QT_CHECK_RANGE if (ret && ret != ETIMEDOUT) - qWarning("Wait condition wait failure: %s",strerror(ret)); + tqWarning("Wait condition wait failure: %s",strerror(ret)); #endif return (ret == 0); diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h index 09a2ce359..b079e3af9 100644 --- a/src/widgets/ntqheader.h +++ b/src/widgets/ntqheader.h @@ -212,7 +212,7 @@ inline TQHeader::Orientation TQHeader::orientation() const inline void TQHeader::setTracking( bool enable ) { trackingIsOn = enable; } inline bool TQHeader::tracking() const { return trackingIsOn; } -extern Q_EXPORT bool qt_qheader_label_return_null_strings; // needed for professional edition +extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition #endif // QT_NO_HEADER diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index d911717c1..314a4f705 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -785,7 +785,7 @@ void TQAction::setAccel( const TQKeySequence& key ) } #if defined(QT_CHECK_STATE) else - qWarning( "TQAction::setAccel() (%s) requires widget in parent chain", name() ); + tqWarning( "TQAction::setAccel() (%s) requires widget in parent chain", name() ); #endif d->update(); } @@ -841,7 +841,7 @@ void TQAction::activate() { if ( isToggleAction() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQAction::%s() (%s) Toggle actions " + tqWarning( "TQAction::%s() (%s) Toggle actions " "can not be activated", "activate", name() ); #endif return; @@ -858,7 +858,7 @@ void TQAction::toggle() { if ( !isToggleAction() ) { #if defined(QT_CHECK_STATE) - qWarning( "TQAction::%s() (%s) Only toggle actions " + tqWarning( "TQAction::%s() (%s) Only toggle actions " "can be switched", "toggle", name() ); #endif return; @@ -882,7 +882,7 @@ void TQAction::setOn( bool enable ) if ( !isToggleAction() ) { #if defined(QT_CHECK_STATE) if ( enable ) - qWarning( "TQAction::%s() (%s) Only toggle actions " + tqWarning( "TQAction::%s() (%s) Only toggle actions " "can be switched", "setOn", name() ); #endif return; @@ -1066,7 +1066,7 @@ bool TQAction::addTo( TQWidget* w ) d->update( TQActionPrivate::State | TQActionPrivate::EverythingElse ); } else { - qWarning( "TQAction::addTo(), unknown object" ); + tqWarning( "TQAction::addTo(), unknown object" ); return FALSE; } return TRUE; @@ -1226,7 +1226,7 @@ bool TQAction::removeFrom( TQWidget* w ) } } } else { - qWarning( "TQAction::removeFrom(), unknown object" ); + tqWarning( "TQAction::removeFrom(), unknown object" ); return FALSE; } return TRUE; diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp index 5445f61fb..d24dd17f7 100644 --- a/src/widgets/qbutton.cpp +++ b/src/widgets/qbutton.cpp @@ -631,7 +631,7 @@ void TQButton::setState( ToggleState s ) { if ( !toggleTyp ) { #if defined(QT_CHECK_STATE) - qWarning( "TQButton::setState() / setOn: (%s) Only toggle buttons " + tqWarning( "TQButton::setState() / setOn: (%s) Only toggle buttons " "may be switched", name( "unnamed" ) ); #endif return; diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index 60a85337c..c595d75e6 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -469,7 +469,7 @@ static inline bool checkInsertIndex( const char *method, const char * name, bool range_err = (*index > count); #if defined(QT_CHECK_RANGE) if ( range_err ) - qWarning( "TQComboBox::%s: (%s) Index %d out of range", + tqWarning( "TQComboBox::%s: (%s) Index %d out of range", method, name ? name : "<no name>", *index ); #else Q_UNUSED( method ) @@ -487,7 +487,7 @@ static inline bool checkIndex( const char *method, const char * name, bool range_err = (index >= count); #if defined(QT_CHECK_RANGE) if ( range_err ) - qWarning( "TQComboBox::%s: (%s) Index %i out of range", + tqWarning( "TQComboBox::%s: (%s) Index %i out of range", method, name ? name : "<no name>", index ); #else Q_UNUSED( method ) diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index 117c20cdc..e226d671e 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -2118,7 +2118,7 @@ void TQTimeEdit::stepUp() default: accepted = FALSE; #ifdef QT_CHECK_RANGE - qWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); + tqWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); #endif break; } @@ -2170,7 +2170,7 @@ void TQTimeEdit::stepDown() default: accepted = FALSE; #ifdef QT_CHECK_RANGE - qWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); + tqWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); #endif break; } diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp index 2aad8a193..a14eec3a2 100644 --- a/src/widgets/qdialogbuttons.cpp +++ b/src/widgets/qdialogbuttons.cpp @@ -84,7 +84,7 @@ void TQDialogButtons::init(Q_UINT32 buttons, Orientation orient) { if(buttons == All) { - qWarning("TQDialogButtons: cannot specify All by itself!"); + tqWarning("TQDialogButtons: cannot specify All by itself!"); buttons = None; } d = new TQDialogButtonsPrivate; @@ -173,7 +173,7 @@ void TQDialogButtons::setDefaultButton(Button button) { if(!((int)(d->visible & button) == button)) { - qWarning("TQDialogButtons: Button '%d' is not visible (so cannot be default)", button); + tqWarning("TQDialogButtons: Button '%d' is not visible (so cannot be default)", button); return; } if(d->def != button) { diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index cd56be0b3..0e2555bd7 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -766,21 +766,21 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect insertLine = TRUE; #if defined(TQDOCKAREA_DEBUG) - qDebug( "insert in line %d, and insert that line: %d", dockLine, insertLine ); - qDebug( " (btw, we have %d lines)", lines.count() ); + tqDebug( "insert in line %d, and insert that line: %d", dockLine, insertLine ); + tqDebug( " (btw, we have %d lines)", lines.count() ); #endif TQDockWindow *dw = 0; if ( dockLine >= (int)lines.count() ) { // insert after last line dockWindows->append( dockWindow ); dockWindow->setNewLine( TRUE ); #if defined(TQDOCKAREA_DEBUG) - qDebug( "insert at the end" ); + tqDebug( "insert at the end" ); #endif } else if ( dockLine == 0 && insertLine ) { // insert before first line dockWindows->insert( 0, dockWindow ); dockWindows->at( 1 )->setNewLine( TRUE ); #if defined(TQDOCKAREA_DEBUG) - qDebug( "insert at the begin" ); + tqDebug( "insert at the begin" ); #endif } else { // insert somewhere in between // make sure each line start has a new line @@ -790,7 +790,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect // find the index of the first widget in the search line int searchLine = dockLine; #if defined(TQDOCKAREA_DEBUG) - qDebug( "search line start of %d", searchLine ); + tqDebug( "search line start of %d", searchLine ); #endif TQDockWindow *lsw = lineStarts.at( searchLine ); int index = dockWindows->find( lsw ); @@ -803,7 +803,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect (void)dockWindows->at( index ); // move current to index } #if defined(TQDOCKAREA_DEBUG) - qDebug( " which starts at %d", index ); + tqDebug( " which starts at %d", index ); #endif if ( !insertLine ) { // if we insert the docking widget in the existing line // find the index for the widget @@ -825,7 +825,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect firstTime = FALSE; } #if defined(TQDOCKAREA_DEBUG) - qDebug( "insert at index: %d", index ); + tqDebug( "insert at index: %d", index ); #endif // if we insert it just before a widget which has a new line, transfer the newline to the docking widget // but not if we didn't only mave a widget in its line which was alone in the line before @@ -833,7 +833,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect && index >= 0 && index < (int)dockWindows->count() && dockWindows->at( index )->newLine() && lineOf( index ) == dockLine ) { #if defined(TQDOCKAREA_DEBUG) - qDebug( "get rid of the old newline and get me one" ); + tqDebug( "get rid of the old newline and get me one" ); #endif dockWindows->at( index )->setNewLine( FALSE ); dockWindow->setNewLine( TRUE ); @@ -844,18 +844,18 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect } } else { // insert in a new line, so make sure the dock widget and the widget which will be after it have a newline #if defined(TQDOCKAREA_DEBUG) - qDebug( "insert a new line" ); + tqDebug( "insert a new line" ); #endif if ( index < (int)dockWindows->count() ) { #if defined(TQDOCKAREA_DEBUG) - qDebug( "give the widget at %d a newline", index ); + tqDebug( "give the widget at %d a newline", index ); #endif TQDockWindow* nldw = dockWindows->at( index ); if ( nldw ) nldw->setNewLine( TRUE ); } #if defined(TQDOCKAREA_DEBUG) - qDebug( "give me a newline" ); + tqDebug( "give me a newline" ); #endif dockWindow->setNewLine( TRUE ); } diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp index e20fd3349..b2c0e0e40 100644 --- a/src/widgets/qheader.cpp +++ b/src/widgets/qheader.cpp @@ -826,7 +826,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e ) break; } default: - qWarning( "TQHeader::mouseMoveEvent: (%s) unknown state", name() ); + tqWarning( "TQHeader::mouseMoveEvent: (%s) unknown state", name() ); break; } } @@ -992,7 +992,7 @@ void TQHeader::setLabel( int section, const TQString &s, int size ) } -bool qt_qheader_label_return_null_strings = FALSE; +bool tqt_qheader_label_return_null_strings = FALSE; /*! Returns the text for section \a section. If the section does not exist, a TQString::null is returned. @@ -1003,7 +1003,7 @@ TQString TQHeader::label( int section ) const return TQString::null; if ( d->labels[ section ] ) return *( d->labels[ section ] ); - else if ( qt_qheader_label_return_null_strings ) + else if ( tqt_qheader_label_return_null_strings ) return TQString::null; else return TQString::number( section + 1 ); diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp index 99eddf56d..c284da3ea 100644 --- a/src/widgets/qlcdnumber.cpp +++ b/src/widgets/qlcdnumber.cpp @@ -375,14 +375,14 @@ void TQLCDNumber::setNumDigits( int numDigits ) { if ( numDigits > 99 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQLCDNumber::setNumDigits: (%s) Max 99 digits allowed", + tqWarning( "TQLCDNumber::setNumDigits: (%s) Max 99 digits allowed", name( "unnamed" ) ); #endif numDigits = 99; } if (numDigits < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQLCDNumber::setNumDigits: (%s) Min 0 digits allowed", + tqWarning( "TQLCDNumber::setNumDigits: (%s) Min 0 digits allowed", name( "unnamed" ) ); #endif numDigits = 0; @@ -976,7 +976,7 @@ void TQLCDNumber::drawSegment( const TQPoint &pos, char segmentNo, TQPainter &p, break; #if defined(QT_CHECK_RANGE) default : - qWarning( "TQLCDNumber::drawSegment: (%s) Internal error." + tqWarning( "TQLCDNumber::drawSegment: (%s) Internal error." " Illegal segment id: %d\n", name( "unnamed" ), segmentNo ); #endif @@ -1111,7 +1111,7 @@ void TQLCDNumber::drawSegment( const TQPoint &pos, char segmentNo, TQPainter &p, break; #if defined(QT_CHECK_RANGE) default : - qWarning( "TQLCDNumber::drawSegment: (%s) Internal error." + tqWarning( "TQLCDNumber::drawSegment: (%s) Internal error." " Illegal segment id: %d\n", name( "unnamed" ), segmentNo ); #endif diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 74976e2ef..3ba828c18 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -1587,8 +1587,8 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e ) e->key() != Key_Delete && e->key() != Key_Backspace ) { #ifdef Q_WS_X11 - extern bool qt_hebrew_keyboard_hack; - if ( qt_hebrew_keyboard_hack ) { + extern bool tqt_hebrew_keyboard_hack; + if ( tqt_hebrew_keyboard_hack ) { // the X11 keyboard layout is broken and does not reverse // braces correctly. This is a hack to get halfway correct // behaviour diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index f38550260..4e26f005b 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -3789,14 +3789,14 @@ void TQListBox::viewportPaintEvent( TQPaintEvent * e ) // this stuff has been useful enough times that from now I'm // leaving it in the source. uint i = 0; - qDebug( "%s/%s: %i rects", className(), name(), r.rects().size() ); + tqDebug( "%s/%s: %i rects", className(), name(), r.rects().size() ); while( i < r.rects().size() ) { - qDebug( "rect %d: %d, %d, %d, %d", i, + tqDebug( "rect %d: %d, %d, %d, %d", i, r.rects()[i].left(), r.rects()[i].top(), r.rects()[i].width(), r.rects()[i].height() ); i++; } - qDebug( "" ); + tqDebug( "" ); } #endif @@ -3977,7 +3977,7 @@ TQRect TQListBox::itemRect( TQListBoxItem *item ) const */ int TQListBox::inSort( const TQListBoxItem * lbi ) { - qObsolete( "TQListBox", "inSort", "insertItem" ); + tqObsolete( "TQListBox", "inSort", "insertItem" ); if ( !lbi ) return -1; @@ -4009,7 +4009,7 @@ int TQListBox::inSort( const TQListBoxItem * lbi ) */ int TQListBox::inSort( const TQString& text ) { - qObsolete( "TQListBox", "inSort", "insertItem" ); + tqObsolete( "TQListBox", "inSort", "insertItem" ); return inSort( new TQListBoxText(text) ); } @@ -4160,7 +4160,7 @@ void TQListBox::showEvent( TQShowEvent * ) */ bool TQListBox::itemYPos( int index, int *yPos ) const { - qObsolete( "TQListBox", "itemYPos" ); + tqObsolete( "TQListBox", "itemYPos" ); TQListBoxItem* i = item(index); if ( !i ) return FALSE; diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 7b776d523..06830bddf 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -6048,7 +6048,7 @@ TQCheckListItem::TQCheckListItem( TQCheckListItem *parent, const TQString &text, init(); if ( myType == RadioButton ) { if ( parent->type() != RadioButtonController ) - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a controller" ); else d->exclusive = parent; @@ -6069,7 +6069,7 @@ TQCheckListItem::TQCheckListItem( TQCheckListItem *parent, TQListViewItem *after init(); if ( myType == RadioButton ) { if ( parent->type() != RadioButtonController ) - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a controller" ); else d->exclusive = parent; @@ -6088,7 +6088,7 @@ TQCheckListItem::TQCheckListItem( TQListViewItem *parent, const TQString &text, { myType = tt; if ( myType == RadioButton ) { - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a TQCheckListItem" ); } init(); @@ -6107,7 +6107,7 @@ TQCheckListItem::TQCheckListItem( TQListViewItem *parent, TQListViewItem *after, { myType = tt; if ( myType == RadioButton ) { - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a TQCheckListItem" ); } init(); @@ -6125,7 +6125,7 @@ TQCheckListItem::TQCheckListItem( TQListView *parent, const TQString &text, { myType = tt; if ( tt == RadioButton ) - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a TQCheckListItem" ); init(); } @@ -6142,7 +6142,7 @@ TQCheckListItem::TQCheckListItem( TQListView *parent, TQListViewItem *after, { myType = tt; if ( tt == RadioButton ) - qWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " + tqWarning( "TQCheckListItem::TQCheckListItem(), radio button must be " "child of a TQCheckListItem" ); init(); } @@ -6236,7 +6236,7 @@ TQCheckListItem::~TQCheckListItem() void TQCheckListItem::setTristate( bool b ) { if ( ( myType != CheckBoxController ) && ( myType != CheckBox ) ) { - qWarning( "TQCheckListItem::setTristate(), has no effect on RadioButton " + tqWarning( "TQCheckListItem::setTristate(), has no effect on RadioButton " "or RadioButtonController." ); return; } @@ -7733,7 +7733,7 @@ TQListViewItemIterator &TQListViewItemIterator::operator-=( int j ) TQListViewItem* TQListViewItemIterator::operator*() { if ( curr != 0 && !matchesFlags( curr ) ) - qWarning( "TQListViewItemIterator::operator*() curr out of sync" ); + tqWarning( "TQListViewItemIterator::operator*() curr out of sync" ); return curr; } @@ -7744,7 +7744,7 @@ TQListViewItem* TQListViewItemIterator::operator*() TQListViewItem *TQListViewItemIterator::current() const { if ( curr != 0 && !matchesFlags( curr ) ) - qWarning( "TQListViewItemIterator::current() curr out of sync" ); + tqWarning( "TQListViewItemIterator::current() curr out of sync" ); return curr; } diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp index e40aa0b73..437234dc7 100644 --- a/src/widgets/qmenudata.cpp +++ b/src/widgets/qmenudata.cpp @@ -813,7 +813,7 @@ void TQMenuData::removeItemAt( int index ) { if ( index < 0 || index >= (int)mitems->count() ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQMenuData::removeItem: Index %d out of range", index ); + tqWarning( "TQMenuData::removeItem: Index %d out of range", index ); #endif return; } diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index f6858c25e..76605be88 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -112,7 +112,7 @@ static void cleanup() static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) { if ( !singleSingleShot ) { singleSingleShot = new TQTimer( tqApp, "popup submenu timer" ); - qAddPostRoutine( cleanup ); + tqAddPostRoutine( cleanup ); } singleSingleShot->disconnect( SIGNAL(timeout()) ); @@ -1163,7 +1163,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) #if defined(QT_CHECK_NULL) if ( mi->text().isNull() && !mi->pixmap() && !mi->iconSet() && !mi->isSeparator() && !mi->widget() && !mi->custom() ) - qWarning( "TQPopupMenu: (%s) Popup has invalid menu item", + tqWarning( "TQPopupMenu: (%s) Popup has invalid menu item", name( "unnamed" ) ); #endif } diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp index 036f8c7b6..7f1701ff7 100644 --- a/src/widgets/qrangecontrol.cpp +++ b/src/widgets/qrangecontrol.cpp @@ -348,7 +348,7 @@ void TQRangeControl::setRange( int minValue, int maxValue ) { if ( minValue > maxValue ) { #if defined(QT_CHECK_RANGE) - qWarning( "TQRangeControl::setRange: minValue %d > maxValue %d", + tqWarning( "TQRangeControl::setRange: minValue %d > maxValue %d", minValue, maxValue ); #endif maxValue = minValue; diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 68dcd700b..20d0adeb9 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -1388,7 +1388,7 @@ void TQScrollView::addChild(TQWidget* child, int x, int y) { if ( !child ) { #if defined(QT_CHECK_NULL) - qWarning( "TQScrollView::addChild(): Cannot add null child" ); + tqWarning( "TQScrollView::addChild(): Cannot add null child" ); #endif return; } @@ -2538,8 +2538,8 @@ bool TQScrollView::focusNextPrevChild( bool next ) TQWidget *candidate = 0; TQWidget *w = next ? f->next() : f->prev(); TQSVChildRec *r; - extern bool qt_tab_all_widgets; - uint focus_flag = qt_tab_all_widgets ? TabFocus : StrongFocus; + extern bool tqt_tab_all_widgets; + uint focus_flag = tqt_tab_all_widgets ? TabFocus : StrongFocus; // then scan for a possible focus widget candidate while( !candidate && w != startingPoint ) { @@ -2589,7 +2589,7 @@ void TQScrollView::enableClipper(bool y) if ( !d->clipped_viewport == !y ) return; if ( d->children.count() ) - qFatal("May only call TQScrollView::enableClipper() before adding widgets"); + tqFatal("May only call TQScrollView::enableClipper() before adding widgets"); if ( y ) { d->clipped_viewport = new TQClipperWidget(clipper(), "qt_clipped_viewport", d->flags); d->clipped_viewport->setGeometry(-coord_limit/2,-coord_limit/2, diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp index e6b555a18..bf5b74881 100644 --- a/src/widgets/qslider.cpp +++ b/src/widgets/qslider.cpp @@ -601,7 +601,7 @@ void TQSlider::resetState() case Idle: break; default: - qWarning("TQSlider: (%s) in wrong state", name( "unnamed" ) ); + tqWarning("TQSlider: (%s) in wrong state", name( "unnamed" ) ); } state = Idle; } diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp index ea4172e29..557d7ef71 100644 --- a/src/widgets/qstatusbar.cpp +++ b/src/widgets/qstatusbar.cpp @@ -194,7 +194,7 @@ void TQStatusBar::addWidget( TQWidget * widget, int stretch, bool permanent ) { if ( !widget ) { #if defined(QT_CHECK_NULL) - qWarning( "TQStatusBar::addWidget(): Cannot add null widget" ); + tqWarning( "TQStatusBar::addWidget(): Cannot add null widget" ); #endif return; } @@ -246,7 +246,7 @@ void TQStatusBar::removeWidget( TQWidget* widget ) reformat(); #if defined(QT_DEBUG) else - qDebug( "TQStatusBar::removeWidget(): Widget not found." ); + tqDebug( "TQStatusBar::removeWidget(): Widget not found." ); #endif } diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp index 1dcf689aa..3449fada9 100644 --- a/src/widgets/qtextbrowser.cpp +++ b/src/widgets/qtextbrowser.cpp @@ -251,11 +251,11 @@ void TQTextBrowser::setSource(const TQString& name) const TQMimeSource* m = mimeSourceFactory()->data( source, context() ); if ( !m ){ - qWarning("TQTextBrowser: no mimesource for %s", source.latin1() ); + tqWarning("TQTextBrowser: no mimesource for %s", source.latin1() ); } else { if ( !TQTextDrag::decode( m, txt ) ) { - qWarning("TQTextBrowser: cannot decode %s", source.latin1() ); + tqWarning("TQTextBrowser: cannot decode %s", source.latin1() ); } } if ( isVisible() ) { diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 5910ef4c6..9a5502c1f 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -1451,8 +1451,8 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e ) } TQString t = e->text(); #ifdef Q_WS_X11 - extern bool qt_hebrew_keyboard_hack; - if ( qt_hebrew_keyboard_hack ) { + extern bool tqt_hebrew_keyboard_hack; + if ( tqt_hebrew_keyboard_hack ) { // the X11 keyboard layout is broken and does not reverse // braces correctly. This is a hack to get halfway correct // behaviour @@ -5069,7 +5069,7 @@ void TQTextEdit::updateStyles() void TQTextEdit::setDocument( TQTextDocument *dc ) { if ( dc == 0 ) { - qWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" ); + tqWarning( "Q3TextEdit::setDocument() called with null Q3TextDocument pointer" ); return; } if ( dc == doc ) @@ -6452,7 +6452,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) cur = tag->prev; if ( !cur ) { #ifdef QT_CHECK_RANGE - qWarning( "TQTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); + tqWarning( "TQTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 ); #endif return; // something is wrong - give up } @@ -6475,7 +6475,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) break; } else if ( !cur->leftTag ) { #ifdef QT_CHECK_RANGE - qWarning( "TQTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); + tqWarning( "TQTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 ); #endif return; // something is amiss - give up } @@ -6956,9 +6956,9 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, // useful debug info // // tag = d->od->tags; -// qWarning("###"); +// tqWarning("###"); // while ( tag ) { -// qWarning( "Tag: %p, parent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag, +// tqWarning( "Tag: %p, parent: %09p, leftTag: %09p, Name: %-15s, ParentName: %s, %d%d%d", tag, // tag->parent, tag->leftTag, tag->tag.latin1(), tag->parent ? tag->parent->tag.latin1():"<none>", // tag->bold, tag->italic, tag->underline ); // tag = tag->next; diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 644353820..26f5607f7 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -716,10 +716,10 @@ void TQToolButton::setOnIconSet( const TQIconSet& set ) { setIconSet( set ); /* - ### Get rid of all qWarning in this file in 4.0. + ### Get rid of all tqWarning in this file in 4.0. Also consider inlining the obsolete functions then. */ - qWarning( "TQToolButton::setOnIconSet(): This function is not supported" + tqWarning( "TQToolButton::setOnIconSet(): This function is not supported" " anymore" ); } @@ -790,7 +790,7 @@ void TQToolButton::setIconSet( const TQIconSet & set ) void TQToolButton::setIconSet( const TQIconSet & set, bool /* on */ ) { setIconSet( set ); - qWarning( "TQToolButton::setIconSet(): 'on' parameter ignored" ); + tqWarning( "TQToolButton::setIconSet(): 'on' parameter ignored" ); } #endif diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp index 6e3338b0b..2a61fec80 100644 --- a/src/widgets/qwhatsthis.cpp +++ b/src/widgets/qwhatsthis.cpp @@ -417,7 +417,7 @@ void TQWhatsThat::paintEvent( TQPaintEvent* ) TQWhatsThisPrivate::WhatsThisItem::~WhatsThisItem() { if ( count ) - qFatal( "TQWhatsThis: Internal error (%d)", count ); + tqFatal( "TQWhatsThis: Internal error (%d)", count ); delete whatsthis; } @@ -617,7 +617,7 @@ void TQWhatsThisPrivate::setUpWhatsThis() // It is necessary to use a post routine, because // the destructor deletes pixmaps and other stuff that // needs a working X connection under X11. - qAddPostRoutine( qWhatsThisPrivateCleanup ); + tqAddPostRoutine( qWhatsThisPrivateCleanup ); } } diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index b46a9dddb..ef8dbed36 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -976,7 +976,7 @@ void TQWorkspace::showEvent( TQShowEvent *e ) dw->move(dw->mapToGlobal(TQPoint(0, 0))); d->newdocks.append(dw); } else { - qDebug("not sure what to do with %s %s", (*dock_it)->className(), + tqDebug("not sure what to do with %s %s", (*dock_it)->className(), (*dock_it)->name()); } } @@ -1316,7 +1316,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) ::qt_cast<TQDockArea*>(o) && !((TQWidget*)o)->isVisible()) { TQChildEvent *ce = (TQChildEvent*)e; if(!::qt_cast<TQDockWindow*>(ce->child())) { - qDebug("No idea what to do.."); + tqDebug("No idea what to do.."); return FALSE; } TQDockWindow *w = (TQDockWindow*)ce->child(); diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp index 954321c48..44f073460 100644 --- a/src/xml/qdom.cpp +++ b/src/xml/qdom.cpp @@ -3686,7 +3686,7 @@ static TQString encodeAttr( const TQString& str ) i += 4; } else if (!isXmlChar(tmp[(int)i])) { TQString repl = "&#x" + TQString::number(tmp[(int)i].unicode(), 16) + ';'; - qWarning("TQDom: saving invalid character %s, the document will not be well-formed", repl.latin1()); + tqWarning("TQDom: saving invalid character %s, the document will not be well-formed", repl.latin1()); tmp.replace(i, 1, repl); len += repl.length() - 1; i += repl.length(); @@ -4651,7 +4651,7 @@ TQDomNodePrivate* TQDomTextPrivate::cloneNode( bool deep) TQDomTextPrivate* TQDomTextPrivate::splitText( int offset ) { if ( !parent() ) { - qWarning( "TQDomText::splitText The node has no parent. So I can not split" ); + tqWarning( "TQDomText::splitText The node has no parent. So I can not split" ); return 0; } diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp index da64aa911..106905594 100644 --- a/src/xml/qsvgdevice.cpp +++ b/src/xml/qsvgdevice.cpp @@ -187,13 +187,13 @@ bool TQSvgDevice::play( TQPainter *painter ) pt->setPen( TQt::NoPen ); // SVG default pen and brush pt->setBrush( TQt::black ); if ( doc.isNull() ) { - qWarning( "TQSvgDevice::play: No SVG data set." ); + tqWarning( "TQSvgDevice::play: No SVG data set." ); return FALSE; } TQDomNode svg = doc.namedItem( "svg" ); if ( svg.isNull() || !svg.isElement() ) { - qWarning( "TQSvgDevice::play: Couldn't find any svg element." ); + tqWarning( "TQSvgDevice::play: Couldn't find any svg element." ); return FALSE; } @@ -221,7 +221,7 @@ bool TQSvgDevice::play( TQPainter *painter ) TQRegExp re( TQString::fromLatin1("\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*,?" "\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*") ); if ( re.search( attr.namedItem( "viewBox" ).nodeValue() ) < 0 ) { - qWarning( "TQSvgDevice::play: Invalid viewBox attribute."); + tqWarning( "TQSvgDevice::play: Invalid viewBox attribute."); return FALSE; } else { double x = re.cap( 1 ).toDouble(); @@ -229,7 +229,7 @@ bool TQSvgDevice::play( TQPainter *painter ) double w = re.cap( 3 ).toDouble(); double h = re.cap( 4 ).toDouble(); if ( w < 0 || h < 0 ) { - qWarning( "TQSvgDevice::play: Invalid viewBox dimension."); + tqWarning( "TQSvgDevice::play: Invalid viewBox dimension."); return FALSE; } else if ( w == 0 || h == 0 ) { return TRUE; @@ -353,7 +353,7 @@ bool TQSvgDevice::save( TQIODevice *dev ) { #if defined(CHECK_RANGE) if ( !d->images.isEmpty() || !d->pixmaps.isEmpty() ) - qWarning( "TQSvgDevice::save: skipping external images" ); + tqWarning( "TQSvgDevice::save: skipping external images" ); #endif TQTextStream s( dev ); @@ -419,7 +419,7 @@ int TQSvgDevice::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - qWarning( "TQSvgDevice::metric: Invalid metric command" ); + tqWarning( "TQSvgDevice::metric: Invalid metric command" ); #endif } return val; @@ -714,7 +714,7 @@ bool TQSvgDevice::cmd ( int c, TQPainter *painter, TQPDevCmdParam *p ) } default: #if defined(CHECK_RANGE) - qWarning( "TQSVGDevice::cmd: Invalid command %d", c ); + tqWarning( "TQSVGDevice::cmd: Invalid command %d", c ); #endif break; } @@ -981,7 +981,7 @@ bool TQSvgDevice::play( const TQDomNode &node ) // ### catch references to embedded .svg files TQPixmap pix; if ( !pix.load( href ) ) { - qWarning( "TQSvgDevice::play: Couldn't load image %s", href.latin1() ); + tqWarning( "TQSvgDevice::play: Couldn't load image %s", href.latin1() ); break; } pt->drawPixmap( TQRect( x1, y1, w, h ), pix ); @@ -1027,7 +1027,7 @@ bool TQSvgDevice::play( const TQDomNode &node ) break; } case InvalidElement: - qWarning( "TQSvgDevice::play: unknown element type %s", + tqWarning( "TQSvgDevice::play: unknown element type %s", node.nodeName().latin1() ); break; }; @@ -1114,7 +1114,7 @@ double TQSvgDevice::parseLen( const TQString &str, bool *ok, bool horiz ) const { TQRegExp reg( TQString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") ); if ( reg.search( str ) == -1 ) { - qWarning( "TQSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); + tqWarning( "TQSvgDevice::parseLen: couldn't parse %s ", str.latin1() ); if ( ok ) *ok = FALSE; return 0.0; @@ -1143,7 +1143,7 @@ double TQSvgDevice::parseLen( const TQString &str, bool *ok, bool horiz ) const else if ( u == "pc" ) dbl *= m.logicalDpiX() / 6.0; else - qWarning( "TQSvgDevice::parseLen: Unknown unit %s", u.latin1() ); + tqWarning( "TQSvgDevice::parseLen: Unknown unit %s", u.latin1() ); } if ( ok ) *ok = TRUE; @@ -1241,7 +1241,7 @@ void TQSvgDevice::setStyleProperty( const TQString &prop, const TQString &val, else if ( val == "italic" ) font->setItalic( TRUE ); else - qWarning( "TQSvgDevice::setStyleProperty: unhandled " + tqWarning( "TQSvgDevice::setStyleProperty: unhandled " "font-style: %s", val.latin1() ); } else if ( prop == "font-weight" ) { int w = font->weight(); @@ -1373,7 +1373,7 @@ void TQSvgDevice::drawPath( const TQString &data ) cmd = mode; // continue in previous mode idx--; } else { - qWarning( "TQSvgDevice::drawPath: Unknown command" ); + tqWarning( "TQSvgDevice::drawPath: Unknown command" ); return; } } @@ -1385,7 +1385,7 @@ void TQSvgDevice::drawPath( const TQString &data ) for ( int i = 0; i < numArgs; i++ ) { int pos = reg.search( data, idx ); if ( pos == -1 ) { - qWarning( "TQSvgDevice::drawPath: Error parsing arguments" ); + tqWarning( "TQSvgDevice::drawPath: Error parsing arguments" ); return; } arg[ i ] = reg.cap( 1 ).toDouble(); diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp index ccc3498d7..f57920e62 100644 --- a/src/xml/qxml.cpp +++ b/src/xml/qxml.cpp @@ -2725,7 +2725,7 @@ bool TQXmlSimpleReader::feature( const TQString& name, bool *ok ) const } else if ( name == "http://trolltech.com/xml/features/report-start-end-entity" ) { return d->reportEntities; } else { - qWarning( "Unknown feature %s", name.latin1() ); + tqWarning( "Unknown feature %s", name.latin1() ); if ( ok != 0 ) *ok = FALSE; } @@ -2783,7 +2783,7 @@ void TQXmlSimpleReader::setFeature( const TQString& name, bool value ) } else if ( name == "http://trolltech.com/xml/features/report-start-end-entity" ) { d->reportEntities = value; } else { - qWarning( "Unknown feature %s", name.latin1() ); + tqWarning( "Unknown feature %s", name.latin1() ); } } @@ -3182,14 +3182,14 @@ bool TQXmlSimpleReader::parseProlog() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseProlog (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseProlog (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -3370,14 +3370,14 @@ bool TQXmlSimpleReader::parseElement() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseElement (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseElement (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -3734,14 +3734,14 @@ bool TQXmlSimpleReader::parseContent() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseContent (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseContent (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4035,14 +4035,14 @@ bool TQXmlSimpleReader::parseMisc() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseMisc (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseMisc (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4189,14 +4189,14 @@ bool TQXmlSimpleReader::parsePI() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parsePI (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parsePI (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4418,14 +4418,14 @@ bool TQXmlSimpleReader::parseDoctype() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseDoctype (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseDoctype (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4620,14 +4620,14 @@ bool TQXmlSimpleReader::parseExternalID() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseExternalID (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseExternalID (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4781,14 +4781,14 @@ bool TQXmlSimpleReader::parseMarkupdecl() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseMarkupdecl (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseMarkupdecl (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -4938,14 +4938,14 @@ bool TQXmlSimpleReader::parsePEReference() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parsePEReference (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parsePEReference (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -5110,14 +5110,14 @@ bool TQXmlSimpleReader::parseAttlistDecl() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseAttlistDecl (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseAttlistDecl (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -5325,14 +5325,14 @@ bool TQXmlSimpleReader::parseAttType() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseAttType (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseAttType (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -5545,14 +5545,14 @@ bool TQXmlSimpleReader::parseAttValue() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseAttValue (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseAttValue (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -5686,14 +5686,14 @@ bool TQXmlSimpleReader::parseElementDecl() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseElementDecl (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseElementDecl (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -5894,14 +5894,14 @@ bool TQXmlSimpleReader::parseNotationDecl() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseNotationDecl (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseNotationDecl (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6037,14 +6037,14 @@ bool TQXmlSimpleReader::parseChoiceSeq() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseChoiceSeq (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseChoiceSeq (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6201,14 +6201,14 @@ bool TQXmlSimpleReader::parseEntityDecl() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseEntityDecl (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseEntityDecl (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6469,14 +6469,14 @@ bool TQXmlSimpleReader::parseEntityValue() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseEntityValue (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseEntityValue (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6587,14 +6587,14 @@ bool TQXmlSimpleReader::parseComment() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseComment (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseComment (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6698,14 +6698,14 @@ bool TQXmlSimpleReader::parseAttribute() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseAttribute (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseAttribute (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6804,14 +6804,14 @@ bool TQXmlSimpleReader::parseName() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseName (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseName (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6889,14 +6889,14 @@ bool TQXmlSimpleReader::parseNmtoken() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseNmtoken (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseNmtoken (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -6997,14 +6997,14 @@ bool TQXmlSimpleReader::parseReference() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseReference (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseReference (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { @@ -7324,14 +7324,14 @@ bool TQXmlSimpleReader::parseString() } else { state = d->parseStack->pop().state; #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: parseString (cont) in state %d", state ); + tqDebug( "TQXmlSimpleReader: parseString (cont) in state %d", state ); #endif if ( !d->parseStack->isEmpty() ) { ParseFunction function = d->parseStack->top().function; if ( function == &TQXmlSimpleReader::eat_ws ) { d->parseStack->pop(); #if defined(QT_QXML_DEBUG) - qDebug( "TQXmlSimpleReader: eat_ws (cont)" ); + tqDebug( "TQXmlSimpleReader: eat_ws (cont)" ); #endif } if ( !(this->*function)() ) { diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index ad7e7edda..4bdc7f38b 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -57,7 +57,7 @@ Config::Config() if( !static_configuration ) { static_configuration = this; } else { - qWarning( "Multiple configurations not allowed!" ); + tqWarning( "Multiple configurations not allowed!" ); } } @@ -74,23 +74,23 @@ Config *Config::loadConfig(const TQString &profileFileName) TQFile file(profileFileName); if (!file.exists()) { - qWarning( "File does not exist: " + profileFileName ); + tqWarning( "File does not exist: " + profileFileName ); return 0; } DocuParser *parser = DocuParser::createParser( profileFileName ); if (!parser) { - qWarning( "Failed to create parser for file: " + profileFileName ); + tqWarning( "Failed to create parser for file: " + profileFileName ); return 0; } if (parser->parserVersion() < DocuParser::TQt320) { - qWarning( "File does not contain profile information" ); + tqWarning( "File does not contain profile information" ); return 0; } DocuParser320 *profileParser = static_cast<DocuParser320*>(parser); parser->parse(&file); config->profil = profileParser->profile(); if (!config->profil) { - qWarning( "Config::loadConfig(), no profile in: " + profileFileName ); + tqWarning( "Config::loadConfig(), no profile in: " + profileFileName ); return 0; } config->profil->setProfileType(Profile::UserProfile); @@ -180,10 +180,10 @@ void Config::saveSettings() #ifdef ASSISTANT_DEBUG static void dumpmap( const TQMap<TQString,TQString> &m, const TQString &header ) { - qDebug( header ); + tqDebug( header ); TQMap<TQString,TQString>::ConstIterator it = m.begin(); while (it != m.end()) { - qDebug( " " + it.key() + ":\t\t" + *it ); + tqDebug( " " + it.key() + ":\t\t" + *it ); ++it; } } @@ -231,7 +231,7 @@ void Config::loadDefaultProfile() dumpmap( profil->indexPages, "IndexPages" ); dumpmap( profil->imageDirs, "ImageDirs" ); dumpmap( profil->dcfTitles, "dcfTitles" ); - qDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); + tqDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); #endif } @@ -264,11 +264,11 @@ void Config::saveProfile( Profile *profile ) settings.writeEntry( profKey + "ImageDirs", imgDirs ); #if ASSISTANT_DEBUG - qDebug( "Titles:\n - " + ( (TQStringList*) &titles )->join( "\n - " ) ); - qDebug( "Docfiles:\n - " + dcfs.join( "\n - " ) ); - qDebug( "IndexPages:\n - " + indexes.join( "\n - " ) ); - qDebug( "DocIcons:\n - " + icons.join( "\n - " ) ); - qDebug( "ImageDirs:\n - " + imgDirs.join( "\n - " ) ); + tqDebug( "Titles:\n - " + ( (TQStringList*) &titles )->join( "\n - " ) ); + tqDebug( "Docfiles:\n - " + dcfs.join( "\n - " ) ); + tqDebug( "IndexPages:\n - " + indexes.join( "\n - " ) ); + tqDebug( "DocIcons:\n - " + icons.join( "\n - " ) ); + tqDebug( "ImageDirs:\n - " + imgDirs.join( "\n - " ) ); #endif } @@ -374,6 +374,6 @@ bool Config::sideBarHidden() const TQString Config::assistantDocPath() const { return profil->props["assistantdocs"].isEmpty() - ? TQString( qInstallPathDocs() ) + "/html" + ? TQString( tqInstallPathDocs() ) + "/html" : profil->props["assistantdocs"]; } diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index adf39f2fe..abce3ae84 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -81,7 +81,7 @@ static bool verifyDirectory(const TQString &str) if (!dirInfo.exists()) return TQDir().mkdir(str); if (!dirInfo.isDir()) { - qWarning("'%s' exists but is not a directory", str.latin1()); + tqWarning("'%s' exists but is not a directory", str.latin1()); return FALSE; } return TRUE; @@ -268,7 +268,7 @@ void HelpDialog::removeOldCacheFiles() { TQString dir = cacheFilesPath; // ### remove the last '/' ? if (!verifyDirectory(cacheFilesPath)) { - qWarning( "Failed to created assistant directory" ); + tqWarning( "Failed to created assistant directory" ); return; } TQString pname = "." + Config::configuration()->profileName(); diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp index 24372feed..785f27bc6 100644 --- a/tools/assistant/index.cpp +++ b/tools/assistant/index.cpp @@ -158,7 +158,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "can not open file " + filename ); + tqWarning( "can not open file " + filename ); return; } @@ -327,7 +327,7 @@ TQString Index::getDocumentTitle( const TQString &fileName ) { TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return fileName; } TQTextStream s( &file ); @@ -450,7 +450,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & { TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return FALSE; } diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index 64bb8ee98..8954709cd 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -286,7 +286,7 @@ int main( int argc, char ** argv ) } if( resourceDir.isNull() ) - resourceDir = qInstallPathTranslations(); + resourceDir = tqInstallPathTranslations(); TQTranslator translator( 0 ); translator.load( TQString("assistant_") + TQTextCodec::locale(), resourceDir ); diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index d9847b8df..662f890cb 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -412,7 +412,7 @@ void MainWindow::showLinkFromClient( const TQString &link ) void MainWindow::showLink( const TQString &link ) { if( link.isEmpty() ) { - qWarning( "The link is empty!" ); + tqWarning( "The link is empty!" ); } int find = link.find( '#' ); @@ -441,7 +441,7 @@ void MainWindow::showLink( const TQString &link ) void MainWindow::showLinks( const TQStringList &links ) { if ( links.size() == 0 ) { - qWarning( "MainWindow::showLinks() - Empty link" ); + tqWarning( "MainWindow::showLinks() - Empty link" ); return; } @@ -482,7 +482,7 @@ void MainWindow::timerEvent(TQTimerEvent *e) void MainWindow::showTQtHelp() { - showLink( TQString( qInstallPathDocs() ) + "/html/index.html" ); + showLink( TQString( tqInstallPathDocs() ) + "/html/index.html" ); } void MainWindow::showSettingsDialog() diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp index 231520eef..d7634646e 100644 --- a/tools/assistant/profile.cpp +++ b/tools/assistant/profile.cpp @@ -45,7 +45,7 @@ Profile *Profile::createDefaultProfile( const TQString &docPath ) { - TQString path = qInstallPathDocs(); + TQString path = tqInstallPathDocs(); if ( !docPath.isEmpty() ) path = docPath; path = path + "/html/"; @@ -116,9 +116,9 @@ void Profile::removeDocFileEntry( const TQString &docfile ) } #ifdef ASSISTANT_DEBUG - qDebug( "docs:\n - " + docs.join( "\n - " ) ); - qDebug( "titles:\n - " + titles.join( "\n - " ) ); - qDebug( "keys:\n - " + ( (TQStringList*) &(dcfTitles.keys()) )->join( "\n - " ) ); - qDebug( "values:\n - " + ( (TQStringList*) &(dcfTitles.values()) )->join( "\n - " ) ); + tqDebug( "docs:\n - " + docs.join( "\n - " ) ); + tqDebug( "titles:\n - " + titles.join( "\n - " ) ); + tqDebug( "keys:\n - " + ( (TQStringList*) &(dcfTitles.keys()) )->join( "\n - " ) ); + tqDebug( "values:\n - " + ( (TQStringList*) &(dcfTitles.values()) )->join( "\n - " ) ); #endif } diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index bb25fa86e..e374a3cc3 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -2220,7 +2220,7 @@ void AddMenuCommand::execute() void AddMenuCommand::unexecute() { if ( !item ) { - qWarning( "The AddMenuCommand was created without a menu item." ); + tqWarning( "The AddMenuCommand was created without a menu item." ); return; } item->menu()->hide(); diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index 515715200..955d0ba17 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -764,7 +764,7 @@ void CustomWidgetEditor::loadDescription() TQString errMsg; int errLine; if ( !doc.setContent( &f, &errMsg, &errLine ) ) { - qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); return; } diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index 25d0f3340..b27ba3301 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -911,7 +911,7 @@ static HierarchyItem::Type getChildType( int type ) { switch ( (HierarchyItem::Type)type ) { case HierarchyItem::Widget: - qWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" ); + tqWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" ); break; case HierarchyItem::SlotParent: case HierarchyItem::SlotPublic: diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index 2f0393b1c..5262e49cb 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -774,7 +774,7 @@ void GridLayout::doLayout() ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { - qWarning("ooops, widget '%s' does not fit in layout", w->name() ); + tqWarning("ooops, widget '%s' does not fit in layout", w->name() ); } } finishLayout( needMove, layout ); diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 1d97ffe44..315cbb631 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -133,7 +133,7 @@ MainWindow *MainWindow::self = 0; TQString assistantPath() { - TQString path = TQDir::cleanDirPath( TQString( qInstallPathBins() ) + + TQString path = TQDir::cleanDirPath( TQString( tqInstallPathBins() ) + TQDir::separator() ); return path; } @@ -2794,7 +2794,7 @@ void MainWindow::setSnapGrid( bool b ) TQString MainWindow::documentationPath() const { - return TQString( qInstallPathDocs() ) + "/html/"; + return TQString( tqInstallPathDocs() ) + "/html/"; } void MainWindow::windowsMenuActivated( int id ) @@ -3421,7 +3421,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) fw = ff->formWindow(); if ( !fw && !qwf_forms ) { - qWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" ); + tqWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" ); return; } diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index dbff60da0..69708a37c 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -1450,7 +1450,7 @@ void MainWindow::createNewTemplate() const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; - templRoots << qInstallPathData(); + templRoots << tqInstallPathData(); if(qtdir) //try the tools/designer directory last! templRoots << (TQString(qtdir) + "/tools/designer"); TQFile f; diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index 302ee5328..e28d77f3e 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -152,7 +152,7 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -191,7 +191,7 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -204,7 +204,7 @@ TQStringList MetaDataBase::changedProperties( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -222,7 +222,7 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -237,7 +237,7 @@ TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property ) return ( (PropertyObject*)o )->mdPropertyComment( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -254,7 +254,7 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -268,7 +268,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) return ( (PropertyObject*)o )->mdFakeProperty( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQVariant(); } @@ -284,7 +284,7 @@ TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return 0; } @@ -298,7 +298,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -326,7 +326,7 @@ int MetaDataBase::spacing( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return -1; } @@ -341,7 +341,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -383,7 +383,7 @@ int MetaDataBase::margin( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return -1; } @@ -397,7 +397,7 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -414,7 +414,7 @@ TQString MetaDataBase::resizeMode( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -427,7 +427,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -461,7 +461,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -490,7 +490,7 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -538,7 +538,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -560,7 +560,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -573,7 +573,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -595,7 +595,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -616,7 +616,7 @@ void MetaDataBase::doConnections( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -670,7 +670,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -714,7 +714,7 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -735,7 +735,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -759,7 +759,7 @@ void MetaDataBase::setFunctionList( TQObject *o, const TQValueList<Function> &fu setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -773,7 +773,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -797,7 +797,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQString &function ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -815,7 +815,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, boo setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Function>(); } @@ -834,7 +834,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Function>(); } @@ -852,7 +852,7 @@ void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -876,7 +876,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -900,7 +900,7 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -944,7 +944,7 @@ TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &functio setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1038,7 +1038,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return; } @@ -1051,7 +1051,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return TQWidgetList(); } @@ -1064,7 +1064,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1077,7 +1077,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Include>(); } @@ -1090,7 +1090,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1103,7 +1103,7 @@ TQStringList MetaDataBase::forwards( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -1116,7 +1116,7 @@ void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1129,7 +1129,7 @@ void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQStrin setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1144,7 +1144,7 @@ void MetaDataBase::removeVariable( TQObject *o, const TQString &name ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1162,7 +1162,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<MetaDataBase::Variable>(); } @@ -1175,7 +1175,7 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -1203,7 +1203,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1236,7 +1236,7 @@ TQStringList MetaDataBase::signalList( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -1249,7 +1249,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1262,7 +1262,7 @@ MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return MetaInfo(); } @@ -1308,7 +1308,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) } MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return; } @@ -1399,7 +1399,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1415,7 +1415,7 @@ TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1430,7 +1430,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1450,7 +1450,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg ) } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1468,7 +1468,7 @@ TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1491,7 +1491,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1508,7 +1508,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString> setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1523,7 +1523,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQMap<TQString, TQString>(); } @@ -1589,7 +1589,7 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1612,7 +1612,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<uint>(); } @@ -1627,7 +1627,7 @@ void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1641,7 +1641,7 @@ TQString MetaDataBase::breakPointCondition( TQObject *o, int line ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1662,7 +1662,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString ¯o ) } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1679,7 +1679,7 @@ TQString MetaDataBase::exportMacro( TQObject *o ) return ( (PropertyObject*)o )->mdExportMacro(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return ""; } diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp index 4636bc9d5..8bbc41f21 100644 --- a/tools/designer/designer/newformimpl.cpp +++ b/tools/designer/designer/newformimpl.cpp @@ -289,7 +289,7 @@ void NewForm::insertTemplates( TQIconView *tView, const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; - templRoots << qInstallPathData(); + templRoots << tqInstallPathData(); if(qtdir) //try the tools/designer directory last! templRoots << (TQString(qtdir) + "/tools/designer"); for ( TQStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index de90f369f..fc93bf882 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -83,7 +83,7 @@ void PixmapView::previewUrl( const TQUrl &u ) if ( !pix.isNull() ) setPixmap( pix ); } else { - qWarning( "Previewing remote files not supported." ); + tqWarning( "Previewing remote files not supported." ); } } diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index 2d5dc2dd2..65ee8bbb4 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -1048,7 +1048,7 @@ void Project::loadConnections() dbConnections.append( conn ); } } else { - qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } f.close(); } @@ -1583,7 +1583,7 @@ TQString Project::locationOfObject( TQObject *o ) extern TQMap<TQWidget*, TQString> *qwf_forms; if ( !qwf_forms ) { - qWarning( "Project::locationOfObject: qwf_forms is NULL!" ); + tqWarning( "Project::locationOfObject: qwf_forms is NULL!" ); return TQString::null; } diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index af0db8e31..db8b12ac0 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -118,7 +118,7 @@ static TQStringList getFontList() { if ( !fontDataBase ) { fontDataBase = new TQFontDatabase; - qAddPostRoutine( cleanupFontDatabase ); + tqAddPostRoutine( cleanupFontDatabase ); } return fontDataBase->families(); } @@ -150,7 +150,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) { if ( !href.isEmpty() ) { TQAssistantClient *ac = MainWindow::self->assistantClient(); - ac->showPage( TQString( qInstallPathDocs() ) + "/html/" + href ); + ac->showPage( TQString( tqInstallPathDocs() ) + "/html/" + href ); } return FALSE; // do not hide window } diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 96720dc4e..36af97757 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -1756,7 +1756,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; } default: - qWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t ); + tqWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t ); } } @@ -1803,7 +1803,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) - qWarning( "####### loading custom container widgets without page support not implemented!" ); + tqWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { @@ -2367,9 +2367,9 @@ void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent ) TQByteArray bazip = ba; int i = 0; if (compress) { - bazip = qCompress( ba ); + bazip = tqCompress( ba ); format += ".GZ"; - // The first 4 bytes in qCompress() are the length of the unzipped + // The first 4 bytes in tqCompress() are the length of the unzipped // format. The XPM.GZ format does not use these. i = 4; } diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp index 99329a25c..47468ceab 100644 --- a/tools/designer/designer/wizardeditorimpl.cpp +++ b/tools/designer/designer/wizardeditorimpl.cpp @@ -252,7 +252,7 @@ void WizardEditor::itemDropped( TQListBoxItem * i ) // Assumes that only one item has been moved. int droppedItem = listBox->index( i ); - //qDebug( "Moving page %d -> %d", draggedItem, droppedItem ); + //tqDebug( "Moving page %d -> %d", draggedItem, droppedItem ); MoveWizardPageCommand *cmd = new MoveWizardPageCommand( tr( "Move page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); commands.append( cmd ); } diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp index 11adb7f94..d8498dc3a 100644 --- a/tools/designer/editor/yyindent.cpp +++ b/tools/designer/editor/yyindent.cpp @@ -1115,7 +1115,7 @@ static TQString fileContents( const TQString& fileName ) { TQFile f( fileName ); if ( !f.open(IO_ReadOnly) ) { - qWarning( "yyindent error: Cannot open file '%s' for reading: %s", + tqWarning( "yyindent error: Cannot open file '%s' for reading: %s", fileName.latin1(), strerror(errno) ); return TQString::null; } @@ -1124,14 +1124,14 @@ static TQString fileContents( const TQString& fileName ) TQString contents = t.read(); f.close(); if ( contents.isEmpty() ) - qWarning( "yyindent error: File '%s' is empty", fileName.latin1() ); + tqWarning( "yyindent error: File '%s' is empty", fileName.latin1() ); return contents; } int main( int argc, char **argv ) { if ( argc != 2 ) { - qWarning( "usage: yyindent file.cpp" ); + tqWarning( "usage: yyindent file.cpp" ); return 1; } diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp index 3e42fd99e..d9b0df31f 100644 --- a/tools/designer/examples/book/connection.cpp +++ b/tools/designer/examples/book/connection.cpp @@ -18,9 +18,9 @@ bool createConnections() defaultDB->setPassword( DB_BOOKS_PASSWD ); defaultDB->setHostName( DB_BOOKS_HOST ); if ( ! defaultDB->open() ) { - qWarning( "Failed to open books database: " + + tqWarning( "Failed to open books database: " + defaultDB->lastError().driverText() ); - qWarning( defaultDB->lastError().databaseText() ); + tqWarning( defaultDB->lastError().databaseText() ); return FALSE; } diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp index 4073752bf..bec1bd9fb 100644 --- a/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tools/designer/plugins/cppeditor/yyreg.cpp @@ -71,7 +71,7 @@ enum { Tok_Boi, Tok_Ampersand, Tok_Aster, Tok_LeftParen, Tok_RightParen, /* The following variables store the lexical analyzer state. The best way to understand them is to implement a function myGetToken() that calls - getToken(), to add some qDebug() statements in there and then to + getToken(), to add some tqDebug() statements in there and then to #define getToken() myGetToken(). */ static TQString *yyIn; // the input stream @@ -143,7 +143,7 @@ static void stopTokenizer() */ static int getToken() { - // why "+ 2"? try putting some qDebug()'s and see + // why "+ 2"? try putting some tqDebug()'s and see yyPos = yyCurPos + 2; for ( ;; ) { @@ -177,7 +177,7 @@ static int getToken() around with the tokenizer state to effectively ignore the comment. Beware of off-by-one and off-by-two bugs when you modify this code by adding - qDebug()'s here and there. + tqDebug()'s here and there. */ if ( yyCurPos >= 0 ) { int lineStart = yyIn->findRev( TQChar('\n'), yyCurPos ) + 1; diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index da0cd5002..e44c285f2 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -1617,7 +1617,7 @@ TQStringList Dlg2Ui::convertTQtArchitectDlgFile( const TQString& fileName ) outf.setName( outFileName ); if ( !outf.open(IO_WriteOnly) ) { - qWarning( "dlg2ui: Could not open output file '%s'", + tqWarning( "dlg2ui: Could not open output file '%s'", outFileName.latin1() ); return TQStringList(); } diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index f886a2595..4d4eae25e 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -2181,7 +2181,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) outFileName += TQString( ".ui" ); FILE *out = fopen( outFileName.latin1(), "w" ); if ( out == 0 ) { - qWarning( "glade2ui: Could not open file '%s'", + tqWarning( "glade2ui: Could not open file '%s'", outFileName.latin1() ); } else { if ( !yyOut.isEmpty() ) diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index a5a46fe79..e92301924 100644 --- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -251,7 +251,7 @@ bool KDEVDLG2UI::parse() TQString outputFile = TQString( className ) + ".ui"; fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); targetFiles.append( outputFile ); } else { @@ -515,7 +515,7 @@ bool KDEVDLG2UI::writeDialog( const TQString& name ) writeColor( "paletteBackgroundColor", color ); } //else { //if ( line.length() ) - //qDebug( "IGNORED: %s", line.latin1() ); + //tqDebug( "IGNORED: %s", line.latin1() ); //} } *out << "</UI>" << endl; diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index 1e7c34663..e5ccdce29 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -89,7 +89,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) - qWarning( "uic: Could not open file '%s' ", filename.latin1() ); + tqWarning( "uic: Could not open file '%s' ", filename.latin1() ); TQTextStream in; in.setDevice( &file ); diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index 7d899743e..6ff2fda15 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -87,7 +87,7 @@ TQStringList RCFilter::import( const TQString &, const TQString& filename ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) - qWarning( "uic: Could not open file '%s' ", filename.latin1() ); + tqWarning( "uic: Could not open file '%s' ", filename.latin1() ); TQTextStream in; in.setDevice( &file ); diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp index f88f9d431..9730b8062 100644 --- a/tools/designer/plugins/rc/rc2ui.cpp +++ b/tools/designer/plugins/rc/rc2ui.cpp @@ -380,7 +380,7 @@ bool RC2UI::makeDialog() TQString outputFile = TQString(className) + ".ui"; fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); targetFiles.append( outputFile ); } else { @@ -838,7 +838,7 @@ bool RC2UI::makeStringTable() if (outputFile ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); } diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp index 67c584b94..31e561725 100644 --- a/tools/designer/tools/conv2ui/main.cpp +++ b/tools/designer/tools/conv2ui/main.cpp @@ -76,12 +76,12 @@ bool Conv2ui::reinit() bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) { if ( !importFiltersManager ) { - qWarning( "Conv2ui: no TQPluginManager was found" ); + tqWarning( "Conv2ui: no TQPluginManager was found" ); return FALSE; } if ( !TQFile::exists( absName( filename ) ) ) { - qWarning( "Conv2ui: can not find file %s", filename.latin1() ); + tqWarning( "Conv2ui: can not find file %s", filename.latin1() ); return FALSE; } diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index 63cbd9bc1..bd9088ea9 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -78,7 +78,7 @@ static TQString convertToCIdentifier( const char *s ) static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) { #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION - TQByteArray bazip( qCompress( input, nbytes ) ); + TQByteArray bazip( tqCompress( input, nbytes ) ); ulong len = bazip.size(); #else ulong len = nbytes; diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp index dbb3962a4..b0048e5bd 100644 --- a/tools/designer/uic/main.cpp +++ b/tools/designer/uic/main.cpp @@ -265,7 +265,7 @@ int main( int argc, char * argv[] ) if ( !outputFile.isEmpty() ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) { - qWarning( "uic: Could not open output file '%s'", outputFile.data() ); + tqWarning( "uic: Could not open output file '%s'", outputFile.data() ); return 1; } } else { @@ -283,7 +283,7 @@ int main( int argc, char * argv[] ) TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "uic: Could not open file '%s'", fileName ); + tqWarning( "uic: Could not open file '%s'", fileName ); return 1; } @@ -291,13 +291,13 @@ int main( int argc, char * argv[] ) TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) { - qWarning( TQString("uic: Failed to parse %s: ") + errMsg + TQString (" in line %d"), fileName, errLine ); + tqWarning( TQString("uic: Failed to parse %s: ") + errMsg + TQString (" in line %d"), fileName, errLine ); return 1; } TQDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) { - qWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"), + tqWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"), e.attribute("version").latin1(), TQT_VERSION_STR ); return 1; } @@ -350,7 +350,7 @@ int main( int argc, char * argv[] ) out << "#endif // " << protector << endl; } if ( fileOut.status() != IO_Ok ) { - qWarning( "uic: Error writing to file" ); + tqWarning( "uic: Error writing to file" ); if ( !outputFile.isEmpty() ) remove( outputFile ); } diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp index 194bb6154..17e651f06 100644 --- a/tools/designer/uic/subclassing.cpp +++ b/tools/designer/uic/subclassing.cpp @@ -345,7 +345,7 @@ void Uic::writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList & out << " */" << endl; out << type << " " << subClass << "::" << (*it) << endl; out << "{" << endl; - out << " qWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl; + out << " tqWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl; out << "}" << endl << endl; } out << endl; diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index 9cd0ad75d..d1844bb28 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -344,7 +344,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge if ( doc.setContent( dev, &errMsg, &errLine ) ) { w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { - // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + // tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } } if ( !w ) { @@ -701,7 +701,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -768,7 +768,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -833,7 +833,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, pixmaps << value.asPixmap(); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -904,7 +904,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, popupMenu->insertSeparator(); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -1091,7 +1091,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, TQBrush(color, value.asPixmap()) ); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> paletteTag; } @@ -1156,7 +1156,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; metAttribute--; @@ -1193,14 +1193,14 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, in >> lf; in >> cr; if ( lf != '\n' || cr != '\r' ) { - qWarning( "File corrupted" ); + tqWarning( "File corrupted" ); return 0; } Q_UINT8 qdatastreamVersion; in >> qdatastreamVersion; if ( (int) qdatastreamVersion > in.version() ) { - qWarning( "Incompatible version of TQt" ); + tqWarning( "Incompatible version of TQt" ); return 0; } in.setVersion( qdatastreamVersion ); @@ -1259,7 +1259,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, unpackStringSplit( strings, in, slot ); // ### #if 0 - qWarning( "connect( %p, %s, %p, %s )", objects[senderNo], + tqWarning( "connect( %p, %s, %p, %s )", objects[senderNo], signal.latin1(), objects[receiverNo], slot.latin1() ); #endif @@ -1268,7 +1268,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Functions: // ### - qWarning( "Block_Functions not supported" ); + tqWarning( "Block_Functions not supported" ); in.device()->at( nextBlock ); break; case Block_Images: @@ -1350,7 +1350,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Variables: // ### - qWarning( "Block_Variables not supported" ); + tqWarning( "Block_Variables not supported" ); in.device()->at( nextBlock ); break; case Block_Widget: @@ -1361,7 +1361,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, toplevel->setName( name ); break; default: - qWarning( "Version error" ); + tqWarning( "Version error" ); return 0; } in >> blockType; @@ -1640,7 +1640,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget TQString parentClassName = parent ? parent->className() : 0; bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) - qWarning( "####### loading custom container widgets without page support not implemented!" ); + tqWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages #endif diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index eaa339d6f..79cac514f 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -769,7 +769,7 @@ void TrWindow::newPhraseBook() void TrWindow::openPhraseBook() { - TQString phrasebooks( qInstallPathData() ); + TQString phrasebooks( tqInstallPathData() ); TQString name = TQFileDialog::getOpenFileName( phrasebooks + "/phrasebooks", tr("TQt phrase books (*.qph)\n" "All files (*)"), @@ -852,8 +852,8 @@ void TrWindow::revertSorting() void TrWindow::manual() { - TQAssistantClient *ac = new TQAssistantClient( qInstallPathBins(), this ); - ac->showPage( TQString( qInstallPathDocs() ) + "/html/linguist-manual.html" ); + TQAssistantClient *ac = new TQAssistantClient( tqInstallPathBins(), this ); + ac->showPage( TQString( tqInstallPathDocs() ) + "/html/linguist-manual.html" ); } void TrWindow::about() diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp index 7201f3a0e..7ff6a0387 100644 --- a/tools/linguist/lupdate/fetchtr.cpp +++ b/tools/linguist/lupdate/fetchtr.cpp @@ -176,7 +176,7 @@ static int getToken() break; case 'T': // TR() for when all else fails - if ( qstricmp(yyIdent + 1, "R") == 0 ) + if ( tqstricmp(yyIdent + 1, "R") == 0 ) return Tok_tr; break; case 'c': @@ -350,7 +350,7 @@ static int getToken() yyString[yyStringLen] = '\0'; if ( yyCh != '"' ) - qWarning( "%s:%d: Unterminated C++ string", + tqWarning( "%s:%d: Unterminated C++ string", (const char *) yyFileName, yyLineNo ); if ( yyCh == EOF ) { @@ -551,7 +551,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQString::null, utf8) ); if ( lacks_TQ_OBJECT.contains(context) ) { - qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", + tqWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); lacks_TQ_OBJECT.remove( context ); @@ -622,7 +622,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, case Tok_Arrow: yyTok = getToken(); if ( yyTok == Tok_tr || yyTok == Tok_trUtf8 ) - qWarning( "%s:%d: Cannot invoke tr() like this", + tqWarning( "%s:%d: Cannot invoke tr() like this", (const char *) yyFileName, yyLineNo ); break; case Tok_Gulbrandsen: @@ -639,7 +639,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, if ( yyBraceDepth == (int) namespaces.count() ) { if ( missing_TQ_OBJECT ) { if ( needs_TQ_OBJECT.contains(functionContext) ) { - qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", + tqWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); } else { diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp index 8abd2162e..cfe9bc9e4 100644 --- a/tools/makeqpf/main.cpp +++ b/tools/makeqpf/main.cpp @@ -242,16 +242,16 @@ private slots: static void usage() { - qWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]"); - qWarning(""); - qWarning(" Saves TQPF font files by rendering and saving fonts."); - qWarning(""); - qWarning(" -A = Render and save all fonts in fontdir"); - qWarning(" -f = File of lines:"); - qWarning(" fontname character-ranges"); - qWarning(" eg."); - qWarning(" smoothtimes 0-ff,20a0-20af"); - qWarning(" font = Font to render and save"); + tqWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]"); + tqWarning(""); + tqWarning(" Saves TQPF font files by rendering and saving fonts."); + tqWarning(""); + tqWarning(" -A = Render and save all fonts in fontdir"); + tqWarning(" -f = File of lines:"); + tqWarning(" fontname character-ranges"); + tqWarning(" eg."); + tqWarning(" smoothtimes 0-ff,20a0-20af"); + tqWarning(" font = Font to render and save"); } int main(int argc, char** argv) @@ -303,7 +303,7 @@ int main(int argc, char** argv) m.save(family); } } else { - qWarning("Cannot open %s",specfile.latin1()); + tqWarning("Cannot open %s",specfile.latin1()); } } else { while (*argv) diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp index fa9265b46..b87875657 100644 --- a/tools/mergetr/mergetr.cpp +++ b/tools/mergetr/mergetr.cpp @@ -186,7 +186,7 @@ void writecomment( TQTextStream &str, const TQString &s ) while ( idx < len ) { int nl = s.find( '\n', idx ); if ( nl < 0 ) { - qWarning( "writecomment: string lacks newline" ); + tqWarning( "writecomment: string lacks newline" ); str << "# " << s.mid( idx ) << '\n'; return; } diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp index 49d6302d9..2b88dc9c9 100644 --- a/tools/msg2qm/msg2qm.cpp +++ b/tools/msg2qm/msg2qm.cpp @@ -110,7 +110,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt scope = *defaultScope; if (translator->contains( scope.ascii(), id.ascii() ) ) { - qWarning("Error: \"%s\" already in use", msgid.ascii() ); + tqWarning("Error: \"%s\" already in use", msgid.ascii() ); } else { translator->insert( scope.latin1(), id.latin1(), msgstr ); diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index dcfcfde63..b891cac0f 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -422,7 +422,7 @@ void Main::loadFeatures(const TQString& filename) sectioncontents[sec].append(feature); choices.append(feature); } else { - qDebug("Unparsed text"); + tqDebug("Unparsed text"); } feature = lab = sec = TQString::null; @@ -439,7 +439,7 @@ void Main::loadFeatures(const TQString& filename) int colon = line.find(':'); if ( colon < 0 ) { - qDebug("Cannot parse: %s",line.ascii()); + tqDebug("Cannot parse: %s",line.ascii()); } else { TQString tag = line.left(colon); TQString value = line.mid(colon+1).stripWhiteSpace(); @@ -513,7 +513,7 @@ void Main::loadFeatures(const TQString& filename) deps.clear(); } else if ( token[0].isEmpty() ) { } else { - qDebug("Cannot parse: %s",token.join(" ").ascii()); + tqDebug("Cannot parse: %s",token.join(" ").ascii()); } } else if ( token[0] == "#include" ) { on = TRUE; @@ -545,7 +545,7 @@ void Main::createItem(const TQString& ch) for (TQStringList::Iterator dp = deps.begin(); dp != deps.end(); ++dp) { TQString dsec = section[*dp]; if ( dsec.isEmpty() ) - qDebug("No section for %s",(*dp).latin1()); + tqDebug("No section for %s",(*dp).latin1()); if ( !parent && dsec == sec ) { createItem(*dp); parent = item[*dp]; @@ -582,7 +582,7 @@ void Main::loadConfig(const TQString& filename) if ( i ) i->setDefined(TRUE); else - qDebug("The item %s is not used by ntqfeatures.h", token[1].latin1()); + tqDebug("The item %s is not used by ntqfeatures.h", token[1].latin1()); } } while (!s.atEnd()); } @@ -608,14 +608,14 @@ void Main::updateAvailability(TQListViewItem* i) if ( dd->isDefined() || !dd->isAvailable() ) av = FALSE; } else - qDebug("%s ???",(*dit).latin1()); + tqDebug("%s ???",(*dit).latin1()); } if ( d->isAvailable() != av ) { d->setAvailable(av); updateAvailability(d); } } -qDebug("%s: %d",choice->id.latin1(),choice->isAvailable()); +tqDebug("%s: %d",choice->id.latin1(),choice->isAvailable()); } } diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp index 80fe1113c..9a3336e41 100644 --- a/tools/qembed/qembed.cpp +++ b/tools/qembed/qembed.cpp @@ -55,7 +55,7 @@ struct EmbedImage { int main( int argc, char **argv ) { if ( argc < 2 ) { - qWarning( "Usage:\n\t%s [--images] files", argv[0] ); + tqWarning( "Usage:\n\t%s [--images] files", argv[0] ); return 1; } @@ -103,19 +103,19 @@ int main( int argc, char **argv ) } else { TQFile f( *it ); if ( !f.open(IO_ReadOnly) ) { - qWarning( "Cannot open file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot open file %s, ignoring it", (*it).latin1() ); continue; } TQByteArray a( f.size() ); if ( f.size() == 0 || f.readBlock(a.data(), f.size()) != (int)f.size() ) { - qWarning( "Cannot read file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot read file %s, ignoring it", (*it).latin1() ); continue; } if ( images ) { TQImage img; if ( !img.loadFromData(a) ) { - qWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() ); continue; } EmbedImage *e = new EmbedImage; diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 0d3cd74db..79506cef2 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -60,7 +60,7 @@ // from qapplication.cpp and qapplication_x11.cpp - These are NOT for // external use ignore them -extern bool Q_EXPORT qt_resolve_symlinks; +extern bool Q_EXPORT tqt_resolve_symlinks; static const char *appearance_text = @@ -290,7 +290,7 @@ MainWindow::MainWindow() dcispin->setValue(TQApplication::doubleClickInterval()); cfispin->setValue(TQApplication::cursorFlashTime()); wslspin->setValue(TQApplication::wheelScrollLines()); - resolvelinks->setChecked(qt_resolve_symlinks); + resolvelinks->setChecked(tqt_resolve_symlinks); effectcheckbox->setChecked(TQApplication::isEffectEnabled(UI_General)); effectbase->setEnabled(effectcheckbox->isChecked()); diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp index aa408fa64..552515840 100644 --- a/tools/qvfb/main.cpp +++ b/tools/qvfb/main.cpp @@ -86,7 +86,7 @@ int main( int argc, char *argv[] ) displayId = displaySpec.mid( m+1, rx.matchedLength()-1 ).toInt(); } - qDebug( "Using display %d", displayId ); + tqDebug( "Using display %d", displayId ); TQVFb mw( displayId, width, height, depth, skin ); app.setMainWidget( &mw ); diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index 8a3c32cca..9ae1e8690 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -251,7 +251,7 @@ public: TQAnimationWriter::TQAnimationWriter( const TQString& filename, const char* format ) { if ( TQCString(format) != "MNG" ) { - qWarning("Format \"%s\" not supported, only MNG", format); + tqWarning("Format \"%s\" not supported, only MNG", format); dev = 0; d = 0; } else { @@ -389,7 +389,7 @@ void TQAnimationWriter::appendFrame(const TQImage& frm, const TQPoint& offset) } } } -qDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); +tqDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); d->composeImage(diff,TQPoint(minx,miny)+offset); } if ( prev.isNull() || prev.size() == frame.size() && offset == TQPoint(0,0) ) { diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 1532fe36c..a23bab69b 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -88,7 +88,7 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, break; default: - qFatal( "Unsupported bit depth %d\n", d ); + tqFatal( "Unsupported bit depth %d\n", d ); } mousePipe = TQString(QT_VFB_MOUSE_PIPE).arg(display_id); @@ -99,14 +99,14 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, mouseFd = open( mousePipe.latin1(), O_RDWR | O_NDELAY ); if ( mouseFd == -1 ) { - qFatal( "Cannot open mouse pipe" ); + tqFatal( "Cannot open mouse pipe" ); } unlink( keyboardPipe ); mkfifo( keyboardPipe, 0666 ); keyboardFd = open( keyboardPipe, O_RDWR | O_NDELAY ); if ( keyboardFd == -1 ) { - qFatal( "Cannot open keyboard pipe" ); + tqFatal( "Cannot open keyboard pipe" ); } key_t key = ftok( mousePipe.latin1(), 'b' ); @@ -129,7 +129,7 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, } if ( (long)data == -1 ) - qFatal( "Cannot attach to shared memory" ); + tqFatal( "Cannot attach to shared memory" ); hdr = (TQVFbHeader *)data; hdr->width = w; @@ -215,7 +215,7 @@ void TQVFbView::setGamma(double gr, double gg, double gb) if ( g > 255 ) g = 255; if ( b > 255 ) b = 255; gammatable[i] = tqRgb(r,g,b); -//qDebug("%d: %d,%d,%d",i,r,g,b); +//tqDebug("%d: %d,%d,%d",i,r,g,b); } setDirty(rect()); @@ -282,25 +282,25 @@ static TQString qws_dataDir() TQString dataDir = "/tmp/qtembedded-" + username; if ( mkdir( dataDir.latin1(), 0700 ) ) { if ( errno != EEXIST ) { - qFatal( TQString("Cannot create TQt/Embedded data directory: %1") + tqFatal( TQString("Cannot create TQt/Embedded data directory: %1") .arg( dataDir ) ); } } struct stat buf; if ( lstat( dataDir.latin1(), &buf ) ) - qFatal( TQString( "stat failed for TQt/Embedded data directory: %1" ) + tqFatal( TQString( "stat failed for TQt/Embedded data directory: %1" ) .arg( dataDir ) ); if ( !S_ISDIR( buf.st_mode ) ) - qFatal( TQString( "%1 is not a directory" ).arg( dataDir ) ); + tqFatal( TQString( "%1 is not a directory" ).arg( dataDir ) ); if ( buf.st_uid != getuid() ) - qFatal( TQString( "TQt/Embedded data directory is not owned by user %1" ) + tqFatal( TQString( "TQt/Embedded data directory is not owned by user %1" ) .arg( getuid() ) ); if ( (buf.st_mode & 0677) != 0600 ) - qFatal( TQString( "TQt/Embedded data directory has incorrect permissions: %1" ) + tqFatal( TQString( "TQt/Embedded data directory has incorrect permissions: %1" ) .arg( dataDir ) ); dataDir += "/"; @@ -485,7 +485,7 @@ void TQVFbView::drawScreen() TQRect r( hdr->update ); hdr->dirty = FALSE; hdr->update = TQRect(); - // qDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); + // tqDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); r = r.intersect( TQRect(0, 0, hdr->width, hdr->height ) ); if ( !r.isEmpty() ) { if ( int(zm) != zm ) { diff --git a/tutorial/t10/lcdrange.cpp b/tutorial/t10/lcdrange.cpp index 6e8fc0b59..cbb60a993 100644 --- a/tutorial/t10/lcdrange.cpp +++ b/tutorial/t10/lcdrange.cpp @@ -37,7 +37,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t11/lcdrange.cpp b/tutorial/t11/lcdrange.cpp index 6e8fc0b59..cbb60a993 100644 --- a/tutorial/t11/lcdrange.cpp +++ b/tutorial/t11/lcdrange.cpp @@ -37,7 +37,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t12/lcdrange.cpp b/tutorial/t12/lcdrange.cpp index ebc525e35..79614365c 100644 --- a/tutorial/t12/lcdrange.cpp +++ b/tutorial/t12/lcdrange.cpp @@ -67,7 +67,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t13/lcdrange.cpp b/tutorial/t13/lcdrange.cpp index 66074e3a8..fb601592a 100644 --- a/tutorial/t13/lcdrange.cpp +++ b/tutorial/t13/lcdrange.cpp @@ -72,7 +72,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t14/lcdrange.cpp b/tutorial/t14/lcdrange.cpp index 66074e3a8..fb601592a 100644 --- a/tutorial/t14/lcdrange.cpp +++ b/tutorial/t14/lcdrange.cpp @@ -72,7 +72,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t8/lcdrange.cpp b/tutorial/t8/lcdrange.cpp index 6e8fc0b59..cbb60a993 100644 --- a/tutorial/t8/lcdrange.cpp +++ b/tutorial/t8/lcdrange.cpp @@ -37,7 +37,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); diff --git a/tutorial/t9/lcdrange.cpp b/tutorial/t9/lcdrange.cpp index 6e8fc0b59..cbb60a993 100644 --- a/tutorial/t9/lcdrange.cpp +++ b/tutorial/t9/lcdrange.cpp @@ -37,7 +37,7 @@ void LCDRange::setValue( int value ) void LCDRange::setRange( int minVal, int maxVal ) { if ( minVal < 0 || maxVal > 99 || minVal > maxVal ) { - qWarning( "LCDRange::setRange(%d,%d)\n" + tqWarning( "LCDRange::setRange(%d,%d)\n" "\tRange must be 0..99\n" "\tand minVal must not be greater than maxVal", minVal, maxVal ); |