1 files changed, 19 insertions, 19 deletions

diff --git a/qtjava/javalib/qtjava/QImageDecoder.cpp b/qtjava/javalib/qtjava/QImageDecoder.cpp
index 6bf772cc..2cbeed49 100644
--- a/qtjava/javalib/qtjava/QImageDecoder.cpp
+++ b/qtjava/javalib/qtjava/QImageDecoder.cpp
@@ -4,20 +4,20 @@
 #include <tqimage.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QImageDecoder.h>
+#include <qtjava/TQImageDecoder.h>
 
-class QImageDecoderJBridge : public QImageDecoder
+class TQImageDecoderJBridge : public TQImageDecoder
 {
 public:
-	QImageDecoderJBridge(TQImageConsumer* arg1) : TQImageDecoder(arg1) {};
-	~QImageDecoderJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQImageDecoderJBridge(TTQImageConsumer* arg1) : TTQImageDecoder(arg1) {};
+	~TQImageDecoderJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QImageDecoder_decode(JNIEnv* env, jobject obj, jcharArray buffer, jint length)
 {
-static TQByteArray* _qbytearray_buffer = 0;
-	jint xret = (jint) ((TQImageDecoder*) QtSupport::getQt(env, obj))->decode((const uchar*) QtSupport::toUcharArray(env, buffer, &_qbytearray_buffer), (int) length);
+static TTQByteArray* _qbytearray_buffer = 0;
+	jint xret = (jint) ((TTQImageDecoder*) QtSupport::getQt(env, obj))->decode((const uchar*) QtSupport::toUcharArray(env, buffer, &_qbytearray_buffer), (int) length);
 	return xret;
 }
 
@@ -32,7 +32,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QImageDecoder_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQImageDecoder*)QtSupport::getQt(env, obj);
+		delete (TTQImageDecoder*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -43,8 +43,8 @@ Java_org_kde_qt_QImageDecoder_formatName(JNIEnv* env, jclass cls, jcharArray buf
 {
 	const char* _qstring;
 	(void) cls;
-static TQByteArray* _qbytearray_buffer = 0;
-	_qstring = QImageDecoderJBridge::formatName((const uchar*) QtSupport::toUcharArray(env, buffer, &_qbytearray_buffer), (int) length);
+static TTQByteArray* _qbytearray_buffer = 0;
+	_qstring = TQImageDecoderJBridge::formatName((const uchar*) QtSupport::toUcharArray(env, buffer, &_qbytearray_buffer), (int) length);
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
@@ -52,25 +52,25 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QImageDecoder_format(JNIEnv* env, jclass cls, jstring name)
 {
 	(void) cls;
-static TQCString* _qstring_name = 0;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)QImageDecoderJBridge::format((const char*) QtSupport::toCharString(env, name, &_qstring_name)), "org.kde.qt.TQImageFormatType");
+static TTQCString* _qstring_name = 0;
+	jobject xret = QtSupport::objectForQtKey(env, (void*)TQImageDecoderJBridge::format((const char*) QtSupport::toCharString(env, name, &_qstring_name)), "org.kde.qt.TTQImageFormatType");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QImageDecoder_image(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)(TQImage *) &((TQImageDecoder*) QtSupport::getQt(env, obj))->image(), "org.kde.qt.TQImage");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)(TTQImage *) &((TTQImageDecoder*) QtSupport::getQt(env, obj))->image(), "org.kde.qt.TTQImage");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QImageDecoder_inputFormats(JNIEnv* env, jclass cls)
 {
-	TQStrList  _qlist;
+	TTQStrList  _qlist;
 	(void) cls;
-	_qlist = QImageDecoderJBridge::inputFormats();
-	return (jobject) QtSupport::arrayWithQStrList(env, (TQStrList*) &_qlist);
+	_qlist = TQImageDecoderJBridge::inputFormats();
+	return (jobject) QtSupport::arrayWithTQStrList(env, (TTQStrList*) &_qlist);
 }
 
 JNIEXPORT jboolean JNICALL
@@ -80,10 +80,10 @@ Java_org_kde_qt_QImageDecoder_isDisposed(JNIEnv* env, jobject obj)
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QImageDecoder_newQImageDecoder(JNIEnv* env, jobject obj, jobject c)
+Java_org_kde_qt_QImageDecoder_newTQImageDecoder(JNIEnv* env, jobject obj, jobject c)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QImageDecoderJBridge((TQImageConsumer*) QtSupport::getQt(env, c)));
+		QtSupport::setQt(env, obj, new TQImageDecoderJBridge((TTQImageConsumer*) QtSupport::getQt(env, c)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -93,7 +93,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QImageDecoder_registerDecoderFactory(JNIEnv* env, jclass cls, jobject arg1)
 {
 	(void) cls;
-	QImageDecoderJBridge::registerDecoderFactory((TQImageFormatType*) QtSupport::getQt(env, arg1));
+	TQImageDecoderJBridge::registerDecoderFactory((TTQImageFormatType*) QtSupport::getQt(env, arg1));
 	return;
 }
 
@@ -101,7 +101,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QImageDecoder_unregisterDecoderFactory(JNIEnv* env, jclass cls, jobject arg1)
 {
 	(void) cls;
-	QImageDecoderJBridge::unregisterDecoderFactory((TQImageFormatType*) QtSupport::getQt(env, arg1));
+	TQImageDecoderJBridge::unregisterDecoderFactory((TTQImageFormatType*) QtSupport::getQt(env, arg1));
 	return;
 }