diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /doc | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154.tar.gz qt3-9a75b154.zip | |
Undo prior accidental commit
Diffstat (limited to 'doc')
64 files changed, 177 insertions, 177 deletions
diff --git a/doc/debug.doc b/doc/debug.doc index 945f019..d8779b9 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 ::tqDebug() tqDebug()\endlink for writing debug output for testing etc. -\i \link ::tqWarning() tqWarning()\endlink for writing warning output when program +\i \link ::qDebug() qDebug()\endlink for writing debug output for testing etc. +\i \link ::qWarning() qWarning()\endlink for writing warning output when program errors occur. -\i \link ::tqFatal() tqFatal()\endlink for writing fatal error messages +\i \link ::qFatal() qFatal()\endlink for writing fatal error messages and exiting. \endlist @@ -166,12 +166,12 @@ Example: { #if defined(QT_CHECK_NULL) if ( p == 0 ) - tqWarning( "f: Null pointer not allowed" ); + qWarning( "f: Null pointer not allowed" ); #endif #if defined(QT_CHECK_RANGE) if ( i < 0 ) - tqWarning( "f: The index cannot be negative" ); + qWarning( "f: The index cannot be negative" ); #endif } \endcode diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html index 0bdd142..b4b9a43 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="qprogressdialog.html#setProgress">setProgress</a>( rows ); #endif - // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); + // qDebug( "%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 8e455f7..353f092 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 QSqlDatabase *defaultDB = QSqlDatabase::addDatabase( "QPSQL7" ); if ( ! defaultDB ) { - tqWarning( "Failed to connect to driver" ); + qWarning( "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() ) { - tqWarning( "Failed to open books database: " + + qWarning( "Failed to open books database: " + defaultDB->lastError().driverText() ); - tqWarning( defaultDB->lastError().databaseText() ); + qWarning( defaultDB->lastError().databaseText() ); return FALSE; } diff --git a/doc/html/functions.html b/doc/html/functions.html index cd31f2f..a780320 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -2077,7 +2077,7 @@ packImage: <a href="qftp.html#put">QFtp</a> <a href="qurloperator.html#put">QUrlOperator</a><li>putPoints: <a href="qpointarray.html#putPoints">QPointArray</a><li>putch: <a href="qfile.html#putch">QFile</a> <a href="qiodevice.html#putch">QIODevice</a> <a href="qsocket.html#putch">QSocket</a><li><a name="q"></a> -tqAddPostRoutine: +qAddPostRoutine: <a href="qapplication.html#qAddPostRoutine">QApplication</a><li>qAlpha: <a href="qcolor.html#qAlpha">QColor</a><li>qBlue: <a href="qcolor.html#qBlue">QColor</a><li>qChecksum: diff --git a/doc/html/porting.html b/doc/html/porting.html index 7308d7d..5d9d3c7 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 qstrncmp</tt> -<li> <tt>#define stricmp tqstricmp</tt> -<li> <tt>#define strnicmp tqstrnicmp</tt> +<li> <tt>#define stricmp qstricmp</tt> +<li> <tt>#define strnicmp qstrnicmp</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/qapplication.html b/doc/html/qapplication.html index 461406a..411f37e 100644 --- a/doc/html/qapplication.html +++ b/doc/html/qapplication.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 tqDebug might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to qDebug 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 tqFatal might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to qFatal 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 tqWarning might lead +<p> <b>Warning:</b> Passing (const char *)0 as argument to qWarning 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/qcstring-h.html b/doc/html/qcstring-h.html index 79668de..5219aa9 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 *tqmemmove( void *dst, const void *src, uint len ); +Q_EXPORT void *qmemmove( void *dst, const void *src, uint len ); -Q_EXPORT char *tqstrdup( const char * ); +Q_EXPORT char *qstrdup( const char * ); Q_EXPORT inline uint qstrlen( const char *str ) { return str ? (uint)strlen(str) : 0u; } @@ -99,7 +99,7 @@ Q_EXPORT inline uint qstrlen( const char *str ) Q_EXPORT inline char *qstrcpy( char *dst, const char *src ) { return src ? strcpy(dst, src) : 0; } -Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len ); +Q_EXPORT char *qstrncpy( 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 qstrncmp( const char *str1, const char *str2, uint len ) : ( str1 ? 1 : ( str2 ? -1 : 0 ) ); } -Q_EXPORT int tqstricmp( const char *, const char * ); +Q_EXPORT int qstricmp( const char *, const char * ); -Q_EXPORT int tqstrnicmp( const char *, const char *, uint len ); +Q_EXPORT int qstrnicmp( 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 -// tqChecksum: Internet checksum +// qChecksum: Internet checksum -Q_EXPORT Q_UINT16 tqChecksum( const char *s, uint len ); +Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len ); /***************************************************************************** QByteArray class @@ -156,10 +156,10 @@ typedef QMemArray<char> QByteArray; #endif #ifndef QT_NO_COMPRESS -Q_EXPORT QByteArray tqCompress( const uchar* data, int nbytes ); +Q_EXPORT QByteArray qCompress( const uchar* data, int nbytes ); Q_EXPORT QByteArray qUncompress( const uchar* data, int nbytes ); -Q_EXPORT inline QByteArray tqCompress( const QByteArray& data) -{ return tqCompress( (const uchar*)data.data(), data.size() ); } +Q_EXPORT inline QByteArray qCompress( const QByteArray& data) +{ return qCompress( (const uchar*)data.data(), data.size() ); } Q_EXPORT inline QByteArray qUncompress( const QByteArray& data ) { return qUncompress( (const uchar*)data.data(), data.size() ); } #endif diff --git a/doc/html/qgl-h.html b/doc/html/qgl-h.html index 5e32cba..ade7003 100644 --- a/doc/html/qgl-h.html +++ b/doc/html/qgl-h.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } #define QGL_VERSION 450 #define QGL_VERSION_STR "4.5" QM_EXPORT_OPENGL inline const char *qGLVersion() { - tqObsolete( 0, "qGLVersion", "qVersion" ); + qObsolete( 0, "qGLVersion", "qVersion" ); return QGL_VERSION_STR; } #endif diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 681e47a..5aefb57 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 *tqVersion(); -Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian ); -Q_EXPORT bool tqSharedBuild(); +Q_EXPORT const char *qVersion(); +Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); +Q_EXPORT bool qSharedBuild(); #if defined(Q_OS_MAC) int qMacVersion(); #elif defined(Q_WS_WIN) @@ -1003,25 +1003,25 @@ Q_EXPORT int qWinVersion(); #endif -Q_EXPORT void tqDebug( const char *, ... ) // print debug message +Q_EXPORT void qDebug( const char *, ... ) // print debug message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqWarning( const char *, ... ) // print warning message +Q_EXPORT void qWarning( const char *, ... ) // print warning message #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqFatal( const char *, ... ) // print fatal message and exit +Q_EXPORT void qFatal( const char *, ... ) // print fatal message and exit #if defined(Q_CC_GNU) __attribute__ ((format (printf, 1, 2))) #endif ; -Q_EXPORT void tqSystemWarning( const char *, int code = -1 ); +Q_EXPORT void qSystemWarning( const char *, int code = -1 ); #if !defined(QT_CLEAN_NAMESPACE) // compatibility with Qt 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 : tqFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : qFatal("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # else -# define Q_ASSERT(x) ((x) ? (void)0 : tqWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) +# define Q_ASSERT(x) ((x) ? (void)0 : qWarning("ASSERT: \"%s\" in %s (%d)",#x,__FILE__,__LINE__)) # endif # else # define Q_ASSERT(x) @@ -1090,27 +1090,27 @@ Q_EXPORT QtMsgHandler qInstallMsgHandler( QtMsgHandler ); typedef QtMsgHandler msg_handler; #endif // QT_NO_COMPAT -Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE ); +Q_EXPORT void qSuppressObsoleteWarnings( bool = TRUE ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc, +Q_EXPORT void qObsolete( const char *obj, const char *oldfunc, const char *newfunc ); -Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc ); -Q_EXPORT void tqObsolete( const char *message ); +Q_EXPORT void qObsolete( const char *obj, const char *oldfunc ); +Q_EXPORT void qObsolete( const char *message ); // // Install paths from configure // -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(); +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(); #endif /* __cplusplus */ @@ -1125,7 +1125,7 @@ Q_EXPORT const char *tqInstallPathSysconf(); #ifdef Q_FULL_TEMPLATE_INSTANTIATION # define Q_DUMMY_COMPARISON_OPERATOR(C) \ bool operator==( const C& ) const { \ - tqWarning( #C"::operator==( const "#C"& ) got called." ); \ + qWarning( #C"::operator==( const "#C"& ) got called." ); \ return FALSE; \ } #else diff --git a/doc/html/qmake-manual-4.html b/doc/html/qmake-manual-4.html index 1036729..1577835 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 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> +<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> <pre> win32 { debug { diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index d0da1c2..5538adf 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -612,7 +612,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME QMapPrivate<Key,T>::Iterator QMapPrivate< #ifdef QT_CHECK_RANGE # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) -# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "QMap: Warning invalid element" ) +# define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) qWarning( "QMap: 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 54f6c99..dba27ca 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 ) { QString s=QString::fromLatin1(str);\ -QString sq=QString::fromLatin1(tqVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ +QString sq=QString::fromLatin1(qVersion()); 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 ( !qApp){ int c=0; new \ QApplication(argc,argv);} QString s = QApplication::tr("Executable '%1' requires Qt "\ "%2, found Qt %3.").arg(QString::fromLatin1(qAppName())).arg(QString::fromLatin1(\ -str)).arg(QString::fromLatin1(tqVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ -"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); tqFatal(s.ascii()); }} +str)).arg(QString::fromLatin1(qVersion()) ); QMessageBox::critical( 0, QApplication::tr(\ +"Incompatible Qt Library Error" ), s, QMessageBox::Abort,0 ); qFatal(s.ascii()); }} #endif // QT_NO_MESSAGEBOX diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index 9c96e91..db9e396 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; - tqSysInfo( &wordSize, &bigEndian ); + qSysInfo( &wordSize, &bigEndian ); return bigEndian; } diff --git a/doc/html/qstrlist-h.html b/doc/html/qstrlist-h.html index e5136ac..b190bf7 100644 --- a/doc/html/qstrlist-h.html +++ b/doc/html/qstrlist-h.html @@ -100,7 +100,7 @@ public: QStrList& operator=( const QStrList & ); private: - QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; } + QPtrCollection::Item newItem( QPtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; } void deleteItem( QPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } @@ -121,7 +121,7 @@ public: ~QStrIList() { clear(); } private: int compareItems( QPtrCollection::Item s1, QPtrCollection::Item s2 ) - { return tqstricmp((const char*)s1, + { return qstricmp((const char*)s1, (const char*)s2); } }; diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html index 6203589..7fc21a8 100644 --- a/doc/html/qvaluelist-h.html +++ b/doc/html/qvaluelist-h.html @@ -431,7 +431,7 @@ Q_INLINE_TEMPLATES void QValueListPrivate<T>::clear() #ifdef QT_CHECK_RANGE # if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) -# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "QValueList: Warning invalid element" ) +# define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) qWarning( "QValueList: 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 535df08..8a837c8 100644 --- a/doc/html/qwindowdefs-h.html +++ b/doc/html/qwindowdefs-h.html @@ -221,8 +221,8 @@ Q_EXPORT const char *qAppName(); // get application name // Misc functions typedef void (*QtCleanUpFunction)(); -Q_EXPORT void tqAddPostRoutine( QtCleanUpFunction ); -Q_EXPORT void tqRemovePostRoutine( QtCleanUpFunction ); +Q_EXPORT void qAddPostRoutine( QtCleanUpFunction ); +Q_EXPORT void qRemovePostRoutine( QtCleanUpFunction ); #if !defined(QT_CLEAN_NAMESPACE) // source compatibility with Qt 2.x diff --git a/doc/html/tutorial1-08.html b/doc/html/tutorial1-08.html index c1e144d..beb1f66 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 QLCDNumber. (We could have allowed values down to -9 but chose not to.) If the arguments are illegal, we use Qt's <a href="qapplication.html#qWarning">qWarning</a>() function to issue a warning to the user and return -immediately. tqWarning() is a printf-like function that by default +immediately. qWarning() 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="qapplication.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 e13dd49..02bb195 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."; - tqDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() ); - tqDebug( s2.arg(5).arg(10).arg("somefile.txt").ascii() ); + qDebug( s1.arg(5).arg(10).arg("somefile.txt").ascii() ); + qDebug( 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 ab0edbc..8f44919 100644 --- a/doc/mac.doc +++ b/doc/mac.doc @@ -177,7 +177,7 @@ do this: kCFURLPOSIXPathStyle); const char *pathPtr = CFStringGetCStringPtr(macPath, CFStringGetSystemEncoding()); - tqDebug("Path = %s", pathPtr); + qDebug("Path = %s", pathPtr); CFRelease(pluginRef); CFRelease(macPath); \endcode diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt index 45aeaba..0be4627 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 tqWarning() function: +If \fCb\fR is zero, the Q_ASSERT statement will output the following message using the qWarning() 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 tqWarning() and Debugging. +See also qWarning() and Debugging. .SH "void Q_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 tqWarning() and Debugging. -.SH "void tqAddPostRoutine ( QtCleanUpFunction p )" +See also qWarning() and Debugging. +.SH "void qAddPostRoutine ( 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 - tqAddPostRoutine( cleanup_ptr ); // delete later + qAddPostRoutine( cleanup_ptr ); // delete later .br } .br .fi .PP -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. +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. .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 tqDebug ( const char * msg, ... )" +.SH "void qDebug ( 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 - tqDebug( "my window handle = %x", myWidget->id() ); + qDebug( "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 tqDebug might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to qDebug might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also tqWarning(), tqFatal(), qInstallMsgHandler(), and Debugging. -.SH "void tqFatal ( const char * msg, ... )" +See also qWarning(), qFatal(), qInstallMsgHandler(), and Debugging. +.SH "void qFatal ( 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 - tqFatal( "divide: cannot divide by zero" ); + qFatal( "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 tqFatal might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to qFatal might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also tqDebug(), tqWarning(), qInstallMsgHandler(), and Debugging. +See also qDebug(), qWarning(), 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 tqDebug(), tqWarning(), tqFatal(), and Debugging. -.SH "bool tqSysInfo ( int * wordSize, bool * bigEndian )" +See also qDebug(), qWarning(), qFatal(), and Debugging. +.SH "bool qSysInfo ( 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 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 )" +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 )" 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 * tqVersion ()" +.SH "const char * qVersion ()" Returns the Qt version number as a string, for example, "2.3.0" or" 3.0.5". .PP The \fCQT_VERSION\fR define has the numeric value in the form: 0xmmiibb (m = major, i = minor, b = bugfix). For example, Qt 3.0.5's \fCQT_VERSION\fR is 0x030005. -.SH "void tqWarning ( const char * msg, ... )" +.SH "void qWarning ( 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 - tqWarning( "f: bad argument, c == %d", c ); + qWarning( "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 tqWarning might lead to crashes on certain platforms due to the platforms printf implementation. +\fBWarning:\fR Passing (const char *)0 as argument to qWarning might lead to crashes on certain platforms due to the platforms printf implementation. .PP -See also tqDebug(), tqFatal(), qInstallMsgHandler(), and Debugging. +See also qDebug(), qFatal(), qInstallMsgHandler(), and Debugging. .SH "SEE ALSO" .BR http://doc.trolltech.com/qapplication.html diff --git a/doc/man/man3/qasciicache.3qt b/doc/man/man3/qasciicache.3qt index 1b0ab51..489b650 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 tqDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). 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 2d3d0c9..4f64e64 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 tqDebug(). +Debugging-only function that prints out the dictionary distribution using qDebug(). .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 1470fbf..dffb9d1 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 tqCompress ( const QByteArray & data )" +.SH "QByteArray qCompress ( const QByteArray & data )" Compresses the array \fIdata\fR and returns the compressed byte array using zlib. .PP See also qUncompress(). -.SH "QByteArray tqCompress ( const uchar * data, int nbytes )" +.SH "QByteArray qCompress ( 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 tqCompress(). +See also qCompress(). .SH "QByteArray qUncompress ( 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 0711a63..ddae368 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 tqDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). 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 78fc95d..7092663 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 - tqDebug("A QCanvasRectangle lies somewhere at this point"); + qDebug("A QCanvasRectangle lies somewhere at this point"); .br } .br diff --git a/doc/man/man3/qclipboard.3qt b/doc/man/man3/qclipboard.3qt index 51b9992..fb91a21 100644 --- a/doc/man/man3/qclipboard.3qt +++ b/doc/man/man3/qclipboard.3qt @@ -125,7 +125,7 @@ Example: .br if ( !text.isNull() ) .br - tqDebug( "The clipboard contains: " + text ); + qDebug( "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 f8d8e64..f170c99 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 * tqmemmove ( void * dst, const void * src, uint len )" +.SH "void * qmemmove ( 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 qstrncmp(), tqstricmp(), tqstrnicmp(), and Note on character comparisons. +See also qstrncmp(), qstricmp(), qstrnicmp(), 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 * tqstrdup ( const char * src )" +.SH "char * qstrdup ( 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 tqstricmp ( const char * str1, const char * str2 )" +.SH "int qstricmp ( 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(), qstrncmp(), tqstrnicmp(), and Note on character comparisons. +See also qstrcmp(), qstrncmp(), qstrnicmp(), and Note on character comparisons. .SH "uint qstrlen ( 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(), tqstricmp(), tqstrnicmp(), and Note on character comparisons. -.SH "char * tqstrncpy ( char * dst, const char * src, uint len )" +See also qstrcmp(), qstricmp(), qstrnicmp(), and Note on character comparisons. +.SH "char * qstrncpy ( 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 tqstrnicmp ( const char * str1, const char * str2, uint len )" +.SH "int qstrnicmp ( 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(), qstrncmp(), tqstricmp(), and Note on character comparisons. +See also qstrcmp(), qstrncmp(), qstricmp(), and Note on character comparisons. .SH "SEE ALSO" .BR http://doc.trolltech.com/qcstring.html diff --git a/doc/man/man3/qdatetime.3qt b/doc/man/man3/qdatetime.3qt index ea70baa..e9e057b 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 - tqDebug( "There are %d seconds to Christmas", dt.secsTo(xmas) ); + qDebug( "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 0522ad2..b0190e7 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 tqDebug(). +Debugging-only function that prints out the dictionary distribution using qDebug(). .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 cedc312..8e13ad2 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 - tqWarning( "Cannot find the example directory" ); + qWarning( "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 - tqWarning( "Cannot find the \\"/tmp\\" directory" ); + qWarning( "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 - tqWarning( "Cannot create the file %s", f.name() ); + qWarning( "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 - tqWarning( "It is a root link" ); + qWarning( "It is a root link" ); .br .fi .PP @@ -663,7 +663,7 @@ Example: .br if ( d1 != d2 ) .br - tqDebug( "They differ" ); + qDebug( "They differ" ); .br .fi .SH "QDir & QDir::operator= ( const QDir & d )" @@ -689,7 +689,7 @@ Example: .br if ( d1 == d2 ) .br - tqDebug( "They're the same" ); + qDebug( "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 419a21f..662486c 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 tqDebug(), tqWarning() and tqFatal() messages. +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. .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 74ca492..ddad3bf 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 - tqWarning( "I can change the file; my group can read the file" ); + qWarning( "I can change the file; my group can read the file" ); .br if ( fi.permission( QFileInfo::WriteGroup | QFileInfo::WriteOther ) ) .br - tqWarning( "The group or others can change the file" ); + qWarning( "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 5b64bad..e1ae740 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 - tqDebug( family ); + qDebug( 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 - tqDebug( dstyle ); + qDebug( dstyle ); .br } .br diff --git a/doc/man/man3/qftp.3qt b/doc/man/man3/qftp.3qt index d9966f6..f9a49a3 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 tqInitNetworkProtocols() before using a QUrlOperator with QFtp. +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. .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 8fca56e..34d43eb 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 - tqFatal( "Cool hardware required" ); + qFatal( "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 - tqWarning( "Could not get stencil buffer; results will be suboptimal" ); + qWarning( "Could not get stencil buffer; results will be suboptimal" ); .br if ( !format().alphaChannel() ) .br - tqWarning( "Could not get alpha channel; results will be suboptimal" ); + qWarning( "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 6d5f380..7f13f89 100644 --- a/doc/man/man3/qguardedptr.3qt +++ b/doc/man/man3/qguardedptr.3qt @@ -75,7 +75,7 @@ Example: .br else .br - tqDebug("The label has been destroyed"); + qDebug("The label has been destroyed"); .br .fi .PP diff --git a/doc/man/man3/qhttp.3qt b/doc/man/man3/qhttp.3qt index f32c369..1348237 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 tqInitNetworkProtocols() before using a QUrlOperator with HTTP. +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. .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 dc96591..fdd9652 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 tqDebug(). This function does nothing in the release library. +A debug-only utility function. Prints out cache usage, hit/miss, and distribution information using qDebug(). 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 171acfd..ca8e65d 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 tqDebug(). +Debugging-only function that prints out the dictionary distribution using qDebug(). .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 8d5a1d5..3fc7d2b 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 tqInitNetworkProtocols() before using a QUrlOperator with QLocalFs. +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. .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 92b8fce..40f2c20 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 - tqDebug( "%d: %d", i, a[i] ); + qDebug( "%d: %d", i, a[i] ); .br .br - tqDebug( "1 is found %d times", a.contains(1) ); + qDebug( "1 is found %d times", a.contains(1) ); .br - tqDebug( "5 is found at index %d", a.find(5) ); + qDebug( "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 tqChecksum ( const char * data, uint len )" +.SH "Q_UINT16 qChecksum ( 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 d3de069..fe34d19 100644 --- a/doc/man/man3/qobject.3qt +++ b/doc/man/man3/qobject.3qt @@ -555,7 +555,7 @@ Example: .br QKeyEvent *k = (QKeyEvent*)ev; .br - tqDebug( "Ate key press %d", k->key() ); + qDebug( "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 - tqDebug( "Ate key press %d", k->key() ); + qDebug( "Ate key press %d", k->key() ); .br return TRUE; // eat event .br @@ -903,7 +903,7 @@ Example: .br { .br - tqDebug( "timer event, id %d", e->timerId() ); + qDebug( "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 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 ). +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 ). .PP .nf .br - tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f", + qDebug( "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 c00544b..684e420 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 tqDebug(). +Debugging-only function that prints out the dictionary distribution using qDebug(). .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 85a5192..c7067de 100644 --- a/doc/man/man3/qsqlcursor.3qt +++ b/doc/man/man3/qsqlcursor.3qt @@ -193,7 +193,7 @@ For example: .br while ( cur.next() ) { .br - tqDebug( cur.value( "id" ).toString() + ": " + + qDebug( 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 9a421cf..978e47e 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 - tqWarning( "Placeholder: " + it.key() + ", Value: " + (*it).toString() ); + qWarning( "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 - tqWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); + qWarning( "Placeholder pos: %d, Value: " + (*it).toString(), i++ ); .br ... .br diff --git a/doc/man/man3/qstring.3qt b/doc/man/man3/qstring.3qt index bc01d97..1e41f0a 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 (tqWarning()) is output and the result is undefined. +If there is no place marker (\fC%1\fR, \fC%2\fR, etc.), a warning message (qWarning()) 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 ce662f0..8aa2ecf 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 - tqDebug( "Ping!" ); + qDebug( "Ping!" ); .br } .br diff --git a/doc/man/man3/qtime.3qt b/doc/man/man3/qtime.3qt index 33db5b4..1afd494 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 - tqDebug( "Time elapsed: %d ms", t.elapsed() ); + qDebug( "Time elapsed: %d ms", t.elapsed() ); .br .fi .PP diff --git a/doc/man/man3/qurloperator.3qt b/doc/man/man3/qurloperator.3qt index 54ffa0b..5911200 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 tqInitNetworkProtocols() function. The protocols currently supported are: +To register the available network protocols, use the qInitNetworkProtocols() 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 tqInitNetworkProtocols ()" +.SH "void qInitNetworkProtocols ()" 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 qnetwork.h. diff --git a/doc/man/man3/qvariant.3qt b/doc/man/man3/qvariant.3qt index 4308c88..becd6c4 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 - tqDebug("Type is %s", // prints "Type is int" + qDebug("Type is %s", // prints "Type is int" .br v.typeName()); .br diff --git a/doc/network.doc b/doc/network.doc index a51a1ea..f6b986d 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 ) - tqDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() ); + qDebug( "Couldn't create directory %s", op->arg( 0 ).latin1() ); else - tqDebug( "Successfully created directory %s", op->arg( 0 ).latin1() ); + qDebug( "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; - tqDebug( "Name: %s, Size: %d, Last Modified: %s", + qDebug( "Name: %s, Size: %d, Last Modified: %s", inf.name().latin1(), inf.size(), inf.lastModified().toString().latin1() ); } } void MyClass::slotStart( QNetworkOperation * ) { - tqDebug( "Start reading '%s'", op.toString().latin1() ); + qDebug( "Start reading '%s'", op.toString().latin1() ); } void MyClass::slotFinished( QNetworkOperation *operation ) { if ( operation->operation() == QNetworkProtocol::OpListChildren ) { if ( operation->state() == QNetworkProtocol::StFailed ) - tqDebug( "Couldn't read '%s'! Following error occurred: %s", + qDebug( "Couldn't read '%s'! Following error occurred: %s", op.toString().latin1(), operation->protocolDetail().latin1() ); else - tqDebug( "Finished reading '%s'!", op.toString().latin1() ); + qDebug( "Finished reading '%s'!", op.toString().latin1() ); } } diff --git a/doc/networking.doc b/doc/networking.doc index 41db5cf..e943e99 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 - tqInitNetworkProtocols(); + qInitNetworkProtocols(); \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 tqInitNetworkProtocols() 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 qInitNetworkProtocols() 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 1814980..15536f0 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{tqInstallPathPlugins()}. If you want +look in the directory given by \c{qInstallPathPlugins()}. 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 804a745..9b7c012 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 qstrncmp} -\i \c {#define stricmp tqstricmp} -\i \c {#define strnicmp tqstrnicmp} +\i \c {#define stricmp qstricmp} +\i \c {#define strnicmp qstrnicmp} \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 51612a9..be6cada 100644 --- a/doc/qasciicache.doc +++ b/doc/qasciicache.doc @@ -97,7 +97,7 @@ \internal - Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QAsciiCache cannot be copied. Calls qFatal() in debug version. */ @@ -139,7 +139,7 @@ \internal - Do not use. A QAsciiCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QAsciiCache cannot be copied. Calls qFatal() 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 tqDebug(). This function does + and distribution information using qDebug(). This function does nothing in the release library. */ diff --git a/doc/qasciidict.doc b/doc/qasciidict.doc index c855fd1..7667684 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 tqDebug(). + distribution using qDebug(). */ /*! diff --git a/doc/qcache.doc b/doc/qcache.doc index 354bc15..998bb20 100644 --- a/doc/qcache.doc +++ b/doc/qcache.doc @@ -98,7 +98,7 @@ \internal - Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QCache cannot be copied. Calls qFatal() in debug version. */ @@ -136,7 +136,7 @@ \internal - Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QCache cannot be copied. Calls qFatal() 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 tqDebug(). This function does + and distribution information using qDebug(). This function does nothing in the release library. */ diff --git a/doc/qdict.doc b/doc/qdict.doc index 250f6be..c522624 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 tqDebug(). + distribution using qDebug(). */ /*! diff --git a/doc/qintcache.doc b/doc/qintcache.doc index 8d92c0e..e5960b3 100644 --- a/doc/qintcache.doc +++ b/doc/qintcache.doc @@ -91,7 +91,7 @@ \internal - Do not use. A QCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QCache cannot be copied. Calls qFatal() in debug version. */ /*! @@ -125,7 +125,7 @@ \internal - Do not use. A QIntCache cannot be copied. Calls tqFatal() in debug version. + Do not use. A QIntCache cannot be copied. Calls qFatal() 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 tqDebug(). This function does + and distribution information using qDebug(). This function does nothing in the release library. */ diff --git a/doc/qintdict.doc b/doc/qintdict.doc index 6ad6c29..4f6ecc8 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 tqDebug(). + distribution using qDebug(). */ /*! diff --git a/doc/qmemarray.doc b/doc/qmemarray.doc index 8d12321..35c1893 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++ ) - tqDebug( "%d: %d", i, a[i] ); + qDebug( "%d: %d", i, a[i] ); - tqDebug( "1 is found %d times", a.contains(1) ); - tqDebug( "5 is found at index %d", a.find(5) ); + qDebug( "1 is found %d times", a.contains(1) ); + qDebug( "5 is found at index %d", a.find(5) ); return 0; } diff --git a/doc/qptrdict.doc b/doc/qptrdict.doc index 2c3efce..abc8f15 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 tqDebug(). + distribution using qDebug(). */ /*! diff --git a/doc/sql.doc b/doc/sql.doc index 2ffabb7..5aa8266 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 tqDebug +\printuntil qDebug \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 tqDebug +\printuntil qDebug \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 tqDebug() call. +some processing function, in this example a simple qDebug() call. \target Manipulating_Records \section2 Manipulating Records diff --git a/doc/tutorial.doc b/doc/tutorial.doc index 4f5660d..8bd7218 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 -tqWarning() function to issue a warning to the user and return -immediately. tqWarning() is a printf-like function that by default +qWarning() function to issue a warning to the user and return +immediately. qWarning() 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(). |