Undo prior accidental commit

1 files changed, 25 insertions, 25 deletions

diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 6dc45c0..9abf9e7 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 *tqmemmove( void *dst, const void *src, uint len )
+void *qmemmove( void *dst, const void *src, uint len )
 {
     register char *d;
     register char *s;
@@ -100,7 +100,7 @@ void *tqmemmove( void *dst, const void *src, uint len )
     The returned string must be deleted using \c delete[].
 */
 
-char *tqstrdup( const char *src )
+char *qstrdup( const char *src )
 {
     if ( !src )
 	return 0;
@@ -133,7 +133,7 @@ char *tqstrdup( const char *src )
     \sa qstrcpy()
 */
 
-char *tqstrncpy( char *dst, const char *src, uint len )
+char *qstrncpy( char *dst, const char *src, uint len )
 {
     if ( !src || !dst )
 	return 0;
@@ -170,7 +170,7 @@ char *tqstrncpy( 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 qstrncmp() tqstricmp() tqstrnicmp()
+    \sa qstrncmp() qstricmp() qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -192,7 +192,7 @@ char *tqstrncpy( 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(), tqstricmp(), tqstrnicmp()
+    \sa qstrcmp(), qstricmp(), qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
@@ -212,11 +212,11 @@ char *tqstrncpy( 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(), qstrncmp(), tqstrnicmp()
+    \sa qstrcmp(), qstrncmp(), qstrnicmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
-int tqstricmp( const char *str1, const char *str2 )
+int qstricmp( 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 tqstricmp( 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(), qstrncmp() tqstricmp()
+    \sa qstrcmp(), qstrncmp() qstricmp()
 	\link #asciinotion Note on character comparisons \endlink
 */
 
-int tqstrnicmp( const char *str1, const char *str2, uint len )
+int qstrnicmp( const char *str1, const char *str2, uint len )
 {
     register const uchar *s1 = (const uchar *)str1;
     register const uchar *s2 = (const uchar *)str2;
@@ -308,7 +308,7 @@ static void createCRC16Table()			// build CRC16 lookup table
     The checksum is independent of the byte order (endianness).
 */
 
-Q_UINT16 tqChecksum( const char *data, uint len )
+Q_UINT16 qChecksum( const char *data, uint len )
 {
     if ( !crc_tbl_init ) {			// create lookup table
 
@@ -335,7 +335,7 @@ Q_UINT16 tqChecksum( const char *data, uint len )
 }
 
 /*!
-    \fn QByteArray tqCompress( const QByteArray& data )
+    \fn QByteArray qCompress( const QByteArray& data )
 
     \relates QByteArray
 
@@ -355,7 +355,7 @@ Q_UINT16 tqChecksum( const char *data, uint len )
 */
 
 #ifndef QT_NO_COMPRESS
-QByteArray tqCompress( const uchar* data, int nbytes )
+QByteArray qCompress( const uchar* data, int nbytes )
 {
     if ( nbytes == 0 ) {
 	QByteArray tmp( 4 );
@@ -364,7 +364,7 @@ QByteArray tqCompress( const uchar* data, int nbytes )
     }
     if ( !data ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qCompress: data is NULL." );
+	qWarning( "qCompress: data is NULL." );
 #endif
 	return QByteArray();
     }
@@ -386,7 +386,7 @@ QByteArray tqCompress( const uchar* data, int nbytes )
 	    break;
 	case Z_MEM_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qCompress: Z_MEM_ERROR: Not enough memory." );
+	    qWarning( "qCompress: Z_MEM_ERROR: Not enough memory." );
 #endif
 	    bazip.resize( 0 );
 	    break;
@@ -411,12 +411,12 @@ QByteArray tqCompress( const uchar* data, int nbytes )
     Returns an empty QByteArray if the input data was corrupt.
     \omit
     ADD THE FOLLOWING FOR Qt 4.0
-    This function will uncompress data compressed with tqCompress()
+    This function will uncompress data compressed with qCompress()
     from this and any earlier Qt version, back to Qt 3.1 when this
     feature was added.
     \endomit
 
-    \sa tqCompress()
+    \sa qCompress()
 */
 
 /*!
@@ -433,14 +433,14 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 {
     if ( !data ) {
 #if defined(QT_CHECK_RANGE)
-	tqWarning( "qUncompress: data is NULL." );
+	qWarning( "qUncompress: data is NULL." );
 #endif
 	return QByteArray();
     }
     if ( nbytes <= 4 ) {
 #if defined(QT_CHECK_RANGE)
 	if ( nbytes < 4 || ( data[0]!=0 || data[1]!=0 || data[2]!=0 || data[3]!=0 ) )
-	    tqWarning( "qUncompress: Input data is corrupted." );
+	    qWarning( "qUncompress: Input data is corrupted." );
 #endif
 	return QByteArray();
     }
@@ -463,7 +463,7 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 	    break;
 	case Z_MEM_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." );
+	    qWarning( "qUncompress: Z_MEM_ERROR: Not enough memory." );
 #endif
 	    break;
 	case Z_BUF_ERROR:
@@ -471,7 +471,7 @@ QByteArray qUncompress( const uchar* data, int nbytes )
 	    break;
 	case Z_DATA_ERROR:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." );
+	    qWarning( "qUncompress: Z_DATA_ERROR: Input data is corrupted." );
 #endif
 	    break;
 	}
@@ -552,7 +552,7 @@ QDataStream &operator>>( QDataStream &s, QByteArray &a )
     }
     if ( !a.resize( (uint)len ) ) {		// resize array
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDataStream: Not enough memory to read QByteArray" );
+	qWarning( "QDataStream: Not enough memory to read QByteArray" );
 #endif
 	len = 0;
     }
@@ -1031,7 +1031,7 @@ int QCString::find( const char *str, int index, bool cs, uint l ) const
 	while ( haystack <= end ) {
 	    hashHaystack += tolower(*(haystack+sl_minus_1));
 	    if ( hashHaystack == hashNeedle
-		 && tqstrnicmp( needle, haystack, sl ) == 0 )
+		 && qstrnicmp( needle, haystack, sl ) == 0 )
 		return haystack - data();
 
 	    REHASH( tolower(*haystack) );
@@ -1136,7 +1136,7 @@ int QCString::findRev( const char *str, int index, bool cs ) const
 	hashHaystack -= tolower(*haystack);
 	while ( haystack >= end ) {
 	    hashHaystack += tolower(*haystack);
-	    if ( hashHaystack == hashNeedle && tqstrnicmp( needle, haystack, sl ) == 0 )
+	    if ( hashHaystack == hashNeedle && qstrnicmp( needle, haystack, sl ) == 0 )
 		return haystack-data();
 	    --haystack;
 	    REHASH( tolower(*(haystack+sl)) );
@@ -2192,7 +2192,7 @@ QCString &QCString::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') )
-	tqWarning( "QCString::setNum: Invalid format char '%c'", f );
+	qWarning( "QCString::setNum: Invalid format char '%c'", f );
 #endif
     char format[20];
     register char *fs = format;			// generate format string
@@ -2323,7 +2323,7 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
     }
     if ( !str.QByteArray::resize( (uint)len )) {// resize string
 #if defined(QT_CHECK_NULL)
-	tqWarning( "QDataStream: Not enough memory to read QCString" );
+	qWarning( "QDataStream: Not enough memory to read QCString" );
 #endif
 	len = 0;
     }