1 files changed, 36 insertions, 36 deletions

diff --git a/qtjava/javalib/qtjava/QCanvasSprite.cpp b/qtjava/javalib/qtjava/QCanvasSprite.cpp
index f557c126..28f8ef4c 100644
--- a/qtjava/javalib/qtjava/QCanvasSprite.cpp
+++ b/qtjava/javalib/qtjava/QCanvasSprite.cpp
@@ -4,51 +4,51 @@
 #include <tqpainter.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QCanvasSprite.h>
+#include <qtjava/TQCanvasSprite.h>
 
-class QCanvasSpriteJBridge : public QCanvasSprite
+class TQCanvasSpriteJBridge : public TQCanvasSprite
 {
 public:
-	QCanvasSpriteJBridge(TQCanvasPixmapArray* arg1,TQCanvas* arg2) : TQCanvasSprite(arg1,arg2) {};
+	TQCanvasSpriteJBridge(TTQCanvasPixmapArray* arg1,TTQCanvas* arg2) : TTQCanvasSprite(arg1,arg2) {};
 	void public_setFrameAnimation() {
-		TQCanvasSprite::setFrameAnimation();
+		TTQCanvasSprite::setFrameAnimation();
 		return;
 	}
-	~QCanvasSpriteJBridge() {QtSupport::qtKeyDeleted(this);}
+	~TQCanvasSpriteJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_advance(JNIEnv* env, jobject obj, jint stage)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->advance((int) stage);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->advance((int) stage);
 	return;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_bottomEdge__(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->bottomEdge();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->bottomEdge();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_bottomEdge__I(JNIEnv* env, jobject obj, jint ny)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->bottomEdge((int) ny);
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->bottomEdge((int) ny);
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasSprite_boundingRect(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQRect(((TQCanvasSprite*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TQRect", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQRect(((TTQCanvasSprite*) QtSupport::getQt(env, obj))->boundingRect()), "org.kde.qt.TTQRect", TRUE);
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QCanvasSprite_collidesWith(JNIEnv* env, jobject obj, jobject arg1)
 {
-	jboolean xret = (jboolean) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->collidesWith((const TQCanvasItem*) QtSupport::getQt(env, arg1));
+	jboolean xret = (jboolean) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->collidesWith((const TTQCanvasItem*) QtSupport::getQt(env, arg1));
 	return xret;
 }
 
@@ -62,7 +62,7 @@ Java_org_kde_qt_QCanvasSprite_dispose(JNIEnv* env, jobject obj)
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_draw(JNIEnv* env, jobject obj, jobject painter)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->draw((TQPainter&)*(TQPainter*) QtSupport::getQt(env, painter));
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->draw((TTQPainter&)*(TTQPainter*) QtSupport::getQt(env, painter));
 	return;
 }
 
@@ -70,7 +70,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQCanvasSprite*)QtSupport::getQt(env, obj);
+		delete (TTQCanvasSprite*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -79,42 +79,42 @@ Java_org_kde_qt_QCanvasSprite_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_frameCount(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->frameCount();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->frameCount();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_frame(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->frame();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->frame();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_height(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->height();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->height();
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasSprite_imageAdvanced(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQCanvasSprite*) QtSupport::getQt(env, obj))->imageAdvanced(), "org.kde.qt.TQCanvasPixmap");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQCanvasSprite*) QtSupport::getQt(env, obj))->imageAdvanced(), "org.kde.qt.TTQCanvasPixmap");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasSprite_image__(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQCanvasSprite*) QtSupport::getQt(env, obj))->image(), "org.kde.qt.TQCanvasPixmap");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQCanvasSprite*) QtSupport::getQt(env, obj))->image(), "org.kde.qt.TTQCanvasPixmap");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QCanvasSprite_image__I(JNIEnv* env, jobject obj, jint f)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQCanvasSprite*) QtSupport::getQt(env, obj))->image((int) f), "org.kde.qt.TQCanvasPixmap");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQCanvasSprite*) QtSupport::getQt(env, obj))->image((int) f), "org.kde.qt.TTQCanvasPixmap");
 	return xret;
 }
 
@@ -127,36 +127,36 @@ Java_org_kde_qt_QCanvasSprite_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_leftEdge__(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->leftEdge();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->leftEdge();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_leftEdge__I(JNIEnv* env, jobject obj, jint nx)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->leftEdge((int) nx);
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->leftEdge((int) nx);
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_move__DD(JNIEnv* env, jobject obj, jdouble x, jdouble y)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->move((double) x, (double) y);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->move((double) x, (double) y);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_move__DDI(JNIEnv* env, jobject obj, jdouble x, jdouble y, jint frame)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->move((double) x, (double) y, (int) frame);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->move((double) x, (double) y, (int) frame);
 	return;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCanvasSprite_newQCanvasSprite(JNIEnv* env, jobject obj, jobject array, jobject canvas)
+Java_org_kde_qt_QCanvasSprite_newTQCanvasSprite(JNIEnv* env, jobject obj, jobject array, jobject canvas)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QCanvasSpriteJBridge((TQCanvasPixmapArray*) QtSupport::getQt(env, array), (TQCanvas*) QtSupport::getQt(env, canvas)));
+		QtSupport::setQt(env, obj, new TQCanvasSpriteJBridge((TTQCanvasPixmapArray*) QtSupport::getQt(env, array), (TTQCanvas*) QtSupport::getQt(env, canvas)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -165,84 +165,84 @@ Java_org_kde_qt_QCanvasSprite_newQCanvasSprite(JNIEnv* env, jobject obj, jobject
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_rightEdge__(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->rightEdge();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->rightEdge();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_rightEdge__I(JNIEnv* env, jobject obj, jint nx)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->rightEdge((int) nx);
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->rightEdge((int) nx);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_rtti(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->rtti();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->rtti();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setFrameAnimation__(JNIEnv* env, jobject obj)
 {
-	((QCanvasSpriteJBridge*) QtSupport::getQt(env, obj))->public_setFrameAnimation();
+	((TQCanvasSpriteJBridge*) QtSupport::getQt(env, obj))->public_setFrameAnimation();
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setFrameAnimation__I(JNIEnv* env, jobject obj, jint arg1)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TQCanvasSprite::FrameAnimationType) arg1);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TTQCanvasSprite::FrameAnimationType) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setFrameAnimation__II(JNIEnv* env, jobject obj, jint arg1, jint step)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TQCanvasSprite::FrameAnimationType) arg1, (int) step);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TTQCanvasSprite::FrameAnimationType) arg1, (int) step);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setFrameAnimation__III(JNIEnv* env, jobject obj, jint arg1, jint step, jint state)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TQCanvasSprite::FrameAnimationType) arg1, (int) step, (int) state);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->setFrameAnimation((TTQCanvasSprite::FrameAnimationType) arg1, (int) step, (int) state);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setFrame(JNIEnv* env, jobject obj, jint arg1)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->setFrame((int) arg1);
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->setFrame((int) arg1);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QCanvasSprite_setSequence(JNIEnv* env, jobject obj, jobject seq)
 {
-	((TQCanvasSprite*) QtSupport::getQt(env, obj))->setSequence((TQCanvasPixmapArray*) QtSupport::getQt(env, seq));
+	((TTQCanvasSprite*) QtSupport::getQt(env, obj))->setSequence((TTQCanvasPixmapArray*) QtSupport::getQt(env, seq));
 	return;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_topEdge__(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->topEdge();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->topEdge();
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_topEdge__I(JNIEnv* env, jobject obj, jint ny)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->topEdge((int) ny);
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->topEdge((int) ny);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QCanvasSprite_width(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQCanvasSprite*) QtSupport::getQt(env, obj))->width();
+	jint xret = (jint) ((TTQCanvasSprite*) QtSupport::getQt(env, obj))->width();
 	return xret;
 }