Undo prior accidental commit

16 files changed, 56 insertions, 56 deletions

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-&gt;setDatabaseName( "book" );
@@ -85,9 +85,9 @@ bool createConnections()
     defaultDB-&gt;setPassword( "bookpw" );
     defaultDB-&gt;setHostName( "bookhost" );
     if ( ! defaultDB-&gt;open() ) {
-        tqWarning( "Failed to open books database: " +
+        qWarning( "Failed to open books database: " +
                   defaultDB-&gt;lastError().driverText() );
-        tqWarning( defaultDB-&gt;lastError().databaseText() );
+        qWarning( defaultDB-&gt;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 '&#92;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 '&#92;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 '&#92;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&lt;char&gt; 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&amp; data)
-{ return tqCompress( (const uchar*)data.data(), data.size() ); }
+Q_EXPORT inline QByteArray qCompress( const QByteArray&amp; data)
+{ return qCompress( (const uchar*)data.data(), data.size() ); }
 Q_EXPORT inline QByteArray qUncompress( const QByteArray&amp; 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) &amp;&amp; !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) &amp;&amp; !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&amp; ) const { \
-        tqWarning( #C"::operator==( const "#C"&amp; ) got called." ); \
+        qWarning( #C"::operator==( const "#C"&amp; ) 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&lt;Key,T&gt;::Iterator QMapPrivate&lt;
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) &amp;&amp; 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()&lt;&lt;16)+\
+QString sq=QString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()&lt;&lt;16)+\
 (sq.section('.',1,1).toInt()&lt;&lt;8)+sq.section('.',2,2).toInt()&lt;(s.section('.',0,0).toInt()&lt;&lt;16)+\
 (s.section('.',1,1).toInt()&lt;&lt;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( &amp;wordSize, &amp;bigEndian );
+	qSysInfo( &amp;wordSize, &amp;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&amp; operator=( const QStrList &amp; );
 
 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&lt;T&gt;::clear()
 
 #ifdef QT_CHECK_RANGE
 # if !defined( QT_NO_DEBUG ) &amp;&amp; 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>