1 files changed, 36 insertions, 36 deletions

diff --git a/qtjava/javalib/qtjava/QJpUnicodeConv.cpp b/qtjava/javalib/qtjava/QJpUnicodeConv.cpp
index e297cada..56b9e7f2 100644
--- a/qtjava/javalib/qtjava/QJpUnicodeConv.cpp
+++ b/qtjava/javalib/qtjava/QJpUnicodeConv.cpp
@@ -2,26 +2,26 @@
 #include <tqjpunicode.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QJpUnicodeConv.h>
+#include <qtjava/TQJpUnicodeConv.h>
 
-class QJpUnicodeConvJBridge : public QJpUnicodeConv
+class TQJpUnicodeConvJBridge : public TQJpUnicodeConv
 {
 public:
-	QJpUnicodeConvJBridge(int arg1) : TQJpUnicodeConv(arg1) {};
-	~QJpUnicodeConvJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQJpUnicodeConvJBridge(int arg1) : TTQJpUnicodeConv(arg1) {};
+	~TQJpUnicodeConvJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_asciiToUnicode__I(JNIEnv* env, jobject obj, jint ascii)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->asciiToUnicode((uint) ascii);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->asciiToUnicode((uint) ascii);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_asciiToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->asciiToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->asciiToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
@@ -36,7 +36,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QJpUnicodeConv_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQJpUnicodeConv*)QtSupport::getQt(env, obj);
+		delete (TTQJpUnicodeConv*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -51,70 +51,70 @@ Java_org_kde_qt_QJpUnicodeConv_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201KanaToUnicode__I(JNIEnv* env, jobject obj, jint jis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201KanaToUnicode((uint) jis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201KanaToUnicode((uint) jis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201KanaToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201KanaToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201KanaToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201LatinToUnicode__I(JNIEnv* env, jobject obj, jint jis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201LatinToUnicode((uint) jis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201LatinToUnicode((uint) jis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201LatinToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201LatinToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201LatinToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201ToUnicode__I(JNIEnv* env, jobject obj, jint jis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201ToUnicode((uint) jis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201ToUnicode((uint) jis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0201ToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201ToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0201ToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0208ToUnicode__I(JNIEnv* env, jobject obj, jint jis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0208ToUnicode((uint) jis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0208ToUnicode((uint) jis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0208ToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0208ToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0208ToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0212ToUnicode__I(JNIEnv* env, jobject obj, jint jis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0212ToUnicode((uint) jis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0212ToUnicode((uint) jis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_jisx0212ToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0212ToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->jisx0212ToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
@@ -122,15 +122,15 @@ JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QJpUnicodeConv_newConverter(JNIEnv* env, jclass cls, jint rule)
 {
 	(void) cls;
-	jobject xret = QtSupport::objectForQtKey(env, (void*)QJpUnicodeConvJBridge::newConverter((int) rule), "org.kde.qt.TQJpUnicodeConv");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)TQJpUnicodeConvJBridge::newConverter((int) rule), "org.kde.qt.TTQJpUnicodeConv");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QJpUnicodeConv_newQJpUnicodeConv(JNIEnv* env, jobject obj, jint r)
+Java_org_kde_qt_QJpUnicodeConv_newTQJpUnicodeConv(JNIEnv* env, jobject obj, jint r)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QJpUnicodeConvJBridge((int) r));
+		QtSupport::setQt(env, obj, new TQJpUnicodeConvJBridge((int) r));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -139,112 +139,112 @@ Java_org_kde_qt_QJpUnicodeConv_newQJpUnicodeConv(JNIEnv* env, jobject obj, jint
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_sjisToUnicode__I(JNIEnv* env, jobject obj, jint sjis)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->sjisToUnicode((uint) sjis);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->sjisToUnicode((uint) sjis);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_sjisToUnicode__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->sjisToUnicode((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->sjisToUnicode((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToAscii__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToAscii((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToAscii((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToAscii__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToAscii((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToAscii((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201Kana__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Kana((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Kana((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201Kana__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Kana((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Kana((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201Latin__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Latin((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Latin((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201Latin__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Latin((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201Latin((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0201__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0201((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0208__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0208((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0208((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0208__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0208((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0208((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0212__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0212((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0212((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToJisx0212__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0212((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToJisx0212((uint) h, (uint) l);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToSjis__I(JNIEnv* env, jobject obj, jint unicode)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToSjis((uint) unicode);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToSjis((uint) unicode);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJpUnicodeConv_unicodeToSjis__II(JNIEnv* env, jobject obj, jint h, jint l)
 {
-	jint xret = (jint) ((TQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToSjis((uint) h, (uint) l);
+	jint xret = (jint) ((TTQJpUnicodeConv*) QtSupport::getQt(env, obj))->unicodeToSjis((uint) h, (uint) l);
 	return xret;
 }