Automated update from Qt3

4 files changed, 12 insertions, 12 deletions

diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index aa00988ea..63cbd9bc1 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -236,7 +236,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    "	if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n"
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "	    TQByteArray baunzip;\n"
-	    "	    baunzip = qUncompress( embed_image_vec[i].data, \n"
+	    "	    baunzip = tqUncompress( embed_image_vec[i].data, \n"
 	    "		embed_image_vec[i].compressed );\n"
 	    "	    TQImage img((uchar*)baunzip.data(),\n"
 	    "			embed_image_vec[i].width,\n"
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index e185af6c3..a2768de90 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -64,18 +64,18 @@ static TQByteArray unzipXPM( TQString data, ulong& length )
 	    r += l - 'a' + 10;
 	ba[ i ] = r;
     }
-    // qUncompress() expects the first 4 bytes to be the expected length of the
+    // tqUncompress() expects the first 4 bytes to be the expected length of the
     // uncompressed data
     ba[0] = ( length & 0xff000000 ) >> 24;
     ba[1] = ( length & 0x00ff0000 ) >> 16;
     ba[2] = ( length & 0x0000ff00 ) >> 8;
     ba[3] = ( length & 0x000000ff );
-    TQByteArray baunzip = qUncompress( ba, baSize );
+    TQByteArray baunzip = tqUncompress( ba, baSize );
     delete[] ba;
     return baunzip;
 }
 
-#if QT_VERSION >= 0x030900
+#if TQT_VERSION >= 0x030900
 #error Add this functionality to TQDir (relativePathTo() maybe?) and \
 remove it from here and from moc
 #endif
@@ -373,8 +373,8 @@ void Uic::createFormDecl( const TQDomElement &e )
 	out << exportMacro << " ";
     out << bareNameOfClass << " : public " << objClass << endl << "{" << endl;
 
-    /* qmake ignore Q_OBJECT */
-    out << "    Q_OBJECT" << endl;
+    /* qmake ignore TQ_OBJECT */
+    out << "    TQ_OBJECT" << endl;
     out << endl;
     out << "public:" << endl;
 
@@ -583,7 +583,7 @@ void Uic::createFormDecl( const TQDomElement &e )
     registerLayouts( e );
     out << endl;
 
-#if QT_VERSION >= 0x030900
+#if TQT_VERSION >= 0x030900
 #error Make languageChange() a virtual protected non-slot member of TQWidget
 #endif
 
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 452aad978..dbb3962a4 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -74,7 +74,7 @@ int main( int argc, char * argv[] )
     TQApplication app(argc, argv, FALSE);
 
     TQString keybase( "/TQt Designer/" + 
-	TQString::number( (QT_VERSION >> 16) & 0xff ) +"." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+	TQString::number( (TQT_VERSION >> 16) & 0xff ) +"." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     TQSettings config;
     config.insertSearchPath( TQSettings::Windows, "/Trolltech" );
     TQStringList pluginPaths = config.readListEntry( keybase + "PluginPaths" );
@@ -169,7 +169,7 @@ int main( int argc, char * argv[] )
 	    } else if ( opt == "version" ) {
 		fprintf( stderr,
 			 "User Interface Compiler for TQt version %s\n",
-			 QT_VERSION_STR );
+			 TQT_VERSION_STR );
 		return 1;
 	    } else if ( opt == "help" ) {
 		break;
@@ -298,7 +298,7 @@ int main( int argc, char * argv[] )
     TQDomElement e = doc.firstChild().toElement();
     if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) {
 	qWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"),
-		  e.attribute("version").latin1(), QT_VERSION_STR );
+		  e.attribute("version").latin1(), TQT_VERSION_STR );
 	return 1;
     }
 
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index f89b2ffb4..194bb6154 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -63,8 +63,8 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass )
     out << "class " << subClass << " : public " << nameOfClass << endl;
     out << "{" << endl;
 
-/* tmake ignore Q_OBJECT */
-    out << "    Q_OBJECT" << endl;
+/* tmake ignore TQ_OBJECT */
+    out << "    TQ_OBJECT" << endl;
     out << endl;
     out << "public:" << endl;