Undo prior accidental commit

1 files changed, 10 insertions, 10 deletions

diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index bae4e7d..8d13549 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -100,25 +100,25 @@ static bool qt_verify( const QString& library, uint version, uint flags,
 
     if ( (flags & 1) == 0 ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin cannot be queried successfully!",
 		      (const char*) QFile::encodeName(library) );
     } else if ( ( version > QT_VERSION ) ||
 		( ( QT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible Qt library (%d.%d.%d)!",
 		      (const char*) QFile::encodeName(library),
 		      (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff );
     } else if ( (flags & 2) != (our_flags & 2) ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses %s Qt library!",
 		      (const char*) QFile::encodeName(library),
 		      (flags & 2) ? "multi threaded" : "single threaded" );
     } else if ( key != QT_BUILD_KEY ) {
 	if ( warn )
-	    tqWarning( "Conflict in %s:\n"
+	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible Qt library!\n"
 		      "  expected build key \"%s\", got \"%s\".",
 		      (const char*) QFile::encodeName(library),
@@ -326,7 +326,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 {
     QFile file( library );
     if (! file.open( IO_ReadOnly ) ) {
-	tqWarning( "%s: %s", (const char*) QFile::encodeName(library),
+	qWarning( "%s: %s", (const char*) QFile::encodeName(library),
 	    strerror( errno ) );
 	return FALSE;
     }
@@ -345,7 +345,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 	fdlen = maplen;
     } else {
 	// mmap failed
-	tqWarning( "mmap: %s", strerror( errno ) );
+	qWarning( "mmap: %s", strerror( errno ) );
 #endif // USE_MMAP
 	// try reading the data into memory instead
 	data = file.readAll();
@@ -367,7 +367,7 @@ static bool qt_unix_query( const QString &library, uint *version, uint *flags,
 
 #ifdef USE_MMAP
     if ( mapaddr != MAP_FAILED && munmap(mapaddr, maplen) != 0 ) {
-	tqWarning( "munmap: %s", strerror( errno ) );
+	qWarning( "munmap: %s", strerror( errno ) );
     }
 #endif // USE_MMAP
 
@@ -474,7 +474,7 @@ void QComLibrary::createInstanceInternal()
 
     if ( ! query_done ) {
 	if ( warn_mismatch ) {
-	    tqWarning( "Conflict in %s:\n Plugin cannot be queried successfully!",
+	    qWarning( "Conflict in %s:\n Plugin cannot be queried successfully!",
 		      (const char*) QFile::encodeName( library() ) );
 	}
 	unload();
@@ -499,7 +499,7 @@ void QComLibrary::createInstanceInternal()
     ucmInstanceProc = (UCMInstanceProc) resolve( "ucm_instantiate" );
 #if defined(QT_DEBUG_COMPONENT)
     if ( !ucmInstanceProc )
-	tqWarning( "%s: Not a UCOM library.", (const char*) QFile::encodeName(library()) );
+	qWarning( "%s: Not a UCOM library.", (const char*) QFile::encodeName(library()) );
 #endif
     entry = ucmInstanceProc ? ucmInstanceProc() : 0;
 
@@ -514,7 +514,7 @@ void QComLibrary::createInstanceInternal()
 	}
     } else {
 #if defined(QT_DEBUG_COMPONENT)
-	tqWarning( "%s: No exported component provided.", (const char*) QFile::encodeName(library()) );
+	qWarning( "%s: No exported component provided.", (const char*) QFile::encodeName(library()) );
 #endif
 	unload();
     }