1 files changed, 27 insertions, 27 deletions

diff --git a/qtjava/javalib/qtjava/QCanvasRectangle.cpp b/qtjava/javalib/qtjava/QCanvasRectangle.cpp
index b395b6e6..f7daab2a 100644
--- a/qtjava/javalib/qtjava/QCanvasRectangle.cpp
+++ b/qtjava/javalib/qtjava/QCanvasRectangle.cpp
@@ -6,42 +6,42 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasRectangle.h>
+#include <qtjava/TQCanvasRectangle.h>
 
-class QCanvasRectangleJBridge : public QCanvasRectangle
+class TQCanvasRectangleJBridge : public TQCanvasRectangle
 {
 public:
-	QCanvasRectangleJBridge(TQCanvas* arg1) : TQCanvasRectangle(arg1) {};
-	QCanvasRectangleJBridge(const TQRect& arg1,TQCanvas* arg2) : TQCanvasRectangle(arg1,arg2) {};
-	QCanvasRectangleJBridge(int arg1,int arg2,int arg3,int arg4,TQCanvas* arg5) : TQCanvasRectangle(arg1,arg2,arg3,arg4,arg5) {};
-	void protected_drawShape(TQPainter& arg1) {
-		TQCanvasRectangle::drawShape(arg1);
+	TQCanvasRectangleJBridge(TTQCanvas* arg1) : TTQCanvasRectangle(arg1) {};
+	TQCanvasRectangleJBridge(const TTQRect& arg1,TTQCanvas* arg2) : TTQCanvasRectangle(arg1,arg2) {};
+	TQCanvasRectangleJBridge(int arg1,int arg2,int arg3,int arg4,TTQCanvas* arg5) : TTQCanvasRectangle(arg1,arg2,arg3,arg4,arg5) {};
+	void protected_drawShape(TTQPainter& arg1) {
+		TTQCanvasRectangle::drawShape(arg1);
 		return;
 	}
-	TQPointArray protected_chunks() {
-		return (TQPointArray) TQCanvasRectangle::chunks();
+	TTQPointArray protected_chunks() {
+		return (TTQPointArray) TTQCanvasRectangle::chunks();
 	}
-	~QCanvasRectangleJBridge() {QtSupport::qtKeyDeleted(this);}
+	~TQCanvasRectangleJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasRectangle_areaPoints(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPointArray(((TQCanvasRectangle*) QtSupport::getQt(env, obj))->areaPoints()), "org.kde.qt.TQPointArray", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQPointArray(((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->areaPoints()), "org.kde.qt.TTQPointArray", TRUE);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasRectangle_chunks(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQPointArray(((QCanvasRectangleJBridge*) QtSupport::getQt(env, obj))->protected_chunks()), "org.kde.qt.TQPointArray", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQPointArray(((TQCanvasRectangleJBridge*) QtSupport::getQt(env, obj))->protected_chunks()), "org.kde.qt.TTQPointArray", TRUE);
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QCanvasRectangle_collidesWith(JNIEnv* env, jobject obj, jobject arg1)
 {
-	jboolean xret = (jboolean) ((TQCanvasRectangle*) QtSupport::getQt(env, obj))->collidesWith((const TQCanvasItem*) QtSupport::getQt(env, arg1));
+	jboolean xret = (jboolean) ((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->collidesWith((const TTQCanvasItem*) QtSupport::getQt(env, arg1));
 	return xret;
 }
 
@@ -55,7 +55,7 @@ Java_org_kde_qt_QCanvasRectangle_dispose(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasRectangle_drawShape(JNIEnv* env, jobject obj, jobject arg1)
 {
-	((QCanvasRectangleJBridge*) QtSupport::getQt(env, obj))->protected_drawShape((TQPainter&)*(TQPainter*) QtSupport::getQt(env, arg1));
+	((TQCanvasRectangleJBridge*) QtSupport::getQt(env, obj))->protected_drawShape((TTQPainter&)*(TTQPainter*) QtSupport::getQt(env, arg1));
 	return;
 }
 
@@ -63,7 +63,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasRectangle_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQCanvasRectangle*)QtSupport::getQt(env, obj);
+		delete (TTQCanvasRectangle*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -72,7 +72,7 @@ Java_org_kde_qt_QCanvasRectangle_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasRectangle_height(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasRectangle*) QtSupport::getQt(env, obj))->height();
+	jint xret = (jint) ((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->height();
 	return xret;
 }
 
@@ -83,30 +83,30 @@ Java_org_kde_qt_QCanvasRectangle_isDisposed(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasRectangle_newQCanvasRectangle__IIIILorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jint x, jint y, jint width, jint height, jobject canvas)
+Java_org_kde_qt_QCanvasRectangle_newTQCanvasRectangle__IIIILorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jint x, jint y, jint width, jint height, jobject canvas)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasRectangleJBridge((int) x, (int) y, (int) width, (int) height, (TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasRectangleJBridge((int) x, (int) y, (int) width, (int) height, (TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasRectangle_newQCanvasRectangle__Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject canvas)
+Java_org_kde_qt_QCanvasRectangle_newTQCanvasRectangle__Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject canvas)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasRectangleJBridge((TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasRectangleJBridge((TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasRectangle_newQCanvasRectangle__Lorg_kde_qt_QRect_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject arg1, jobject canvas)
+Java_org_kde_qt_QCanvasRectangle_newTQCanvasRectangle__Lorg_kde_qt_QRect_2Lorg_kde_qt_QCanvas_2(JNIEnv* env, jobject obj, jobject arg1, jobject canvas)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasRectangleJBridge((const TQRect&)*(const TQRect*) QtSupport::getQt(env, arg1), (TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasRectangleJBridge((const TTQRect&)*(const TTQRect*) QtSupport::getQt(env, arg1), (TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -115,35 +115,35 @@ Java_org_kde_qt_QCanvasRectangle_newQCanvasRectangle__Lorg_kde_qt_QRect_2Lorg_kd
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasRectangle_rect(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQRect(((TQCanvasRectangle*) QtSupport::getQt(env, obj))->rect()), "org.kde.qt.TQRect", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQRect(((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->rect()), "org.kde.qt.TTQRect", TRUE);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasRectangle_rtti(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasRectangle*) QtSupport::getQt(env, obj))->rtti();
+	jint xret = (jint) ((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->rtti();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasRectangle_setSize(JNIEnv* env, jobject obj, jint w, jint h)
 {
-	((TQCanvasRectangle*) QtSupport::getQt(env, obj))->setSize((int) w, (int) h);
+	((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->setSize((int) w, (int) h);
 	return;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasRectangle_size(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQSize(((TQCanvasRectangle*) QtSupport::getQt(env, obj))->size()), "org.kde.qt.TQSize", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQSize(((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->size()), "org.kde.qt.TTQSize", TRUE);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasRectangle_width(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasRectangle*) QtSupport::getQt(env, obj))->width();
+	jint xret = (jint) ((TTQCanvasRectangle*) QtSupport::getQt(env, obj))->width();
 	return xret;
 }