1 files changed, 49 insertions, 49 deletions

diff --git a/qtjava/javalib/qtjava/QDataStream.cpp b/qtjava/javalib/qtjava/QDataStream.cpp
index b5907270..ae030330 100644
--- a/qtjava/javalib/qtjava/QDataStream.cpp
+++ b/qtjava/javalib/qtjava/QDataStream.cpp
@@ -4,35 +4,35 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QDataStream.h>
+#include <qtjava/TQDataStream.h>
 
-class QDataStreamJBridge : public QDataStream
+class TQDataStreamJBridge : public TQDataStream
 {
 public:
-	QDataStreamJBridge() : TQDataStream() {};
-	QDataStreamJBridge(TQIODevice* arg1) : TQDataStream(arg1) {};
-	QDataStreamJBridge(TQByteArray arg1,int arg2) : TQDataStream(arg1,arg2) {};
-	~QDataStreamJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQDataStreamJBridge() : TTQDataStream() {};
+	TQDataStreamJBridge(TTQIODevice* arg1) : TTQDataStream(arg1) {};
+	TQDataStreamJBridge(TTQByteArray arg1,int arg2) : TTQDataStream(arg1,arg2) {};
+	~TQDataStreamJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QDataStream_atEnd(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQDataStream*) QtSupport::getQt(env, obj))->atEnd();
+	jboolean xret = (jboolean) ((TTQDataStream*) QtSupport::getQt(env, obj))->atEnd();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QDataStream_byteOrder(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQDataStream*) QtSupport::getQt(env, obj))->byteOrder();
+	jint xret = (jint) ((TTQDataStream*) QtSupport::getQt(env, obj))->byteOrder();
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_device(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQDataStream*) QtSupport::getQt(env, obj))->device(), "org.kde.qt.QIODeviceInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQDataStream*) QtSupport::getQt(env, obj))->device(), "org.kde.qt.TQIODeviceInterface");
 	return xret;
 }
 
@@ -46,7 +46,7 @@ Java_org_kde_qt_QDataStream_dispose(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QDataStream_eof(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQDataStream*) QtSupport::getQt(env, obj))->eof();
+	jboolean xret = (jboolean) ((TTQDataStream*) QtSupport::getQt(env, obj))->eof();
 	return xret;
 }
 
@@ -54,7 +54,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQDataStream*)QtSupport::getQt(env, obj);
+		delete (TTQDataStream*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -69,36 +69,36 @@ Java_org_kde_qt_QDataStream_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QDataStream_isPrintableData(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQDataStream*) QtSupport::getQt(env, obj))->isPrintableData();
+	jboolean xret = (jboolean) ((TTQDataStream*) QtSupport::getQt(env, obj))->isPrintableData();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QDataStream_newQDataStream__(JNIEnv* env, jobject obj)
+Java_org_kde_qt_QDataStream_newTQDataStream__(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QDataStreamJBridge());
+		QtSupport::setQt(env, obj, new TQDataStreamJBridge());
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QDataStream_newQDataStream__Lorg_kde_qt_QIODeviceInterface_2(JNIEnv* env, jobject obj, jobject arg1)
+Java_org_kde_qt_QDataStream_newTQDataStream__Lorg_kde_qt_QIODeviceInterface_2(JNIEnv* env, jobject obj, jobject arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QDataStreamJBridge((TQIODevice*) QtSupport::getQt(env, arg1)));
+		QtSupport::setQt(env, obj, new TQDataStreamJBridge((TTQIODevice*) QtSupport::getQt(env, arg1)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QDataStream_newQDataStream___3BI(JNIEnv* env, jobject obj, jbyteArray arg1, jint mode)
+Java_org_kde_qt_QDataStream_newTQDataStream___3BI(JNIEnv* env, jobject obj, jbyteArray arg1, jint mode)
 {
-static TQByteArray* _qbyteArray_arg1 = 0;
+static TTQByteArray* _qbyteArray_arg1 = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QDataStreamJBridge((TQByteArray)*(TQByteArray*) QtSupport::toQByteArray(env, arg1, &_qbyteArray_arg1), (int) mode));
+		QtSupport::setQt(env, obj, new TQDataStreamJBridge((TTQByteArray)*(TTQByteArray*) QtSupport::toTQByteArray(env, arg1, &_qbyteArray_arg1), (int) mode));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -107,174 +107,174 @@ 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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT8&) i), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__D(JNIEnv* env, jobject obj, jdouble f)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((double&) f), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((double&) f), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__F(JNIEnv* env, jobject obj, jfloat f)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((float&) f), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((float&) f), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT32&) i), "org.kde.qt.TTQDataStream");
 	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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_LONG&) i), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1read__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring str)
 {
-static TQCString* _qstring_str = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((char*&) *(char*)QtSupport::toCharString(env, str, &_qstring_str)), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_str = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((char*&) *(char*)QtSupport::toCharString(env, str, &_qstring_str)), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_UINT8&) i), "org.kde.qt.TTQDataStream");
 	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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT8) i), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__D(JNIEnv* env, jobject obj, jdouble f)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((double) f), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((double) f), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__F(JNIEnv* env, jobject obj, jfloat f)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((float) f), "org.kde.qt.TQDataStream");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((float) f), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT32) i), "org.kde.qt.TTQDataStream");
 	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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT64) i), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_op_1write__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring str)
 {
-static TQCString* _qstring_str = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((const char*) QtSupport::toCharString(env, str, &_qstring_str)), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_str = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((const char*) QtSupport::toCharString(env, str, &_qstring_str)), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 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*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_UINT8) i), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_readBytes(JNIEnv* env, jobject obj, jstring arg1, jint len)
 {
-static TQCString* _qstring_arg1 = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->readBytes((char*&) *(char*)QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint&) len), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_arg1 = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->readBytes((char*&) *(char*)QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint&) len), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_readRawBytes(JNIEnv* env, jobject obj, jstring arg1, jint len)
 {
-static TQCString* _qstring_arg1 = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->readRawBytes((char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_arg1 = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->readRawBytes((char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_setByteOrder(JNIEnv* env, jobject obj, jint arg1)
 {
-	((TQDataStream*) QtSupport::getQt(env, obj))->setByteOrder((int) arg1);
+	((TTQDataStream*) QtSupport::getQt(env, obj))->setByteOrder((int) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_setDevice(JNIEnv* env, jobject obj, jobject arg1)
 {
-	((TQDataStream*) QtSupport::getQt(env, obj))->setDevice((TQIODevice*) QtSupport::getQt(env, arg1));
+	((TTQDataStream*) QtSupport::getQt(env, obj))->setDevice((TTQIODevice*) QtSupport::getQt(env, arg1));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_setPrintableData(JNIEnv* env, jobject obj, jboolean arg1)
 {
-	((TQDataStream*) QtSupport::getQt(env, obj))->setPrintableData((bool) arg1);
+	((TTQDataStream*) QtSupport::getQt(env, obj))->setPrintableData((bool) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_setVersion(JNIEnv* env, jobject obj, jint arg1)
 {
-	((TQDataStream*) QtSupport::getQt(env, obj))->setVersion((int) arg1);
+	((TTQDataStream*) QtSupport::getQt(env, obj))->setVersion((int) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QDataStream_unsetDevice(JNIEnv* env, jobject obj)
 {
-	((TQDataStream*) QtSupport::getQt(env, obj))->unsetDevice();
+	((TTQDataStream*) QtSupport::getQt(env, obj))->unsetDevice();
 	return;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QDataStream_version(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQDataStream*) QtSupport::getQt(env, obj))->version();
+	jint xret = (jint) ((TTQDataStream*) QtSupport::getQt(env, obj))->version();
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_writeBytes(JNIEnv* env, jobject obj, jstring arg1, jint len)
 {
-static TQCString* _qstring_arg1 = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->writeBytes((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_arg1 = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->writeBytes((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TTQDataStream");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QDataStream_writeRawBytes(JNIEnv* env, jobject obj, jstring arg1, jint len)
 {
-static TQCString* _qstring_arg1 = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->writeRawBytes((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TQDataStream");
+static TTQCString* _qstring_arg1 = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQDataStream *) &((TTQDataStream*) QtSupport::getQt(env, obj))->writeRawBytes((const char*) QtSupport::toCharString(env, arg1, &_qstring_arg1), (uint) len), "org.kde.qt.TTQDataStream");
 	return xret;
 }