1 files changed, 23 insertions, 23 deletions

diff --git a/qtjava/javalib/qtjava/QJisCodec.cpp b/qtjava/javalib/qtjava/QJisCodec.cpp
index b4cb7c84..a57e0914 100644
--- a/qtjava/javalib/qtjava/QJisCodec.cpp
+++ b/qtjava/javalib/qtjava/QJisCodec.cpp
@@ -4,13 +4,13 @@
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QJisCodec.h>
+#include <qtjava/TQJisCodec.h>
 
-class QJisCodecJBridge : public QJisCodec
+class TQJisCodecJBridge : public TQJisCodec
 {
 public:
-	QJisCodecJBridge() : TQJisCodec() {};
-	~QJisCodecJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQJisCodecJBridge() : TTQJisCodec() {};
+	~TQJisCodecJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT void JNICALL
@@ -24,7 +24,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QJisCodec_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQJisCodec*)QtSupport::getQt(env, obj);
+		delete (TTQJisCodec*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -33,27 +33,27 @@ Java_org_kde_qt_QJisCodec_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QJisCodec_fromUnicode(JNIEnv* env, jobject obj, jstring uc, jintArray lenInOut)
 {
-	TQCString  _qstring;
-static TQString* _qstring_uc = 0;
+	TTQCString  _qstring;
+static TTQString* _qstring_uc = 0;
 	int* _int_lenInOut = QtSupport::toIntPtr(env, lenInOut);
-	_qstring = ((TQJisCodec*) QtSupport::getQt(env, obj))->fromUnicode((const TQString&)*(TQString*) QtSupport::toQString(env, uc, &_qstring_uc),  (int&) *_int_lenInOut);
+	_qstring = ((TTQJisCodec*) QtSupport::getQt(env, obj))->fromUnicode((const TTQString&)*(TTQString*) QtSupport::toTQString(env, uc, &_qstring_uc),  (int&) *_int_lenInOut);
 	env->SetIntArrayRegion(lenInOut, 0, 1, (jint *) _int_lenInOut);
-	return QtSupport::fromQCString(env, &_qstring);
+	return QtSupport::fromTQCString(env, &_qstring);
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJisCodec_heuristicContentMatch(JNIEnv* env, jobject obj, jstring chars, jint len)
 {
-static TQCString* _qstring_chars = 0;
-	jint xret = (jint) ((TQJisCodec*) QtSupport::getQt(env, obj))->heuristicContentMatch((const char*) QtSupport::toCharString(env, chars, &_qstring_chars), (int) len);
+static TTQCString* _qstring_chars = 0;
+	jint xret = (jint) ((TTQJisCodec*) QtSupport::getQt(env, obj))->heuristicContentMatch((const char*) QtSupport::toCharString(env, chars, &_qstring_chars), (int) len);
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJisCodec_heuristicNameMatch(JNIEnv* env, jobject obj, jstring hint)
 {
-static TQCString* _qstring_hint = 0;
-	jint xret = (jint) ((TQJisCodec*) QtSupport::getQt(env, obj))->heuristicNameMatch((const char*) QtSupport::toCharString(env, hint, &_qstring_hint));
+static TTQCString* _qstring_hint = 0;
+	jint xret = (jint) ((TTQJisCodec*) QtSupport::getQt(env, obj))->heuristicNameMatch((const char*) QtSupport::toCharString(env, hint, &_qstring_hint));
 	return xret;
 }
 
@@ -66,14 +66,14 @@ Java_org_kde_qt_QJisCodec_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QJisCodec_makeDecoder(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQJisCodec*) QtSupport::getQt(env, obj))->makeDecoder(), "org.kde.qt.TQTextDecoder");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQJisCodec*) QtSupport::getQt(env, obj))->makeDecoder(), "org.kde.qt.TTQTextDecoder");
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QJisCodec_mibEnum(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQJisCodec*) QtSupport::getQt(env, obj))->mibEnum();
+	jint xret = (jint) ((TTQJisCodec*) QtSupport::getQt(env, obj))->mibEnum();
 	return xret;
 }
 
@@ -81,7 +81,7 @@ JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QJisCodec_mimeName(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((TQJisCodec*) QtSupport::getQt(env, obj))->mimeName();
+	_qstring = ((TTQJisCodec*) QtSupport::getQt(env, obj))->mimeName();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
@@ -89,15 +89,15 @@ JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QJisCodec_name(JNIEnv* env, jobject obj)
 {
 	const char* _qstring;
-	_qstring = ((TQJisCodec*) QtSupport::getQt(env, obj))->name();
+	_qstring = ((TTQJisCodec*) QtSupport::getQt(env, obj))->name();
 	return QtSupport::fromCharString(env, (char *) _qstring);
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QJisCodec_newQJisCodec(JNIEnv* env, jobject obj)
+Java_org_kde_qt_QJisCodec_newTQJisCodec(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QJisCodecJBridge());
+		QtSupport::setQt(env, obj, new TQJisCodecJBridge());
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -106,9 +106,9 @@ Java_org_kde_qt_QJisCodec_newQJisCodec(JNIEnv* env, jobject obj)
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QJisCodec_toUnicode(JNIEnv* env, jobject obj, jstring chars, jint len)
 {
-	TQString  _qstring;
-static TQCString* _qstring_chars = 0;
-	_qstring = ((TQJisCodec*) QtSupport::getQt(env, obj))->toUnicode((const char*) QtSupport::toCharString(env, chars, &_qstring_chars), (int) len);
-	return QtSupport::fromQString(env, &_qstring);
+	TTQString  _qstring;
+static TTQCString* _qstring_chars = 0;
+	_qstring = ((TTQJisCodec*) QtSupport::getQt(env, obj))->toUnicode((const char*) QtSupport::toCharString(env, chars, &_qstring_chars), (int) len);
+	return QtSupport::fromTQString(env, &_qstring);
 }