Automated update from Qt3

1 files changed, 12 insertions, 12 deletions

diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index c6d22e2e8..5869d3e37 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -103,8 +103,8 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin cannot be queried successfully!",
 		      (const char*) TQFile::encodeName(library) );
-    } else if ( ( version > QT_VERSION ) ||
-		( ( QT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
+    } else if ( ( version > TQT_VERSION ) ||
+		( ( TQT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
 	if ( warn )
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible TQt library (%d.%d.%d)!",
@@ -116,13 +116,13 @@ static bool qt_verify( const TQString& library, uint version, uint flags,
 		      "  Plugin uses %s TQt library!",
 		      (const char*) TQFile::encodeName(library),
 		      (flags & 2) ? "multi threaded" : "single threaded" );
-    } else if ( key != QT_BUILD_KEY ) {
+    } else if ( key != TQT_BUILD_KEY ) {
 	if ( warn )
 	    qWarning( "Conflict in %s:\n"
 		      "  Plugin uses incompatible TQt library!\n"
 		      "  expected build key \"%s\", got \"%s\".",
 		      (const char*) TQFile::encodeName(library),
-		      QT_BUILD_KEY,
+		      TQT_BUILD_KEY,
 		      key.isEmpty() ? "<null>" : (const char *) key );
     } else {
 	return TRUE;
@@ -214,7 +214,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 
     qt_token_info pinfo("=\n", 2);
     int parse;
-    ulong at = 0, advance, parselen = qstrlen( s );
+    ulong at = 0, advance, parselen = tqstrlen( s );
     do {
 	parse = qt_tokenize( s + at, parselen, &advance, pinfo );
 	if ( parse == -1 ) {
@@ -225,7 +225,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 	at += advance;
 	parselen -= advance;
 
-	if ( qstrncmp( "version", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
+	if ( tqstrncmp( "version", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
 	    // parse version string
 	    qt_token_info pinfo2("..-", 3);
 	    if ( qt_tokenize( pinfo.results[ 1 ], pinfo.lengths[ 1 ],
@@ -238,7 +238,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 		ret = FALSE;
 		break;
 	    }
-	} else if ( qstrncmp( "flags", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
+	} else if ( tqstrncmp( "flags", pinfo.results[ 0 ], pinfo.lengths[ 0 ] ) == 0 ) {
 	    // parse flags string
 	    char ch;
 	    *flags = 0;
@@ -255,7 +255,7 @@ static bool qt_parse_pattern( const char *s, uint *version, uint *flags,
 		}
 		++p;
 	    }
-	} else if ( qstrncmp( "buildkey", pinfo.results[ 0 ],
+	} else if ( tqstrncmp( "buildkey", pinfo.results[ 0 ],
 			      pinfo.lengths[ 0 ] ) == 0 ){
 	    // save buildkey
 	    *key = TQCString( pinfo.results[ 1 ], pinfo.lengths[ 1 ] + 1 );
@@ -299,7 +299,7 @@ static long qt_find_pattern( const char *s, ulong s_len,
     }
     i = delta;
     for (;;) {
-	if ( hs == hp && qstrncmp( s + i, pattern, p_len ) == 0 )
+	if ( hs == hp && tqstrncmp( s + i, pattern, p_len ) == 0 )
 	    return i;
 	if ( i == 0 )
 	    break;
@@ -357,7 +357,7 @@ static bool qt_unix_query( const TQString &library, uint *version, uint *flags,
 
     // verify that the pattern is present in the plugin
     const char *pattern = "pattern=QT_UCM_VERIFICATION_DATA";
-    const ulong plen = qstrlen( pattern );
+    const ulong plen = tqstrlen( pattern );
     long pos = qt_find_pattern( filedata, fdlen, pattern, plen );
 
     bool ret = FALSE;
@@ -389,8 +389,8 @@ void TQComLibrary::createInstanceInternal()
     TQFileInfo fileinfo( library() );
     TQString lastModified  = fileinfo.lastModified().toString(TQt::ISODate);
     TQString regkey = TQString("/TQt Plugins %1.%2/%3")
-		     .arg( ( QT_VERSION & 0xff0000 ) >> 16 )
-		     .arg( ( QT_VERSION & 0xff00 ) >> 8 )
+		     .arg( ( TQT_VERSION & 0xff0000 ) >> 16 )
+		     .arg( ( TQT_VERSION & 0xff00 ) >> 8 )
 		     .arg( library() );
     TQStringList reg;
     uint flags = 0;