Update various qt function definitions and static methods for tqt3

5 files changed, 11 insertions, 11 deletions

diff --git a/qtruby/rubylib/designer/rbuic/embed.cpp b/qtruby/rubylib/designer/rbuic/embed.cpp
index 997e1701..dda9a5ee 100644
--- a/qtruby/rubylib/designer/rbuic/embed.cpp
+++ b/qtruby/rubylib/designer/rbuic/embed.cpp
@@ -217,7 +217,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << indent << "end" << endl;
     out << indent << endl;
 #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
-	out << indent << "baunzip = qUncompress( @@embed_images[name][0].pack(\"C*\")," << endl;
+	out << indent << "baunzip = tqUncompress( @@embed_images[name][0].pack(\"C*\")," << endl;
 	out << indent << "                       @@embed_images[name][0].length )" << endl;
 	out << indent << "img = TQt::Image.new( baunzip.data," << endl;
 	out << indent << "                     @@embed_images[name][1]," << endl;
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index 42ec751f..13241e82 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -62,13 +62,13 @@ 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;
 }
diff --git a/qtruby/rubylib/designer/rbuic/main.cpp b/qtruby/rubylib/designer/rbuic/main.cpp
index 6d45af04..e06ff586 100644
--- a/qtruby/rubylib/designer/rbuic/main.cpp
+++ b/qtruby/rubylib/designer/rbuic/main.cpp
@@ -117,7 +117,7 @@ int main( int argc, char * argv[] )
 	    } else if ( opt == "version" ) {
 		fprintf( stderr,
 			 "QtRuby User Interface Compiler v%s for Qt version %s\n", RBUIC_VERSION,
-			 QT_VERSION_STR );
+			 TQT_VERSION_STR );
 		exit( 1 );
 	    } else if ( opt == "help" ) {
 		break;
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index c45eeb64..edb151af 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -48,8 +48,8 @@
 
 #include <ruby.h>
 
-#ifndef QT_VERSION_STR
-#define QT_VERSION_STR "Unknown"
+#ifndef TQT_VERSION_STR
+#define TQT_VERSION_STR "Unknown"
 #endif
 
 #undef free
@@ -2507,7 +2507,7 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/)
 				&& qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \
 				&& qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator--") != 0 \
 				&& qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator++") != 0 \
-				&& qstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \
+				&& tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \
 				&& (	(flags == 0 && (methodRef.flags & (Smoke::mf_static|Smoke::mf_enum|Smoke::mf_protected)) == 0) \
 						|| (	flags == Smoke::mf_static \
 								&& (methodRef.flags & Smoke::mf_enum) == 0 \
@@ -2516,7 +2516,7 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/)
 						|| (	flags == Smoke::mf_protected \
 								&& (methodRef.flags & Smoke::mf_static) == 0 \
 								&& (methodRef.flags & Smoke::mf_protected) == Smoke::mf_protected ) ) ) { \
-			if (qstrncmp(qt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \
+			if (tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \
 				if (op_re.search(qt_Smoke->methodNames[methodRef.name]) != -1) { \
 					rb_ary_push(result, rb_str_new2(op_re.cap(1) + op_re.cap(2))); \
 				} else { \
@@ -2797,7 +2797,7 @@ create_qt_class(VALUE /*self*/, VALUE package_value)
 static VALUE
 version(VALUE /*self*/)
 {
-    return rb_str_new2(QT_VERSION_STR);
+    return rb_str_new2(TQT_VERSION_STR);
 }
 
 static VALUE
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 30341fd1..ae952c0e 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -1748,7 +1748,7 @@ void marshall_TQPairintint(Marshall *m) {
 #include <tqtoolbar.h>
 #include <tqtabbar.h>
 
-#if QT_VERSION >= 0x030200
+#if TQT_VERSION >= 0x030200
 DEF_LIST_MARSHALLER( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, TQPtrListStdIterator<TQNetworkOperation> )
 DEF_LIST_MARSHALLER( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, TQPtrListStdIterator<TQToolBar> )
 DEF_LIST_MARSHALLER( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, TQPtrListStdIterator<TQTab> )
@@ -1934,7 +1934,7 @@ TypeHandler Qt_handlers[] = {
     { "TQMap<TQString,TQString>&", marshall_TQMapTQStringTQString },
     { "TQMap<TQString,TQVariant>", marshall_TQMapTQStringTQVariant },
     { "TQMap<TQString,TQVariant>&", marshall_TQMapTQStringTQVariant },
-#if QT_VERSION >= 0x030200
+#if TQT_VERSION >= 0x030200
     { "TQWidgetList", marshall_TQWidgetList },
     { "TQWidgetList*", marshall_TQWidgetList },
     { "TQWidgetList&", marshall_TQWidgetList },