Update for recent TQ changes.

12 files changed, 49 insertions, 49 deletions

diff --git a/qtjava/javalib/org/kde/qt/TQDataStream.java b/qtjava/javalib/org/kde/qt/TQDataStream.java
index e171c3e9..89d6725c 100644
--- a/qtjava/javalib/org/kde/qt/TQDataStream.java
+++ b/qtjava/javalib/org/kde/qt/TQDataStream.java
@@ -37,8 +37,8 @@ public class TQDataStream implements QtSupport {
 	public native TQDataStream op_read(char i);
 	public native TQDataStream op_read(short i);
 	public native TQDataStream op_read(int i);
-	// TQDataStream& op_read(Q_INT64& arg1); >>>> NOT CONVERTED
-	// TQDataStream& op_read(Q_UINT64& arg1); >>>> NOT CONVERTED
+	// TQDataStream& op_read(TQ_INT64& arg1); >>>> NOT CONVERTED
+	// TQDataStream& op_read(TQ_UINT64& arg1); >>>> NOT CONVERTED
 	public native TQDataStream op_read(long i);
 	public native TQDataStream op_read(float f);
 	public native TQDataStream op_read(double f);
diff --git a/qtjava/javalib/org/kde/qt/TQVariant.java b/qtjava/javalib/org/kde/qt/TQVariant.java
index 2c11361d..fb1fb83e 100644
--- a/qtjava/javalib/org/kde/qt/TQVariant.java
+++ b/qtjava/javalib/org/kde/qt/TQVariant.java
@@ -252,7 +252,7 @@ public class TQVariant implements QtSupport {
 	public native TQPen asPen();
 	public native int asInt();
 	public native int asUInt();
-	// TQ_LLONG& asLongLong(); >>>> NOT CONVERTED
+	// TTQ_LLONG& asLongLong(); >>>> NOT CONVERTED
 	// TQ_ULLONG& asULongLong(); >>>> NOT CONVERTED
 	public native boolean asBool();
 	public native double asDouble();
diff --git a/qtjava/javalib/qtjava/TQBuffer.cpp b/qtjava/javalib/qtjava/TQBuffer.cpp
index 9dbb918d..766b31c8 100644
--- a/qtjava/javalib/qtjava/TQBuffer.cpp
+++ b/qtjava/javalib/qtjava/TQBuffer.cpp
@@ -122,7 +122,7 @@ Java_org_kde_qt_QBuffer_readBlock(JNIEnv* env, jobject obj, jobject p, jlong arg
 static TQCString* _qstring_p = 0;
 	if (_qstring_p == 0) { _qstring_p = new TQCString(); }
 	_qstring_p->resize((uint) arg2);
-	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_p->data(), (Q_ULONG) arg2);
+	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_p->data(), (TQ_ULONG) arg2);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_p, p);
 	return xret;
 }
@@ -131,7 +131,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QBuffer_readLine(JNIEnv* env, jobject obj, jstring p, jlong arg2)
 {
 static TQCString* _qstring_p = 0;
-	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, p, &_qstring_p), (Q_ULONG) arg2);
+	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, p, &_qstring_p), (TQ_ULONG) arg2);
 	return xret;
 }
 
@@ -161,7 +161,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QBuffer_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring p, jlong arg2)
 {
 static TQCString* _qstring_p = 0;
-	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, p, &_qstring_p), (Q_ULONG) arg2);
+	jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, p, &_qstring_p), (TQ_ULONG) arg2);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQDataStream.cpp b/qtjava/javalib/qtjava/TQDataStream.cpp
index ff875824..0cfda8cc 100644
--- a/qtjava/javalib/qtjava/TQDataStream.cpp
+++ b/qtjava/javalib/qtjava/TQDataStream.cpp
@@ -107,7 +107,7 @@ static TQByteArray* _qbyteArray_arg1 = 0;
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__C(JNIEnv* env, jobject obj, jchar i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT8&) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_INT8&) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
@@ -128,14 +128,14 @@ Java_org_kde_qt_QDataStream_op_1read__F(JNIEnv* env, jobject obj, jfloat f)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__I(JNIEnv* env, jobject obj, jint i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT32&) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_INT32&) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__J(JNIEnv* env, jobject obj, jlong i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_LONG&) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_LONG&) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
@@ -150,14 +150,14 @@ static TQCString* _qstring_str = 0;
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__S(JNIEnv* env, jobject obj, jshort i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_UINT8&) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_UINT8&) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__C(JNIEnv* env, jobject obj, jchar i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT8) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT8) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
@@ -178,14 +178,14 @@ Java_org_kde_qt_QDataStream_op_1write__F(JNIEnv* env, jobject obj, jfloat f)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__I(JNIEnv* env, jobject obj, jint i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT32) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT32) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__J(JNIEnv* env, jobject obj, jlong i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT64) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT64) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
@@ -200,7 +200,7 @@ static TQCString* _qstring_str = 0;
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__S(JNIEnv* env, jobject obj, jshort i)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_UINT8) i), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_UINT8) i), "org.kde.qt.TQDataStream");
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQFile.cpp b/qtjava/javalib/qtjava/TQFile.cpp
index b1197d90..eaff2f33 100644
--- a/qtjava/javalib/qtjava/TQFile.cpp
+++ b/qtjava/javalib/qtjava/TQFile.cpp
@@ -192,7 +192,7 @@ Java_org_kde_qt_QFile_readBlock(JNIEnv* env, jobject obj, jobject data, jlong le
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) len);
-	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) len);
+	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) len);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
@@ -201,7 +201,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QFile_readLine__Ljava_lang_StringBuffer_2J(JNIEnv* env, jobject obj, jobject arg1, jlong maxlen)
 {
 static TQString* _qstring_arg1 = 0;
-	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((TQString&)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, arg1, &_qstring_arg1), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((TQString&)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, arg1, &_qstring_arg1), (TQ_ULONG) maxlen);
 	QtSupport::fromTQStringToStringBuffer(env, _qstring_arg1, arg1);
 	return xret;
 }
@@ -210,7 +210,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QFile_readLine__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong maxlen)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen);
 	return xret;
 }
 
@@ -264,7 +264,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QFile_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len);
+	jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQFtp.cpp b/qtjava/javalib/qtjava/TQFtp.cpp
index 2837636e..6198f20e 100644
--- a/qtjava/javalib/qtjava/TQFtp.cpp
+++ b/qtjava/javalib/qtjava/TQFtp.cpp
@@ -217,7 +217,7 @@ JNIEXPORT jint JNICALL
 Java_org_kde_qt_QFtp_connectToHost__Ljava_lang_String_2S(JNIEnv* env, jobject obj, jstring host, jshort port)
 {
 static TQString* _qstring_host = 0;
-	jint xret = (jint) ((TQFtp*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (Q_UINT16) port);
+	jint xret = (jint) ((TQFtp*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (TQ_UINT16) port);
 	return xret;
 }
 
@@ -533,7 +533,7 @@ Java_org_kde_qt_QFtp_readBlock(JNIEnv* env, jobject obj, jobject data, jlong max
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) maxlen);
-	jlong xret = (jlong) ((TQFtp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQFtp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
diff --git a/qtjava/javalib/qtjava/TQHostAddress.cpp b/qtjava/javalib/qtjava/TQHostAddress.cpp
index 7608891e..61f4091b 100644
--- a/qtjava/javalib/qtjava/TQHostAddress.cpp
+++ b/qtjava/javalib/qtjava/TQHostAddress.cpp
@@ -10,8 +10,8 @@ class TQHostAddressJBridge : public TQHostAddress
 {
 public:
 	TQHostAddressJBridge() : TQHostAddress() {};
-	TQHostAddressJBridge(Q_UINT32 arg1) : TQHostAddress(arg1) {};
-	TQHostAddressJBridge(Q_UINT8* arg1) : TQHostAddress(arg1) {};
+	TQHostAddressJBridge(TQ_UINT32 arg1) : TQHostAddress(arg1) {};
+	TQHostAddressJBridge(TQ_UINT8* arg1) : TQHostAddress(arg1) {};
 	TQHostAddressJBridge(const TQString& arg1) : TQHostAddress(arg1) {};
 	TQHostAddressJBridge(const TQHostAddress& arg1) : TQHostAddress(arg1) {};
 	~TQHostAddressJBridge() {QtSupport::qtKeyDeleted(this);}
@@ -89,7 +89,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QHostAddress_newTQHostAddress__I(JNIEnv* env, jobject obj, jint ip4Addr)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQHostAddressJBridge((Q_UINT32) ip4Addr));
+		QtSupport::setQt(env, obj, new TQHostAddressJBridge((TQ_UINT32) ip4Addr));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -120,7 +120,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QHostAddress_newTQHostAddress__S(JNIEnv* env, jobject obj, jshort ip6Addr)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQHostAddressJBridge((Q_UINT8*) ip6Addr));
+		QtSupport::setQt(env, obj, new TQHostAddressJBridge((TQ_UINT8*) ip6Addr));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -136,7 +136,7 @@ Java_org_kde_qt_QHostAddress_op_1equals(JNIEnv* env, jobject obj, jobject arg1)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QHostAddress_setAddress__I(JNIEnv* env, jobject obj, jint ip4Addr)
 {
-	((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((Q_UINT32) ip4Addr);
+	((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((TQ_UINT32) ip4Addr);
 	return;
 }
 
@@ -151,7 +151,7 @@ static TQString* _qstring_address = 0;
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QHostAddress_setAddress__S(JNIEnv* env, jobject obj, jshort ip6Addr)
 {
-	((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((Q_UINT8*) ip6Addr);
+	((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((TQ_UINT8*) ip6Addr);
 	return;
 }
 
diff --git a/qtjava/javalib/qtjava/TQHttp.cpp b/qtjava/javalib/qtjava/TQHttp.cpp
index 4b0f00bb..111bfc54 100644
--- a/qtjava/javalib/qtjava/TQHttp.cpp
+++ b/qtjava/javalib/qtjava/TQHttp.cpp
@@ -13,9 +13,9 @@ public:
 	TQHttpJBridge() : TQHttp() {};
 	TQHttpJBridge(TQObject* arg1,const char* arg2) : TQHttp(arg1,arg2) {};
 	TQHttpJBridge(TQObject* arg1) : TQHttp(arg1) {};
-	TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2,TQObject* arg3,const char* arg4) : TQHttp(arg1,arg2,arg3,arg4) {};
-	TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2,TQObject* arg3) : TQHttp(arg1,arg2,arg3) {};
-	TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2) : TQHttp(arg1,arg2) {};
+	TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2,TQObject* arg3,const char* arg4) : TQHttp(arg1,arg2,arg3,arg4) {};
+	TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2,TQObject* arg3) : TQHttp(arg1,arg2,arg3) {};
+	TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2) : TQHttp(arg1,arg2) {};
 	TQHttpJBridge(const TQString& arg1) : TQHttp(arg1) {};
 	void protected_operationGet(TQNetworkOperation* arg1) {
 		TQHttp::operationGet(arg1);
@@ -295,7 +295,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2S(JNIEnv* env, jobject obj,
 {
 static TQString* _qstring_hostname = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port));
+		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -306,7 +306,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2SLorg_kde_qt_QObject_2(JNIEn
 {
 static TQString* _qstring_hostname = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port, (TQObject*) QtSupport::getQt(env, parent)));
+		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port, (TQObject*) QtSupport::getQt(env, parent)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -318,7 +318,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2SLorg_kde_qt_QObject_2Ljava_
 static TQString* _qstring_hostname = 0;
 static TQCString* _qstring_name = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port, (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name)));
+		QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port, (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -407,7 +407,7 @@ Java_org_kde_qt_QHttp_readBlock(JNIEnv* env, jobject obj, jobject data, jlong ma
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) maxlen);
-	jlong xret = (jlong) ((TQHttp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQHttp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
@@ -461,7 +461,7 @@ JNIEXPORT jint JNICALL
 Java_org_kde_qt_QHttp_setHost__Ljava_lang_String_2S(JNIEnv* env, jobject obj, jstring hostname, jshort port)
 {
 static TQString* _qstring_hostname = 0;
-	jint xret = (jint) ((TQHttp*) QtSupport::getQt(env, obj))->setHost((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port);
+	jint xret = (jint) ((TQHttp*) QtSupport::getQt(env, obj))->setHost((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQIODevice.cpp b/qtjava/javalib/qtjava/TQIODevice.cpp
index d3e766b5..0524e775 100644
--- a/qtjava/javalib/qtjava/TQIODevice.cpp
+++ b/qtjava/javalib/qtjava/TQIODevice.cpp
@@ -181,7 +181,7 @@ Java_org_kde_qt_QIODevice_readBlock(JNIEnv* env, jobject obj, jobject data, jlon
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) maxlen);
-	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
@@ -190,7 +190,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QIODevice_readLine(JNIEnv* env, jobject obj, jstring data, jlong maxlen)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen);
 	return xret;
 }
 
@@ -240,7 +240,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QIODevice_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len);
+	jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQSocket.cpp b/qtjava/javalib/qtjava/TQSocket.cpp
index 49b505bb..72a831f0 100644
--- a/qtjava/javalib/qtjava/TQSocket.cpp
+++ b/qtjava/javalib/qtjava/TQSocket.cpp
@@ -174,7 +174,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QSocket_connectToHost(JNIEnv* env, jobject obj, jstring host, jshort port)
 {
 static TQString* _qstring_host = 0;
-	((TQSocket*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (Q_UINT16) port);
+	((TQSocket*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (TQ_UINT16) port);
 	return;
 }
 
@@ -415,7 +415,7 @@ Java_org_kde_qt_QSocket_readBlock(JNIEnv* env, jobject obj, jobject data, jlong
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) maxlen);
-	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
@@ -439,7 +439,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QSocket_readLine__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong maxlen)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen);
 	return xret;
 }
 
@@ -474,7 +474,7 @@ Java_org_kde_qt_QSocket_setMode(JNIEnv* env, jobject obj, jint arg1)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QSocket_setReadBufferSize(JNIEnv* env, jobject obj, jlong arg1)
 {
-	((TQSocket*) QtSupport::getQt(env, obj))->setReadBufferSize((Q_ULONG) arg1);
+	((TQSocket*) QtSupport::getQt(env, obj))->setReadBufferSize((TQ_ULONG) arg1);
 	return;
 }
 
@@ -617,7 +617,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QSocket_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len);
+	jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQSocketDevice.cpp b/qtjava/javalib/qtjava/TQSocketDevice.cpp
index 72fc9c25..915519e8 100644
--- a/qtjava/javalib/qtjava/TQSocketDevice.cpp
+++ b/qtjava/javalib/qtjava/TQSocketDevice.cpp
@@ -66,7 +66,7 @@ Java_org_kde_qt_QSocketDevice_at__J(JNIEnv* env, jobject obj, jlong arg1)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QSocketDevice_bind(JNIEnv* env, jobject obj, jobject arg1, jshort arg2)
 {
-	jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->bind((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (Q_UINT16) arg2);
+	jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->bind((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (TQ_UINT16) arg2);
 	return xret;
 }
 
@@ -94,7 +94,7 @@ Java_org_kde_qt_QSocketDevice_close(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QSocketDevice_connect(JNIEnv* env, jobject obj, jobject arg1, jshort arg2)
 {
-	jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->connect((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (Q_UINT16) arg2);
+	jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->connect((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (TQ_UINT16) arg2);
 	return xret;
 }
 
@@ -244,7 +244,7 @@ Java_org_kde_qt_QSocketDevice_readBlock(JNIEnv* env, jobject obj, jobject data,
 static TQCString* _qstring_data = 0;
 	if (_qstring_data == 0) { _qstring_data = new TQCString(); }
 	_qstring_data->resize((uint) maxlen);
-	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen);
+	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen);
 	QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data);
 	return xret;
 }
@@ -353,7 +353,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QSocketDevice_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len);
+	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len);
 	return xret;
 }
 
@@ -361,7 +361,7 @@ JNIEXPORT jlong JNICALL
 Java_org_kde_qt_QSocketDevice_writeBlock__Ljava_lang_String_2JLorg_kde_qt_QHostAddress_2S(JNIEnv* env, jobject obj, jstring data, jlong len, jobject host, jshort port)
 {
 static TQCString* _qstring_data = 0;
-	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len, (const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, host), (Q_UINT16) port);
+	jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len, (const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, host), (TQ_UINT16) port);
 	return xret;
 }
 
diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 4c713dc7..54506269 100644
--- a/qtjava/javalib/qtjava/TQVariant.cpp
+++ b/qtjava/javalib/qtjava/TQVariant.cpp
@@ -57,7 +57,7 @@ public:
 	TQVariantJBridge(const TQKeySequence& arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(const TQPen& arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(int arg1) : TQVariant(arg1) {};
-	TQVariantJBridge(Q_LLONG arg1) : TQVariant(arg1) {};
+	TQVariantJBridge(TQ_LLONG arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(bool arg1,int arg2) : TQVariant(arg1,arg2) {};
 	TQVariantJBridge(double arg1) : TQVariant(arg1) {};
 	TQVariantJBridge(TQSizePolicy arg1) : TQVariant(arg1) {};
@@ -382,7 +382,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QVariant_newTQVariant__J(JNIEnv* env, jobject obj, jlong arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new TQVariantJBridge((Q_LLONG) arg1));
+		QtSupport::setQt(env, obj, new TQVariantJBridge((TQ_LLONG) arg1));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;