Undo prior accidental commit

3 files changed, 7 insertions, 7 deletions

diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 6ac2885..f6f09c4 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -78,7 +78,7 @@ static QString convertToCIdentifier( const char *s )
 static ulong embedData( QTextStream& out, const uchar* input, int nbytes )
 {
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
-    QByteArray bazip( tqCompress( input, nbytes ) );
+    QByteArray bazip( qCompress( input, nbytes ) );
     ulong len = bazip.size();
 #else
     ulong len = nbytes;
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 6a8db05..ace2033 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -265,7 +265,7 @@ int main( int argc, char * argv[] )
     if ( !outputFile.isEmpty() ) {
 	fileOut.setName( outputFile );
 	if (!fileOut.open( IO_WriteOnly ) ) {
-	    tqWarning( "uic: Could not open output file '%s'", outputFile.data() );
+	    qWarning( "uic: Could not open output file '%s'", outputFile.data() );
 	    return 1;
 	}
     } else {
@@ -283,7 +283,7 @@ int main( int argc, char * argv[] )
 
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "uic: Could not open file '%s'", fileName );
+	qWarning( "uic: Could not open file '%s'", fileName );
 	return 1;
     }
 
@@ -291,13 +291,13 @@ int main( int argc, char * argv[] )
     QString errMsg;
     int errLine;
     if ( !doc.setContent( &file, &errMsg, &errLine ) ) {
-	tqWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine );
+	qWarning( QString("uic: Failed to parse %s: ") + errMsg + QString (" in line %d"), fileName, errLine );
 	return 1;
     }
 
     QDomElement e = doc.firstChild().toElement();
     if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
-	tqWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"),
+	qWarning( QString("uic: File generated with too recent version of Qt Designer (%s vs. %s)"),
 		  e.attribute("version").latin1(), QT_VERSION_STR );
 	return 1;
     }
@@ -350,7 +350,7 @@ int main( int argc, char * argv[] )
 	out << "#endif // " << protector << endl;
     }
     if ( fileOut.status() != IO_Ok ) {
-	tqWarning( "uic: Error writing to file" );
+	qWarning( "uic: Error writing to file" );
 	if ( !outputFile.isEmpty() )
 	    remove( outputFile );
     }
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index 4b0b16c..a7be6df 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -345,7 +345,7 @@ void Uic::writeFunctionsSubImpl( const QStringList &fuLst, const QStringList &ty
 	out << " */" << endl;
 	out << type << " " << subClass << "::" << (*it) << endl;
 	out << "{" << endl;
-	out << "    tqWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl;
+	out << "    qWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl;
 	out << "}" << endl << endl;
     }
     out << endl;