1 files changed, 33 insertions, 33 deletions

diff --git a/qtjava/javalib/qtjava/QCanvasText.cpp b/qtjava/javalib/qtjava/QCanvasText.cpp
index bd4b2c6a..df11e6f7 100644
--- a/qtjava/javalib/qtjava/QCanvasText.cpp
+++ b/qtjava/javalib/qtjava/QCanvasText.cpp
@@ -7,39 +7,39 @@
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasText.h>
+#include <qtjava/TQCanvasText.h>
 
-class QCanvasTextJBridge : public QCanvasText
+class TQCanvasTextJBridge : public TQCanvasText
 {
 public:
-	QCanvasTextJBridge(TQCanvas* arg1) : TQCanvasText(arg1) {};
-	QCanvasTextJBridge(const TQString& arg1,TQCanvas* arg2) : TQCanvasText(arg1,arg2) {};
-	QCanvasTextJBridge(const TQString& arg1,TQFont arg2,TQCanvas* arg3) : TQCanvasText(arg1,arg2,arg3) {};
-	void protected_draw(TQPainter& arg1) {
-		TQCanvasText::draw(arg1);
+	TQCanvasTextJBridge(TTQCanvas* arg1) : TTQCanvasText(arg1) {};
+	TQCanvasTextJBridge(const TTQString& arg1,TTQCanvas* arg2) : TTQCanvasText(arg1,arg2) {};
+	TQCanvasTextJBridge(const TTQString& arg1,TTQFont arg2,TTQCanvas* arg3) : TTQCanvasText(arg1,arg2,arg3) {};
+	void protected_draw(TTQPainter& arg1) {
+		TTQCanvasText::draw(arg1);
 		return;
 	}
-	~QCanvasTextJBridge() {QtSupport::qtKeyDeleted(this);}
+	~TQCanvasTextJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasText_boundingRect(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQRect(((TQCanvasText*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TQRect", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQRect(((TTQCanvasText*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TTQRect", TRUE);
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QCanvasText_collidesWith(JNIEnv* env, jobject obj, jobject arg1)
 {
-	jboolean xret = (jboolean) ((TQCanvasText*) QtSupport::getQt(env, obj))->collidesWith((const TQCanvasItem*) QtSupport::getQt(env, arg1));
+	jboolean xret = (jboolean) ((TTQCanvasText*) QtSupport::getQt(env, obj))->collidesWith((const TTQCanvasItem*) QtSupport::getQt(env, arg1));
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasText_color(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQColor(((TQCanvasText*) QtSupport::getQt(env, obj))->color()), "org.kde.qt.TQColor", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQColor(((TTQCanvasText*) QtSupport::getQt(env, obj))->color()), "org.kde.qt.TTQColor", TRUE);
 	return xret;
 }
 
@@ -53,7 +53,7 @@ Java_org_kde_qt_QCanvasText_dispose(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_draw(JNIEnv* env, jobject obj, jobject arg1)
 {
-	((QCanvasTextJBridge*) QtSupport::getQt(env, obj))->protected_draw((TQPainter&)*(TQPainter*) QtSupport::getQt(env, arg1));
+	((TQCanvasTextJBridge*) QtSupport::getQt(env, obj))->protected_draw((TTQPainter&)*(TTQPainter*) QtSupport::getQt(env, arg1));
 	return;
 }
 
@@ -61,7 +61,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQCanvasText*)QtSupport::getQt(env, obj);
+		delete (TTQCanvasText*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -70,7 +70,7 @@ Java_org_kde_qt_QCanvasText_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasText_font(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQFont(((TQCanvasText*) QtSupport::getQt(env, obj))->font()), "org.kde.qt.TQFont", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQFont(((TTQCanvasText*) QtSupport::getQt(env, obj))->font()), "org.kde.qt.TTQFont", TRUE);
 	return xret;
 }
 
@@ -83,37 +83,37 @@ Java_org_kde_qt_QCanvasText_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_moveBy(JNIEnv* env, jobject obj, jdouble dx, jdouble dy)
 {
-	((TQCanvasText*) QtSupport::getQt(env, obj))->moveBy((double) dx, (double) dy);
+	((TTQCanvasText*) QtSupport::getQt(env, obj))->moveBy((double) dx, (double) dy);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasText_newQCanvasText__Ljava_lang_String_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jstring arg1, jobject canvas)
+Java_org_kde_qt_QCanvasText_newTQCanvasText__Ljava_lang_String_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jstring arg1, jobject canvas)
 {
-static TQString* _qstring_arg1 = 0;
+static TTQString* _qstring_arg1 = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasTextJBridge((const TQString&)*(TQString*) QtSupport::toQString(env, arg1, &_qstring_arg1), (TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasTextJBridge((const TTQString&)*(TTQString*) QtSupport::toTQString(env, arg1, &_qstring_arg1), (TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasText_newQCanvasText__Ljava_lang_String_2Lorg_kde_qt_QFont_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jstring arg1, jobject arg2, jobject canvas)
+Java_org_kde_qt_QCanvasText_newTQCanvasText__Ljava_lang_String_2Lorg_kde_qt_QFont_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jstring arg1, jobject arg2, jobject canvas)
 {
-static TQString* _qstring_arg1 = 0;
+static TTQString* _qstring_arg1 = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasTextJBridge((const TQString&)*(TQString*) QtSupport::toQString(env, arg1, &_qstring_arg1), (TQFont)*(TQFont*) QtSupport::getQt(env, arg2), (TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasTextJBridge((const TTQString&)*(TTQString*) QtSupport::toTQString(env, arg1, &_qstring_arg1), (TTQFont)*(TTQFont*) QtSupport::getQt(env, arg2), (TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasText_newQCanvasText__Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject canvas)
+Java_org_kde_qt_QCanvasText_newTQCanvasText__Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject canvas)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasTextJBridge((TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasTextJBridge((TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -122,51 +122,51 @@ Java_org_kde_qt_QCanvasText_newQCanvasText__Lorg_kde_qt_QCanvas_2(JNIEnv* env, j
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasText_rtti(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasText*) QtSupport::getQt(env, obj))->rtti();
+	jint xret = (jint) ((TTQCanvasText*) QtSupport::getQt(env, obj))->rtti();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_setColor(JNIEnv* env, jobject obj, jobject arg1)
 {
-	((TQCanvasText*) QtSupport::getQt(env, obj))->setColor((const TQColor&)*(const TQColor*) QtSupport::getQt(env, arg1));
+	((TTQCanvasText*) QtSupport::getQt(env, obj))->setColor((const TTQColor&)*(const TTQColor*) QtSupport::getQt(env, arg1));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_setFont(JNIEnv* env, jobject obj, jobject arg1)
 {
-	((TQCanvasText*) QtSupport::getQt(env, obj))->setFont((const TQFont&)*(const TQFont*) QtSupport::getQt(env, arg1));
+	((TTQCanvasText*) QtSupport::getQt(env, obj))->setFont((const TTQFont&)*(const TTQFont*) QtSupport::getQt(env, arg1));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_setTextFlags(JNIEnv* env, jobject obj, jint arg1)
 {
-	((TQCanvasText*) QtSupport::getQt(env, obj))->setTextFlags((int) arg1);
+	((TTQCanvasText*) QtSupport::getQt(env, obj))->setTextFlags((int) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasText_setText(JNIEnv* env, jobject obj, jstring arg1)
 {
-static TQString* _qstring_arg1 = 0;
-	((TQCanvasText*) QtSupport::getQt(env, obj))->setText((const TQString&)*(TQString*) QtSupport::toQString(env, arg1, &_qstring_arg1));
+static TTQString* _qstring_arg1 = 0;
+	((TTQCanvasText*) QtSupport::getQt(env, obj))->setText((const TTQString&)*(TTQString*) QtSupport::toTQString(env, arg1, &_qstring_arg1));
 	return;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasText_textFlags(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasText*) QtSupport::getQt(env, obj))->textFlags();
+	jint xret = (jint) ((TTQCanvasText*) QtSupport::getQt(env, obj))->textFlags();
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QCanvasText_text(JNIEnv* env, jobject obj)
 {
-	TQString  _qstring;
-	_qstring = ((TQCanvasText*) QtSupport::getQt(env, obj))->text();
-	return QtSupport::fromQString(env, &_qstring);
+	TTQString  _qstring;
+	_qstring = ((TTQCanvasText*) QtSupport::getQt(env, obj))->text();
+	return QtSupport::fromTQString(env, &_qstring);
 }