Undo prior accidental commit

1 files changed, 15 insertions, 15 deletions

diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index c8795de..24b8164 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -1986,7 +1986,7 @@ static QString replaceArgEscapes(const QString &s, const ArgEscapeData &d, int f
     differ between languages.
 
     If there is no place marker (\c %1, \c %2, etc.), a warning
-    message (tqWarning()) is output and the result is undefined.
+    message (qWarning()) is output and the result is undefined.
 
     \warning If any placeholder occurs more than once, the result is undefined.
 
@@ -1996,7 +1996,7 @@ QString QString::arg( const QString& a, int fieldWidth ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %s", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %s", latin1(),
                   a.latin1() );
         return *this;
     }
@@ -2103,7 +2103,7 @@ QString QString::arg( Q_LLONG a, int fieldWidth, int base ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %lld", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %lld", latin1(),
                   a );
         return *this;
     }
@@ -2133,7 +2133,7 @@ QString QString::arg( Q_ULLONG a, int fieldWidth, int base ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %llu", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %llu", latin1(),
                   a );
         return *this;
     }
@@ -2249,7 +2249,7 @@ QString QString::arg( double a, int fieldWidth, char fmt, int prec ) const
     ArgEscapeData d = findArgEscapes(*this);
 
     if (d.occurrences == 0) {
-        tqWarning( "QString::arg(): Argument missing: %s, %g", latin1(),
+        qWarning( "QString::arg(): Argument missing: %s, %g", latin1(),
                   a );
         return *this;
     }
@@ -2281,7 +2281,7 @@ QString QString::arg( double a, int fieldWidth, char fmt, int prec ) const
 		break;
 	    default:
 #if defined(QT_CHECK_RANGE)
-		tqWarning( "QString::setNum: Invalid format char '%c'", fmt );
+		qWarning( "QString::setNum: Invalid format char '%c'", fmt );
 #endif
 		break;
 	}
@@ -2329,7 +2329,7 @@ QString QString::multiArg( int numArgs, const QString& a1, const QString& a2,
 	} while ( lastDigit < 10 && digitUsed[lastDigit] == 0 );
 
 	if ( lastDigit == 10 ) {
-	    tqWarning( "QString::arg(): Argument missing: %s, %s",
+	    qWarning( "QString::arg(): Argument missing: %s, %s",
 		      latin1(), args[i]->latin1() );
 	    numArgs = i;
 	    lastDigit = 9;
@@ -4735,7 +4735,7 @@ Q_LLONG QString::toLongLong( bool *ok, int base ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( base != 0 && (base < 2 || base > 36) ) {
-	tqWarning( "QString::toLongLong: Invalid base (%d)", base );
+	qWarning( "QString::toLongLong: Invalid base (%d)", base );
 	base = 10;
     }
 #endif
@@ -4825,7 +4825,7 @@ Q_ULLONG QString::toULongLong( bool *ok, int base ) const
 {
 #if defined(QT_CHECK_RANGE)
     if ( base != 0 && (base < 2 || base > 36) ) {
-	tqWarning( "QString::toULongLong: Invalid base %d", base );
+	qWarning( "QString::toULongLong: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5153,7 +5153,7 @@ QString &QString::setNum( Q_LLONG n, int base )
 {
 #if defined(QT_CHECK_RANGE)
     if ( base < 2 || base > 36 ) {
-	tqWarning( "QString::setNum: Invalid base %d", base );
+	qWarning( "QString::setNum: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5175,7 +5175,7 @@ QString &QString::setNum( Q_ULLONG n, int base )
 {
 #if defined(QT_CHECK_RANGE)
     if ( base < 2 || base > 36 ) {
-	tqWarning( "QString::setNum: Invalid base %d", base );
+	qWarning( "QString::setNum: Invalid base %d", base );
 	base = 10;
     }
 #endif
@@ -5282,7 +5282,7 @@ QString &QString::setNum( double n, char f, int prec )
 	    break;
 	default:
 #if defined(QT_CHECK_RANGE)
-	    tqWarning( "QString::setNum: Invalid format char '%c'", f );
+	    qWarning( "QString::setNum: Invalid format char '%c'", f );
 #endif
 	    break;
     }
@@ -7128,7 +7128,7 @@ QCString qt_winQString2MB( const QString& s, int uclen )
 	} else {
 #ifndef QT_NO_DEBUG
 	    // Fail.
-	    tqWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)",
+	    qWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)",
 		r, s.utf8().data());
 #endif
 	    break;
@@ -7154,7 +7154,7 @@ QString qt_winMB2QString( const char* mb, int mblen )
 	int r = GetLastError();
 	if ( r == ERROR_INSUFFICIENT_BUFFER ) {
 	    if ( wc != wc_auto ) {
-		tqWarning("Size changed in MultiByteToWideChar");
+		qWarning("Size changed in MultiByteToWideChar");
 		break;
 	    } else {
 		wclen = MultiByteToWideChar( CP_ACP, MB_PRECOMPOSED,
@@ -7164,7 +7164,7 @@ QString qt_winMB2QString( const char* mb, int mblen )
 	    }
 	} else {
 	    // Fail.
-	    tqWarning("MultiByteToWideChar cannot convert multibyte text");
+	    qWarning("MultiByteToWideChar cannot convert multibyte text");
 	    break;
 	}
     }