1 files changed, 44 insertions, 44 deletions

diff --git a/qtjava/javalib/qtjava/QPicture.cpp b/qtjava/javalib/qtjava/QPicture.cpp
index 29c50259..f75f3d01 100644
--- a/qtjava/javalib/qtjava/QPicture.cpp
+++ b/qtjava/javalib/qtjava/QPicture.cpp
@@ -4,38 +4,38 @@
 #include <tqpicture.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QPicture.h>
+#include <qtjava/TQPicture.h>
 
-class QPictureJBridge : public QPicture
+class TQPictureJBridge : public TQPicture
 {
 public:
-	QPictureJBridge(int arg1) : TQPicture(arg1) {};
-	QPictureJBridge() : TQPicture() {};
-	QPictureJBridge(const TQPicture& arg1) : TQPicture(arg1) {};
+	TQPictureJBridge(int arg1) : TTQPicture(arg1) {};
+	TQPictureJBridge() : TTQPicture() {};
+	TQPictureJBridge(const TTQPicture& arg1) : TTQPicture(arg1) {};
 	int protected_metric(int arg1) {
-		return (int) TQPicture::metric(arg1);
+		return (int) TTQPicture::metric(arg1);
 	}
 	void protected_detach() {
-		TQPicture::detach();
+		TTQPicture::detach();
 		return;
 	}
-	TQPicture protected_copy() {
-		return (TQPicture) TQPicture::copy();
+	TTQPicture protected_copy() {
+		return (TTQPicture) TTQPicture::copy();
 	}
-	~QPictureJBridge() {QtSupport::qtKeyDeleted(this);}
+	~TQPictureJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QPicture_boundingRect(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQRect(((TQPicture*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TQRect", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQRect(((TTQPicture*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TTQRect", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QPicture_copy(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPicture(((QPictureJBridge*) QtSupport::getQt(env, obj))->protected_copy()), "org.kde.qt.TQPicture", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQPicture(((TQPictureJBridge*) QtSupport::getQt(env, obj))->protected_copy()), "org.kde.qt.TTQPicture", TRUE);
 	return xret;
 }
 
@@ -43,14 +43,14 @@ JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QPicture_data(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((TQPicture*) QtSupport::getQt(env, obj))->data();
+	_qstring = ((TTQPicture*) QtSupport::getQt(env, obj))->data();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QPicture_detach(JNIEnv* env, jobject obj)
 {
-	((QPictureJBridge*) QtSupport::getQt(env, obj))->protected_detach();
+	((TQPictureJBridge*) QtSupport::getQt(env, obj))->protected_detach();
 	return;
 }
 
@@ -65,7 +65,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QPicture_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQPicture*)QtSupport::getQt(env, obj);
+		delete (TTQPicture*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -80,74 +80,74 @@ Java_org_kde_qt_QPicture_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_isNull(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->isNull();
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->isNull();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_load__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring fileName)
 {
-static TQString* _qstring_fileName = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->load((const TQString&)*(TQString*) QtSupport::toQString(env, fileName, &_qstring_fileName));
+static TTQString* _qstring_fileName = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->load((const TTQString&)*(TTQString*) QtSupport::toTQString(env, fileName, &_qstring_fileName));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_load__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring fileName, jstring format)
 {
-static TQString* _qstring_fileName = 0;
-static TQCString* _qstring_format = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->load((const TQString&)*(TQString*) QtSupport::toQString(env, fileName, &_qstring_fileName), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
+static TTQString* _qstring_fileName = 0;
+static TTQCString* _qstring_format = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->load((const TTQString&)*(TTQString*) QtSupport::toTQString(env, fileName, &_qstring_fileName), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_load__Lorg_kde_qt_QIODeviceInterface_2(JNIEnv* env, jobject obj, jobject dev)
 {
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->load((TQIODevice*) QtSupport::getQt(env, dev));
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->load((TTQIODevice*) QtSupport::getQt(env, dev));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_load__Lorg_kde_qt_QIODeviceInterface_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject dev, jstring format)
 {
-static TQCString* _qstring_format = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->load((TQIODevice*) QtSupport::getQt(env, dev), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
+static TTQCString* _qstring_format = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->load((TTQIODevice*) QtSupport::getQt(env, dev), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QPicture_metric(JNIEnv* env, jobject obj, jint arg1)
 {
-	jint xret = (jint) ((QPictureJBridge*) QtSupport::getQt(env, obj))->protected_metric((int) arg1);
+	jint xret = (jint) ((TQPictureJBridge*) QtSupport::getQt(env, obj))->protected_metric((int) arg1);
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QPicture_newQPicture__(JNIEnv* env, jobject obj)
+Java_org_kde_qt_QPicture_newTQPicture__(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QPictureJBridge());
+		QtSupport::setQt(env, obj, new TQPictureJBridge());
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QPicture_newQPicture__I(JNIEnv* env, jobject obj, jint formatVersion)
+Java_org_kde_qt_QPicture_newTQPicture__I(JNIEnv* env, jobject obj, jint formatVersion)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QPictureJBridge((int) formatVersion));
+		QtSupport::setQt(env, obj, new TQPictureJBridge((int) formatVersion));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QPicture_newQPicture__Lorg_kde_qt_QPicture_2(JNIEnv* env, jobject obj, jobject arg1)
+Java_org_kde_qt_QPicture_newTQPicture__Lorg_kde_qt_QPicture_2(JNIEnv* env, jobject obj, jobject arg1)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QPictureJBridge((const TQPicture&)*(const TQPicture*) QtSupport::getQt(env, arg1)));
+		QtSupport::setQt(env, obj, new TQPictureJBridge((const TTQPicture&)*(const TTQPicture*) QtSupport::getQt(env, arg1)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -156,61 +156,61 @@ Java_org_kde_qt_QPicture_newQPicture__Lorg_kde_qt_QPicture_2(JNIEnv* env, jobjec
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_play(JNIEnv* env, jobject obj, jobject arg1)
 {
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->play((TQPainter*) QtSupport::getQt(env, arg1));
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->play((TTQPainter*) QtSupport::getQt(env, arg1));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_save__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring fileName)
 {
-static TQString* _qstring_fileName = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->save((const TQString&)*(TQString*) QtSupport::toQString(env, fileName, &_qstring_fileName));
+static TTQString* _qstring_fileName = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->save((const TTQString&)*(TTQString*) QtSupport::toTQString(env, fileName, &_qstring_fileName));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_save__Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring fileName, jstring format)
 {
-static TQString* _qstring_fileName = 0;
-static TQCString* _qstring_format = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->save((const TQString&)*(TQString*) QtSupport::toQString(env, fileName, &_qstring_fileName), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
+static TTQString* _qstring_fileName = 0;
+static TTQCString* _qstring_format = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->save((const TTQString&)*(TTQString*) QtSupport::toTQString(env, fileName, &_qstring_fileName), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_save__Lorg_kde_qt_QIODeviceInterface_2(JNIEnv* env, jobject obj, jobject dev)
 {
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->save((TQIODevice*) QtSupport::getQt(env, dev));
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->save((TTQIODevice*) QtSupport::getQt(env, dev));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QPicture_save__Lorg_kde_qt_QIODeviceInterface_2Ljava_lang_String_2(JNIEnv* env, jobject obj, jobject dev, jstring format)
 {
-static TQCString* _qstring_format = 0;
-	jboolean xret = (jboolean) ((TQPicture*) QtSupport::getQt(env, obj))->save((TQIODevice*) QtSupport::getQt(env, dev), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
+static TTQCString* _qstring_format = 0;
+	jboolean xret = (jboolean) ((TTQPicture*) QtSupport::getQt(env, obj))->save((TTQIODevice*) QtSupport::getQt(env, dev), (const char*) QtSupport::toCharString(env, format, &_qstring_format));
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QPicture_setBoundingRect(JNIEnv* env, jobject obj, jobject r)
 {
-	((TQPicture*) QtSupport::getQt(env, obj))->setBoundingRect((const TQRect&)*(const TQRect*) QtSupport::getQt(env, r));
+	((TTQPicture*) QtSupport::getQt(env, obj))->setBoundingRect((const TTQRect&)*(const TTQRect*) QtSupport::getQt(env, r));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QPicture_setData(JNIEnv* env, jobject obj, jstring data, jint size)
 {
-static TQCString* _qstring_data = 0;
-	((TQPicture*) QtSupport::getQt(env, obj))->setData((const char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) size);
+static TTQCString* _qstring_data = 0;
+	((TTQPicture*) QtSupport::getQt(env, obj))->setData((const char*) QtSupport::toCharString(env, data, &_qstring_data), (uint) size);
 	return;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QPicture_size(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQPicture*) QtSupport::getQt(env, obj))->size();
+	jint xret = (jint) ((TTQPicture*) QtSupport::getQt(env, obj))->size();
 	return xret;
 }