Initial TQt conversion

1 files changed, 203 insertions, 203 deletions

diff --git a/qtjava/javalib/qtjava/QtSupport.cpp b/qtjava/javalib/qtjava/QtSupport.cpp
index 05116638..eb83f559 100644
--- a/qtjava/javalib/qtjava/QtSupport.cpp
+++ b/qtjava/javalib/qtjava/QtSupport.cpp
@@ -22,7 +22,7 @@
 #include <tqmetaobject.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QObject.h>
+#include <qtjava/TQObject.h>
 #include <qtjava/JavaSlot.h>
 
 static JavaVM *	_jvm;
@@ -47,7 +47,7 @@ QtSupport::registerJVM(JNIEnv * env)
 	// Test for the endianess of the unicode string returned by GetStringChars()
 	testString = env->NewStringUTF("A");
 	_jchar_str = env->GetStringChars(testString, 0);
-	TQString temp((TQChar*)_jchar_str, env->GetStringLength(testString));
+	TTQString temp((TTQChar*)_jchar_str, env->GetStringLength(testString));
 	env->ReleaseStringChars(testString, _jchar_str);
 	_bigEndianUnicode = strcmp((const char *) temp, "A") == 0;
 	env->DeleteLocalRef(testString);
@@ -65,66 +65,66 @@ QtSupport::GetEnv()
 }
 
 const char *
-QtSupport::eventTypeToEventClassName(TQEvent::Type eventType)
+QtSupport::eventTypeToEventClassName(TTQEvent::Type eventType)
 {
 	switch (eventType) {
-	case TQEvent::ChildInserted:
-	case TQEvent::ChildRemoved:
-		 return "org.kde.qt.TQChildEvent";
-	case TQEvent::Close:
-		 return "org.kde.qt.TQCloseEvent";
-	case TQEvent::ContextMenu:
-		 return "org.kde.qt.TQContextMenuEvent";
-	case TQEvent::User:
-		 return "org.kde.qt.TQCustomEvent";
-	case TQEvent::DragEnter:
-		 return "org.kde.qt.TQDragEnterEvent";
-	case TQEvent::DragLeave:
-		 return "org.kde.qt.TQDragLeaveEvent";
-	case TQEvent::DragMove:
-		 return "org.kde.qt.TQDragMoveEvent";
-	case TQEvent::DragResponse:
-		 return "org.kde.qt.TQDragResponseEvent";
-	case TQEvent::Drop:
-		 return "org.kde.qt.TQDropEvent";
-	case TQEvent::FocusIn:
-	case TQEvent::FocusOut:
-		 return "org.kde.qt.TQFocusEvent";
-	case TQEvent::Hide:
-		 return "org.kde.qt.TQHideEvent";
-	case TQEvent::KeyPress:
-	case TQEvent::KeyRelease:
-		 return "org.kde.qt.TQKeyEvent";
-	case TQEvent::IMStart:
-	case TQEvent::IMCompose:
-	case TQEvent::IMEnd:
-		 return "org.kde.qt.TQIMEvent";
-	case TQEvent::MouseButtonPress:
-	case TQEvent::MouseButtonRelease:
-	case TQEvent::MouseButtonDblClick:
-	case TQEvent::MouseMove:
-		 return "org.kde.qt.TQMouseEvent";
-	case TQEvent::Move:
-		 return "org.kde.qt.TQMoveEvent";
-	case TQEvent::Paint:
-		 return "org.kde.qt.TQPaintEvent";
-	case TQEvent::Resize:
-		 return "org.kde.qt.TQResizeEvent";
-	case TQEvent::Show:
-		 return "org.kde.qt.TQShowEvent";
-//	case TQEvent::Tablet:
-//		 return "org.kde.qt.TQTabletEvent";
-	case TQEvent::Timer:
-		 return "org.kde.qt.TQTimerEvent";
-	case TQEvent::Wheel:
-		 return "org.kde.qt.TQWheelEvent";
+	case TTQEvent::ChildInserted:
+	case TTQEvent::ChildRemoved:
+		 return "org.kde.qt.TTQChildEvent";
+	case TTQEvent::Close:
+		 return "org.kde.qt.TTQCloseEvent";
+	case TTQEvent::ContextMenu:
+		 return "org.kde.qt.TTQContextMenuEvent";
+	case TTQEvent::User:
+		 return "org.kde.qt.TTQCustomEvent";
+	case TTQEvent::DragEnter:
+		 return "org.kde.qt.TTQDragEnterEvent";
+	case TTQEvent::DragLeave:
+		 return "org.kde.qt.TTQDragLeaveEvent";
+	case TTQEvent::DragMove:
+		 return "org.kde.qt.TTQDragMoveEvent";
+	case TTQEvent::DragResponse:
+		 return "org.kde.qt.TTQDragResponseEvent";
+	case TTQEvent::Drop:
+		 return "org.kde.qt.TTQDropEvent";
+	case TTQEvent::FocusIn:
+	case TTQEvent::FocusOut:
+		 return "org.kde.qt.TTQFocusEvent";
+	case TTQEvent::Hide:
+		 return "org.kde.qt.TTQHideEvent";
+	case TTQEvent::KeyPress:
+	case TTQEvent::KeyRelease:
+		 return "org.kde.qt.TTQKeyEvent";
+	case TTQEvent::IMStart:
+	case TTQEvent::IMCompose:
+	case TTQEvent::IMEnd:
+		 return "org.kde.qt.TTQIMEvent";
+	case TTQEvent::MouseButtonPress:
+	case TTQEvent::MouseButtonRelease:
+	case TTQEvent::MouseButtonDblClick:
+	case TTQEvent::MouseMove:
+		 return "org.kde.qt.TTQMouseEvent";
+	case TTQEvent::Move:
+		 return "org.kde.qt.TTQMoveEvent";
+	case TTQEvent::Paint:
+		 return "org.kde.qt.TTQPaintEvent";
+	case TTQEvent::Resize:
+		 return "org.kde.qt.TTQResizeEvent";
+	case TTQEvent::Show:
+		 return "org.kde.qt.TTQShowEvent";
+//	case TTQEvent::Tablet:
+//		 return "org.kde.qt.TTQTabletEvent";
+	case TTQEvent::Timer:
+		 return "org.kde.qt.TTQTimerEvent";
+	case TTQEvent::Wheel:
+		 return "org.kde.qt.TTQWheelEvent";
 	default:
-		 return "org.kde.qt.TQEvent";
+		 return "org.kde.qt.TTQEvent";
 	}
 }
 
 bool
-QtSupport::eventFilterDelegate(TQObject * object, const char * objectType, TQObject * filteredObject, TQEvent * event)
+QtSupport::eventFilterDelegate(TTQObject * object, const char * objectType, TTQObject * filteredObject, TTQEvent * event)
 {
 	JNIEnv *	env;
 	jclass		cls;
@@ -150,7 +150,7 @@ QtSupport::eventFilterDelegate(TQObject * object, const char * objectType, TQObj
 		return FALSE;
 	}
 
-	objectTypeString = env->NewStringUTF("org.kde.qt.TQObject");
+	objectTypeString = env->NewStringUTF("org.kde.qt.TTQObject");
 	eventNameString = env->NewStringUTF(QtSupport::eventTypeToEventClassName(event->type()));
 	eventMethodString = env->NewStringUTF("eventFilter");
 	
@@ -170,7 +170,7 @@ QtSupport::eventFilterDelegate(TQObject * object, const char * objectType, TQObj
 }
 
 bool
-QtSupport::eventDelegate(TQObject * object, const char * eventType, void * event, const char * eventName)
+QtSupport::eventDelegate(TTQObject * object, const char * eventType, void * event, const char * eventName)
 {
 	JNIEnv *	env;
 	jclass		cls;
@@ -243,7 +243,7 @@ QtSupport::voidDelegate(void * object, const char * className, const char * meth
 }
 
 bool
-QtSupport::booleanDelegate(TQObject * object, const char * methodName)
+QtSupport::booleanDelegate(TTQObject * object, const char * methodName)
 {
 	JNIEnv *	env;
 	jclass		cls;
@@ -275,14 +275,14 @@ QtSupport::booleanDelegate(TQObject * object, const char * methodName)
 }
 
 int
-QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
+QtSupport::validateDelegate(TTQValidator * object, TTQString & input, int & pos)
 {
 	JNIEnv *	env;
 	jclass		cls;
 	jmethodID	mid;
 	jobject		validator;
 	jstring		inputString;
-	TQString *	inputPtr;
+	TTQString *	inputPtr;
 	jstring		resultString;
 	jobject		buffer;
 	jmethodID	bufferConstructor;
@@ -295,7 +295,7 @@ QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
 	env->PushLocalFrame(10);
 	
 	// Allocate a java StringBuffer to hold the input string
-	inputString = QtSupport::fromQString(env, (TQString *) &input);
+	inputString = QtSupport::fromTQString(env, (TTQString *) &input);
 	bufferClass = env->FindClass("java/lang/StringBuffer");
 	bufferConstructor = env->GetMethodID(bufferClass, "<init>", "(Ljava/lang/String;)V");
 	if (bufferConstructor == 0) {
@@ -307,7 +307,7 @@ QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
 	positionArray = QtSupport::fromIntPtr(env, &pos);
 
 	// Obtain the validate() method id, and call the method
-	validator = (jobject) QtSupport::objectForQtKey(env, object, "org.kde.qt.TQValidator");
+	validator = (jobject) QtSupport::objectForQtKey(env, object, "org.kde.qt.TTQValidator");
     cls = env->GetObjectClass(validator);
     if (cls == 0) {
     	return 0;
@@ -319,7 +319,7 @@ QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
 	}
 	result = (int) env->CallIntMethod(validator, mid, buffer, positionArray);
 
-	// Copy the java result string back into the 'input' QString
+	// Copy the java result string back into the 'input' TQString
 	bufferToString = env->GetMethodID(bufferClass, "toString", "()Ljava/lang/String;");
 	if (bufferToString == 0) {
 		env->PopLocalFrame(0);
@@ -327,7 +327,7 @@ QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
 	}
 	resultString = (jstring) env->CallObjectMethod(buffer, bufferToString);
 	inputPtr = &input;
-	QtSupport::toQString(env, resultString, &inputPtr);
+	QtSupport::toTQString(env, resultString, &inputPtr);
 
 	pos = *(QtSupport::toIntPtr(env, positionArray));
 	env->PopLocalFrame(0);
@@ -336,14 +336,14 @@ QtSupport::validateDelegate(TQValidator * object, TQString & input, int & pos)
 }
 
 void
-QtSupport::fixupDelegate(TQValidator * object, TQString & input)
+QtSupport::fixupDelegate(TTQValidator * object, TTQString & input)
 {
 	JNIEnv *	env;
 	jclass		cls;
 	jmethodID	mid;
 	jobject		fixer;
 	jstring		inputString;
-	TQString *	inputPtr;
+	TTQString *	inputPtr;
 	jstring		resultString;
 	jobject		buffer;
 	jmethodID	bufferConstructor;
@@ -354,7 +354,7 @@ QtSupport::fixupDelegate(TQValidator * object, TQString & input)
 	env->PushLocalFrame(10);
 
 	// Allocate a java StringBuffer to hold the input string
-	inputString = QtSupport::fromQString(env, (TQString *) &input);
+	inputString = QtSupport::fromTQString(env, (TTQString *) &input);
 	bufferClass = env->FindClass("java/lang/StringBuffer");
 	bufferConstructor = env->GetMethodID(bufferClass, "<init>", "(Ljava/lang/String;)V");
 	if (bufferConstructor == 0) {
@@ -363,7 +363,7 @@ QtSupport::fixupDelegate(TQValidator * object, TQString & input)
 	buffer = env->NewObject(bufferClass, bufferConstructor, inputString);
 
 	// Obtain the fixup() method id and call the method
-	fixer = (jobject) QtSupport::objectForQtKey(env, object, "org.kde.qt.TQValidator");
+	fixer = (jobject) QtSupport::objectForQtKey(env, object, "org.kde.qt.TTQValidator");
     cls = env->GetObjectClass(fixer);
     if (cls == 0) {
     	return;
@@ -374,7 +374,7 @@ QtSupport::fixupDelegate(TQValidator * object, TQString & input)
 	}
 	env->CallVoidMethod(fixer, mid, buffer);
 
-	// Copy the java result string back into the 'input' QString
+	// Copy the java result string back into the 'input' TQString
 	bufferToString = env->GetMethodID(bufferClass, "toString", "()Ljava/lang/String;");
 	if (bufferToString == 0) {
 		env->PopLocalFrame(0);
@@ -382,7 +382,7 @@ QtSupport::fixupDelegate(TQValidator * object, TQString & input)
 	}
 	resultString = (jstring) env->CallObjectMethod(buffer, bufferToString);
 	inputPtr = &input;
-	QtSupport::toQString(env, resultString, &inputPtr);
+	QtSupport::toTQString(env, resultString, &inputPtr);
 	env->PopLocalFrame(0);
 
 	return;
@@ -513,24 +513,24 @@ jboolean
 QtSupport::connect(JNIEnv * env, jobject sender, jstring signal, jobject receiver, jstring slot)
 {
 	JavaSlot *		javaSlot = QtSupport::slotForReceiver(env, receiver, slot);
-	TQMetaObject *	smeta = ((TQObject *) QtSupport::getQt(env, sender))->metaObject();
-	QString			qtSignalName(javaSlot->javaToQtSignalName(env, signal, smeta));
+	TTQMetaObject *	smeta = ((TTQObject *) QtSupport::getQt(env, sender))->metaObject();
+	TQString			qtSignalName(javaSlot->javaToQtSignalName(env, signal, smeta));
 
 	// Attempt to connect from the signal on the underlying C++ object first,
 	// otherwise assume that the connection is for a Java signal.
 	if (!qtSignalName.isEmpty()) {
-		TQMetaObject *	smetaTarget = ((TQObject *) QtSupport::getQt(env, receiver))->metaObject();
-		QString	qtTargetSignalName(javaSlot->javaToQtSignalName(env, slot, smetaTarget));
+		TTQMetaObject *	smetaTarget = ((TTQObject *) QtSupport::getQt(env, receiver))->metaObject();
+		TQString	qtTargetSignalName(javaSlot->javaToQtSignalName(env, slot, smetaTarget));
 
 		if (!qtTargetSignalName.isEmpty()) {
 			// The sender is a C++ signal, and the target is also a C++ signal
-			return (jboolean) TQObject::connect(	(TQObject*) QtSupport::getQt(env, sender),
+			return (jboolean) TTQObject::connect(	(TTQObject*) QtSupport::getQt(env, sender),
 												(const char *) qtSignalName,
-												(TQObject*) QtSupport::getQt(env, receiver),
+												(TTQObject*) QtSupport::getQt(env, receiver),
 												(const char *) qtTargetSignalName );
 		} else {
 			// The sender is a C++ signal, and the target is a java slot
-			return (jboolean) TQObject::connect(	(TQObject*) QtSupport::getQt(env, sender),
+			return (jboolean) TTQObject::connect(	(TTQObject*) QtSupport::getQt(env, sender),
 												(const char *) qtSignalName,
 												javaSlot,
 												javaSlot->javaToQtSlotName(env, slot, qtSignalName) );
@@ -538,7 +538,7 @@ QtSupport::connect(JNIEnv * env, jobject sender, jstring signal, jobject receive
 	} else {
 		// The sender is a java signal, and the target is either a java slot or a java signal
 		// Java signals are always of type jobjectArray
-		return (jboolean) TQObject::connect(	QtSupport::signalForSender(env, QtSupport::getQt(env, sender), signal),
+		return (jboolean) TTQObject::connect(	QtSupport::signalForSender(env, QtSupport::getQt(env, sender), signal),
 											"2signalJava(jobjectArray)",
 											javaSlot,
 											"1invoke(jobjectArray)" );
@@ -549,24 +549,24 @@ jboolean
 QtSupport::disconnect(JNIEnv * env, jobject sender, jstring signal, jobject receiver, jstring slot)
 {
 	JavaSlot *		javaSlot = QtSupport::slotForReceiver(env, receiver, slot);
-	TQMetaObject *	smeta = ((TQObject *) QtSupport::getQt(env, sender))->metaObject();
-	QString			qtSignalName(javaSlot->javaToQtSignalName(env, signal, smeta));
+	TTQMetaObject *	smeta = ((TTQObject *) QtSupport::getQt(env, sender))->metaObject();
+	TQString			qtSignalName(javaSlot->javaToQtSignalName(env, signal, smeta));
 
 	// Attempt to disconnect from the signal on the underlying C++ object first,
 	// otherwise assume that the connection is for a Java signal.
 	if (!qtSignalName.isEmpty()) {
-		TQMetaObject *	smetaTarget = ((TQObject *) QtSupport::getQt(env, receiver))->metaObject();
-		QString	qtTargetSignalName(javaSlot->javaToQtSignalName(env, slot, smetaTarget));
+		TTQMetaObject *	smetaTarget = ((TTQObject *) QtSupport::getQt(env, receiver))->metaObject();
+		TQString	qtTargetSignalName(javaSlot->javaToQtSignalName(env, slot, smetaTarget));
 
 		if (!qtTargetSignalName.isEmpty()) {
 			// The sender is a C++ signal, and the target is also a C++ signal
-			return (jboolean) TQObject::disconnect(	(TQObject*) QtSupport::getQt(env, sender),
+			return (jboolean) TTQObject::disconnect(	(TTQObject*) QtSupport::getQt(env, sender),
 													(const char *) qtSignalName,
-													(TQObject*) QtSupport::getQt(env, receiver),
+													(TTQObject*) QtSupport::getQt(env, receiver),
 													(const char *) qtTargetSignalName );
 		} else {
 			// The sender is a C++ signal, and the target is a java slot
-			return (jboolean) TQObject::disconnect(	(TQObject*) QtSupport::getQt(env, sender),
+			return (jboolean) TTQObject::disconnect(	(TTQObject*) QtSupport::getQt(env, sender),
 													(const char *) qtSignalName,
 													javaSlot,
 													javaSlot->javaToQtSlotName(env, slot, qtSignalName) );
@@ -574,7 +574,7 @@ QtSupport::disconnect(JNIEnv * env, jobject sender, jstring signal, jobject rece
 	} else {
 		// The sender is a java signal, and the target is either a java slot or a java signal
 		// Java signals are always of type jobjectArray
-		return (jboolean) TQObject::disconnect(	QtSupport::signalForSender(env, QtSupport::getQt(env, sender), signal),
+		return (jboolean) TTQObject::disconnect(	QtSupport::signalForSender(env, QtSupport::getQt(env, sender), signal),
 												"2signalJava(jobjectArray)",
 												javaSlot,
 												"1invoke(jobjectArray)" );
@@ -612,7 +612,7 @@ QtSupport::slotForReceiver(JNIEnv * env, jobject receiver, jstring slot)
 	jmethodID	mid;
 
 	cls = env->FindClass("org/kde/qt/qtjava");
-	mid = env->GetStaticMethodID(cls, "slotForReceiver", "(JLorg/kde/qt/QObject;Ljava/lang/String;)J");
+	mid = env->GetStaticMethodID(cls, "slotForReceiver", "(JLorg/kde/qt/TQObject;Ljava/lang/String;)J");
 	if (mid == 0) {
 		return 0;
 	}
@@ -622,7 +622,7 @@ QtSupport::slotForReceiver(JNIEnv * env, jobject receiver, jstring slot)
 	return result;
 }
 
-TQPaintDevice *
+TTQPaintDevice *
 QtSupport::paintDevice(JNIEnv * env, jobject obj)
 {
 	jclass		cls;
@@ -635,10 +635,10 @@ QtSupport::paintDevice(JNIEnv * env, jobject obj)
 	}
 
 	env->DeleteLocalRef(cls);
-	return (TQPaintDevice *) env->CallLongMethod(obj, mid);
+	return (TTQPaintDevice *) env->CallLongMethod(obj, mid);
 }
 
-TQMimeSource *
+TTQMimeSource *
 QtSupport::mimeSource(JNIEnv * env, jobject obj)
 {
 	jclass		cls;
@@ -651,7 +651,7 @@ QtSupport::mimeSource(JNIEnv * env, jobject obj)
 	}
 
 	env->DeleteLocalRef(cls);
-	return (TQMimeSource *) env->CallLongMethod(obj, mid);
+	return (TTQMimeSource *) env->CallLongMethod(obj, mid);
 }
 
 bool
@@ -749,7 +749,7 @@ QtSupport::fromShortPtr(JNIEnv * env, short * arg)
 }
 
 
-jobject QtSupport::fromQDateTime(JNIEnv * env, TQDateTime* qdate)
+jobject QtSupport::fromTQDateTime(JNIEnv * env, TTQDateTime* qdate)
 {
 	jclass 		cls;
 	jmethodID	cid;
@@ -775,7 +775,7 @@ jobject QtSupport::fromQDateTime(JNIEnv * env, TQDateTime* qdate)
 }
 
 jobject
-QtSupport::fromQDate(JNIEnv * env, TQDate* qdate)
+QtSupport::fromTQDate(JNIEnv * env, TTQDate* qdate)
 {
 	jclass 		cls;
 	jmethodID	cid;
@@ -799,7 +799,7 @@ QtSupport::fromQDate(JNIEnv * env, TQDate* qdate)
 }
 
 jobject
-QtSupport::fromQTime(JNIEnv * env, TQTime* qtime)
+QtSupport::fromTQTime(JNIEnv * env, TTQTime* qtime)
 {
 	jclass 		cls;
 	jmethodID	cid;
@@ -845,20 +845,20 @@ QtSupport::fromQTime(JNIEnv * env, TQTime* qtime)
 }
 
 
-TQDateTime *
-QtSupport::toQDateTime(JNIEnv * env, jobject jdate, TQDateTime** qdatetime)
+TTQDateTime *
+QtSupport::toTQDateTime(JNIEnv * env, jobject jdate, TTQDateTime** qdatetime)
 {
-static TQDate * qdate = 0;
-static TQTime * qtime = 0;
+static TTQDate * qdate = 0;
+static TTQTime * qtime = 0;
 
 	if (*qdatetime == 0) {
-		*qdatetime = new TQDateTime();
-		qdate = new TQDate();
-		qtime = new TQTime();
+		*qdatetime = new TTQDateTime();
+		qdate = new TTQDate();
+		qtime = new TTQTime();
 	}
 
-	QtSupport::toQDate(env, jdate, &qdate);
-	QtSupport::toQTime(env, jdate, &qtime);
+	QtSupport::toTQDate(env, jdate, &qdate);
+	QtSupport::toTQTime(env, jdate, &qtime);
 	(*qdatetime)->setDate(*qdate);
 	(*qdatetime)->setTime(*qtime);
 
@@ -869,8 +869,8 @@ static TQTime * qtime = 0;
 #define JAVA_YEAR 1
 #define JAVA_MONTH 2
 #define JAVA_DAY_OF_MONTH 5
-TQDate *
-QtSupport::toQDate(JNIEnv * env, jobject jdate, TQDate** qdate)
+TTQDate *
+QtSupport::toTQDate(JNIEnv * env, jobject jdate, TTQDate** qdate)
 {
 	jclass 		cls;
 	jmethodID	mid;
@@ -879,7 +879,7 @@ QtSupport::toQDate(JNIEnv * env, jobject jdate, TQDate** qdate)
 	jint		day;
 
 	if (*qdate == 0) {
-		*qdate = new TQDate();
+		*qdate = new TTQDate();
 	}
 
 	cls = env->FindClass("java/util/Calendar");
@@ -899,8 +899,8 @@ QtSupport::toQDate(JNIEnv * env, jobject jdate, TQDate** qdate)
 	return *qdate;
 }
 
-TQTime *
-QtSupport::toQTime(JNIEnv * env, jobject jtime, TQTime** qtime)
+TTQTime *
+QtSupport::toTQTime(JNIEnv * env, jobject jtime, TTQTime** qtime)
 {
 	jclass 		cls;
 	jmethodID	mid;
@@ -909,7 +909,7 @@ QtSupport::toQTime(JNIEnv * env, jobject jtime, TQTime** qtime)
 	jint		second;
 
 	if (*qtime == 0) {
-		*qtime = new TQTime();
+		*qtime = new TTQTime();
 	}
 
 	cls = env->FindClass("java/util/Date");
@@ -942,7 +942,7 @@ QtSupport::toQTime(JNIEnv * env, jobject jtime, TQTime** qtime)
 }
 
 jstring
-QtSupport::fromQString(JNIEnv * env, TQString * qstring)
+QtSupport::fromTQString(JNIEnv * env, TTQString * qstring)
 {
 	if (qstring == 0) {
 		return 0;
@@ -951,10 +951,10 @@ QtSupport::fromQString(JNIEnv * env, TQString * qstring)
 	if (_bigEndianUnicode) {
 		return env->NewString((const jchar *) qstring->unicode(), (long) qstring->length());
 	} else {
-static TQString *	temp = 0L;
+static TTQString *	temp = 0L;
 
 		if (temp == 0L) {
-			temp = new TQString();
+			temp = new TTQString();
 		}
 
 		// Hack to change the big endian unicode in 'qstring' to little endian in 'temp'.
@@ -964,7 +964,7 @@ static TQString *	temp = 0L;
 }
 
 jstring
-QtSupport::fromQCString(JNIEnv * env, TQCString * qcstring)
+QtSupport::fromTQCString(JNIEnv * env, TTQCString * qcstring)
 {
 	jstring result = 0;
 	jbyteArray bytes = 0;
@@ -1006,23 +1006,23 @@ QtSupport::fromCharString(JNIEnv * env, char * qcstring)
 	return result;
 }
 
-TQString *
-QtSupport::toQString(JNIEnv * env, jstring str, TQString ** qstring)
+TTQString *
+QtSupport::toTQString(JNIEnv * env, jstring str, TTQString ** qstring)
 {
 	const jchar *	_jchar_str;
 
 	if (str == 0L) {
-		return (TQString*) &TQString::null;
+		return (TTQString*) &TTQString::null;
 	}
 
 	if (*qstring == 0L) {
-		*qstring = new TQString();
+		*qstring = new TTQString();
 	}
 
 	_jchar_str = env->GetStringChars(str, 0);
 
 	if (_bigEndianUnicode) {
-		(*qstring)->setUnicode((TQChar *) _jchar_str, env->GetStringLength(str));
+		(*qstring)->setUnicode((TTQChar *) _jchar_str, env->GetStringLength(str));
 	} else {
 		(*qstring)->setUnicodeCodes((const ushort *) _jchar_str, env->GetStringLength(str));
 	}
@@ -1031,8 +1031,8 @@ QtSupport::toQString(JNIEnv * env, jstring str, TQString ** qstring)
 	return *qstring;
 }
 
-TQCString *
-QtSupport::toQCString(JNIEnv * env, jstring str, TQCString ** qcstring)
+TTQCString *
+QtSupport::toTQCString(JNIEnv * env, jstring str, TTQCString ** qcstring)
 {
 	jbyteArray	bytes = 0;
 	jthrowable	exc;
@@ -1054,7 +1054,7 @@ QtSupport::toQCString(JNIEnv * env, jstring str, TQCString ** qcstring)
 	len = env->GetArrayLength(bytes);
 
 	if (*qcstring == 0) {
-		*qcstring = new TQCString(len + 1);
+		*qcstring = new TTQCString(len + 1);
 	} else {
 		(*qcstring)->resize(len + 1);
 	}
@@ -1067,19 +1067,19 @@ QtSupport::toQCString(JNIEnv * env, jstring str, TQCString ** qcstring)
 }
 
 char *
-QtSupport::toCharString(JNIEnv * env, jstring str, TQCString ** qcstring)
+QtSupport::toCharString(JNIEnv * env, jstring str, TTQCString ** qcstring)
 {
 	if (str == 0) {
 		return 0;
 	}
 
-	(void) QtSupport::toQCString(env, str, qcstring);
+	(void) QtSupport::toTQCString(env, str, qcstring);
 	return (*qcstring)->data();
 }
 
 
 void
-QtSupport::fromQStringToStringBuffer(JNIEnv * env, TQString * qstring, jobject buffer)
+QtSupport::fromTQStringToStringBuffer(JNIEnv * env, TTQString * qstring, jobject buffer)
 {
 	jclass 		cls;
 	jmethodID	mid;
@@ -1106,13 +1106,13 @@ QtSupport::fromQStringToStringBuffer(JNIEnv * env, TQString * qstring, jobject b
 		return;
 	}
 	
-	(void) env->CallObjectMethod(buffer, appendMid, QtSupport::fromQString(env, qstring));
+	(void) env->CallObjectMethod(buffer, appendMid, QtSupport::fromTQString(env, qstring));
 	env->DeleteLocalRef(cls);
 	return;
 }
 
-TQString *
-QtSupport::toQStringFromStringBuffer(JNIEnv * env, jobject buffer, TQString ** qstring)
+TTQString *
+QtSupport::toTQStringFromStringBuffer(JNIEnv * env, jobject buffer, TTQString ** qstring)
 {
 	jclass 		cls;
 	jmethodID	mid;
@@ -1134,10 +1134,10 @@ QtSupport::toQStringFromStringBuffer(JNIEnv * env, jobject buffer, TQString ** q
 
 	str = (jstring) env->CallObjectMethod(buffer, mid);
 	env->DeleteLocalRef(cls);
-	return QtSupport::toQString(env, str, qstring);
+	return QtSupport::toTQString(env, str, qstring);
 }
 void
-QtSupport::fromQCStringToStringBuffer(JNIEnv * env, TQCString * qcstring, jobject buffer)
+QtSupport::fromTQCStringToStringBuffer(JNIEnv * env, TTQCString * qcstring, jobject buffer)
 {
 	jclass 		cls;
 	jmethodID	mid;
@@ -1164,20 +1164,20 @@ QtSupport::fromQCStringToStringBuffer(JNIEnv * env, TQCString * qcstring, jobjec
 		return;
 	}
 	
-	(void) env->CallObjectMethod(buffer, appendMid, QtSupport::fromQCString(env, qcstring));
+	(void) env->CallObjectMethod(buffer, appendMid, QtSupport::fromTQCString(env, qcstring));
 	env->DeleteLocalRef(cls);
 	return;
 }
 
 jchar
-QtSupport::fromQChar(JNIEnv * env, TQChar * qchar)
+QtSupport::fromTQChar(JNIEnv * env, TTQChar * qchar)
 {
 	(void) env;
 	return (jchar) qchar->unicode();
 }
 
-TQChar *
-QtSupport::toQChar(JNIEnv * env, jchar unichar, TQChar ** qchar)
+TTQChar *
+QtSupport::toTQChar(JNIEnv * env, jchar unichar, TTQChar ** qchar)
 {
 	(void) env;
 	
@@ -1185,12 +1185,12 @@ QtSupport::toQChar(JNIEnv * env, jchar unichar, TQChar ** qchar)
 		delete *qchar;
 	}
 
-	*qchar = new TQChar((ushort) unichar);
+	*qchar = new TTQChar((ushort) unichar);
 	return *qchar;
 }
 
 jbyteArray
-QtSupport::fromQByteArray(JNIEnv * env, TQByteArray * qbyteArray)
+QtSupport::fromTQByteArray(JNIEnv * env, TTQByteArray * qbyteArray)
 {
 	jbyteArray result = 0;
 	int len;
@@ -1201,8 +1201,8 @@ QtSupport::fromQByteArray(JNIEnv * env, TQByteArray * qbyteArray)
 	return result;
 }
 
-TQByteArray *
-QtSupport::toQByteArray(JNIEnv * env, jbyteArray bytes, TQByteArray ** qbyteArray)
+TTQByteArray *
+QtSupport::toTQByteArray(JNIEnv * env, jbyteArray bytes, TTQByteArray ** qbyteArray)
 {
 	if (bytes == 0) {
 		return 0;
@@ -1210,7 +1210,7 @@ QtSupport::toQByteArray(JNIEnv * env, jbyteArray bytes, TQByteArray ** qbyteArra
 
 	jsize len = env->GetArrayLength(bytes);
 	if (*qbyteArray == 0) {
-		*qbyteArray = new TQByteArray(len);
+		*qbyteArray = new TTQByteArray(len);
 	} else {
 		(*qbyteArray)->resize(len);
 	}
@@ -1221,7 +1221,7 @@ QtSupport::toQByteArray(JNIEnv * env, jbyteArray bytes, TQByteArray ** qbyteArra
 }
 	
 uchar *
-QtSupport::toUcharArray(JNIEnv * env, jcharArray bytes, TQByteArray ** qbyteArray)
+QtSupport::toUcharArray(JNIEnv * env, jcharArray bytes, TTQByteArray ** qbyteArray)
 {
 	uchar *				data;
 	unsigned short *	ptr;
@@ -1232,7 +1232,7 @@ QtSupport::toUcharArray(JNIEnv * env, jcharArray bytes, TQByteArray ** qbyteArra
 
 	jsize len = env->GetArrayLength(bytes);
 	if (*qbyteArray == 0) {
-		*qbyteArray = new TQByteArray(len*2);
+		*qbyteArray = new TTQByteArray(len*2);
 	} else {
 		(*qbyteArray)->resize(len*2);
 	}
@@ -1251,8 +1251,8 @@ QtSupport::toUcharArray(JNIEnv * env, jcharArray bytes, TQByteArray ** qbyteArra
 	return (uchar*) (*qbyteArray)->data();
 }
 
-TQValueList<int>
-QtSupport::toQIntValueList(JNIEnv * env, jintArray ints, TQValueList<int> ** qintArray)
+TTQValueList<int>
+QtSupport::toTQIntValueList(JNIEnv * env, jintArray ints, TTQValueList<int> ** qintArray)
 {
 	int		len;
 	jint *	carr;
@@ -1271,7 +1271,7 @@ QtSupport::toQIntValueList(JNIEnv * env, jintArray ints, TQValueList<int> ** qin
 }
 	
 jintArray
-QtSupport::fromQIntValueList(JNIEnv * env, TQValueList<int> * qintArray)
+QtSupport::fromTQIntValueList(JNIEnv * env, TTQValueList<int> * qintArray)
 {
 	jintArray result = 0;
 	int len;
@@ -1343,16 +1343,16 @@ QtSupport::toStringArray(JNIEnv * env, jobjectArray stringList)
 	return argv;
 }
 
-TQStrList *
-QtSupport::toQStrList(JNIEnv * env, jobjectArray stringList, TQStrList ** qstringList)
+TTQStrList *
+QtSupport::toTQStrList(JNIEnv * env, jobjectArray stringList, TTQStrList ** qstringList)
 {
 	int				length;
 	int				index;
 	jstring			jstr;
-static TQString * _qstring_temp = 0;
+static TTQString * _qstring_temp = 0;
 
 	if (*qstringList == 0) {
-		*qstringList = new TQStrList();
+		*qstringList = new TTQStrList();
 	}
 
 	(*qstringList)->clear();
@@ -1365,23 +1365,23 @@ static TQString * _qstring_temp = 0;
 
 	for (index = 0; index < length; index++) {
 		jstr = (jstring) env->GetObjectArrayElement(stringList, index);
-		(*qstringList)->append((TQString &) * (TQString *) QtSupport::toQString(env, jstr, &_qstring_temp));		
+		(*qstringList)->append((TTQString &) * (TTQString *) QtSupport::toTQString(env, jstr, &_qstring_temp));		
 		env->DeleteLocalRef(jstr);
 	}
 
 	return *qstringList;
 }
 
-TQStringList *
-QtSupport::toQStringList(JNIEnv * env, jobjectArray stringList, TQStringList ** qstringList)
+TTQStringList *
+QtSupport::toTQStringList(JNIEnv * env, jobjectArray stringList, TTQStringList ** qstringList)
 {
 	int				length;
 	int				index;
 	jstring			jstr;
-static TQString * _qstring_temp = 0;
+static TTQString * _qstring_temp = 0;
 
 	if (*qstringList == 0) {
-		*qstringList = new TQStringList();
+		*qstringList = new TTQStringList();
 	}
 	
 	(*qstringList)->clear();
@@ -1394,7 +1394,7 @@ static TQString * _qstring_temp = 0;
 
 	for (index = 0; index < length; index++) {
 		jstr = (jstring) env->GetObjectArrayElement(stringList, index);
-		(*qstringList)->append((TQString &) * (TQString *) QtSupport::toQString(env, jstr, &_qstring_temp));
+		(*qstringList)->append((TTQString &) * (TTQString *) QtSupport::toTQString(env, jstr, &_qstring_temp));
 		env->DeleteLocalRef(jstr);
 	}
 
@@ -1403,7 +1403,7 @@ static TQString * _qstring_temp = 0;
 
 
 jobject
-QtSupport::arrayWithQStrList(JNIEnv * env, TQStrList * qstrList, jobject stringArray)
+QtSupport::arrayWithTQStrList(JNIEnv * env, TTQStrList * qstrList, jobject stringArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1441,7 +1441,7 @@ QtSupport::arrayWithQStrList(JNIEnv * env, TQStrList * qstrList, jobject stringA
 }
 
 jobject
-QtSupport::arrayWithQStringList(JNIEnv * env, TQStringList * qstringList, jobject stringArray)
+QtSupport::arrayWithTQStringList(JNIEnv * env, TTQStringList * qstringList, jobject stringArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1464,10 +1464,10 @@ QtSupport::arrayWithQStringList(JNIEnv * env, TQStringList * qstringList, jobjec
 		return 0;
 	}
 
-	for (TQStringList::Iterator it = qstringList->begin(); it != qstringList->end(); ++it) {
+	for (TTQStringList::Iterator it = qstringList->begin(); it != qstringList->end(); ++it) {
 		if (! env->CallBooleanMethod(	stringArray,
 										addMid,
-										QtSupport::fromQString(env, (TQString *) &(*it)) ) )
+										QtSupport::fromTQString(env, (TTQString *) &(*it)) ) )
 		{
 			return 0;
 		}
@@ -1478,7 +1478,7 @@ QtSupport::arrayWithQStringList(JNIEnv * env, TQStringList * qstringList, jobjec
 }
 
 jobject
-QtSupport::arrayWithQWidgetList(JNIEnv * env, TQWidgetList * widgetList, jobject widgetArray)
+QtSupport::arrayWithTQWidgetList(JNIEnv * env, TTQWidgetList * widgetList, jobject widgetArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1502,10 +1502,10 @@ QtSupport::arrayWithQWidgetList(JNIEnv * env, TQWidgetList * widgetList, jobject
 	}
 
 	for (unsigned int index = 0; index < widgetList->count(); index++) {
-		TQWidget * currentWidget = (TQWidget *) widgetList->at(index);
+		TTQWidget * currentWidget = (TTQWidget *) widgetList->at(index);
 		if (! env->CallBooleanMethod(	widgetArray,
 										addMid,
-										QtSupport::objectForQtKey(env, currentWidget, "org.kde.qt.TQWidget") ) )
+										QtSupport::objectForQtKey(env, currentWidget, "org.kde.qt.TTQWidget") ) )
 		{
 			return 0;
 		}
@@ -1516,7 +1516,7 @@ QtSupport::arrayWithQWidgetList(JNIEnv * env, TQWidgetList * widgetList, jobject
 }
 
 jobject
-QtSupport::arrayWithQDomNodeList(JNIEnv * env, TQDomNodeList * domNodeList, jobject domNodeArray)
+QtSupport::arrayWithTQDomNodeList(JNIEnv * env, TTQDomNodeList * domNodeList, jobject domNodeArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1540,11 +1540,11 @@ QtSupport::arrayWithQDomNodeList(JNIEnv * env, TQDomNodeList * domNodeList, jobj
 	}
 
 	for (unsigned int index = 0; index < domNodeList->count(); index++) {
-		TQDomNode currentDomNode = (TQDomNode) domNodeList->item(index);
+		TTQDomNode currentDomNode = (TTQDomNode) domNodeList->item(index);
 
 		if (! env->CallBooleanMethod(	domNodeArray,
 										addMid,
-										QtSupport::objectForQtKey(env, &currentDomNode, "org.kde.qt.TQDomNode") ) )
+										QtSupport::objectForQtKey(env, &currentDomNode, "org.kde.qt.TTQDomNode") ) )
 		{
 			return 0;
 		}
@@ -1555,7 +1555,7 @@ QtSupport::arrayWithQDomNodeList(JNIEnv * env, TQDomNodeList * domNodeList, jobj
 }
 
 jobject
-QtSupport::arrayWithQObjectList(JNIEnv * env, TQObjectList * objectList, jobject objectArray)
+QtSupport::arrayWithTQObjectList(JNIEnv * env, TTQObjectList * objectList, jobject objectArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1579,11 +1579,11 @@ QtSupport::arrayWithQObjectList(JNIEnv * env, TQObjectList * objectList, jobject
 	}
 
 	for (unsigned int index = 0; index < objectList->count(); index++) {
-		TQObject * currentObject = (TQObject *) objectList->at(index);
+		TTQObject * currentObject = (TTQObject *) objectList->at(index);
 
 		if (! env->CallBooleanMethod(	objectArray,
 										addMid,
-										QtSupport::objectForQtKey(env, currentObject, "org.kde.qt.TQObject") ) )
+										QtSupport::objectForQtKey(env, currentObject, "org.kde.qt.TTQObject") ) )
 		{
 			return 0;
 		}
@@ -1594,7 +1594,7 @@ QtSupport::arrayWithQObjectList(JNIEnv * env, TQObjectList * objectList, jobject
 }
 
 jobject
-QtSupport::arrayWithQCanvasItemList(JNIEnv * env, TQCanvasItemList * itemList, jobject objectArray)
+QtSupport::arrayWithTQCanvasItemList(JNIEnv * env, TTQCanvasItemList * itemList, jobject objectArray)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1617,39 +1617,39 @@ QtSupport::arrayWithQCanvasItemList(JNIEnv * env, TQCanvasItemList * itemList, j
 		return 0;
 	}
 	
-	for (TQCanvasItemList::Iterator it = itemList->begin(); it != itemList->end(); ++it) {
+	for (TTQCanvasItemList::Iterator it = itemList->begin(); it != itemList->end(); ++it) {
 		const char * classString;
 
 		switch ((*it)->rtti()) {
-		case TQCanvasItem::Rtti_Item:
-			classString = "org.kde.qt.TQCanvasItem";
+		case TTQCanvasItem::Rtti_Item:
+			classString = "org.kde.qt.TTQCanvasItem";
 			break;
-		case TQCanvasItem::Rtti_Ellipse:
-			classString = "org.kde.qt.TQCanvasEllipse";
+		case TTQCanvasItem::Rtti_Ellipse:
+			classString = "org.kde.qt.TTQCanvasEllipse";
 			break;
-		case TQCanvasItem::Rtti_Line:
-			classString = "org.kde.qt.TQCanvasLine";
+		case TTQCanvasItem::Rtti_Line:
+			classString = "org.kde.qt.TTQCanvasLine";
 			break;
-		case TQCanvasItem::Rtti_Polygon:
-			classString = "org.kde.qt.TQCanvasPolygon";
+		case TTQCanvasItem::Rtti_Polygon:
+			classString = "org.kde.qt.TTQCanvasPolygon";
 			break;
-		case TQCanvasItem::Rtti_PolygonalItem:
-			classString = "org.kde.qt.TQCanvasPolygonalItem";
+		case TTQCanvasItem::Rtti_PolygonalItem:
+			classString = "org.kde.qt.TTQCanvasPolygonalItem";
 			break;
-		case TQCanvasItem::Rtti_Rectangle:
-			classString = "org.kde.qt.TQCanvasRectangle";
+		case TTQCanvasItem::Rtti_Rectangle:
+			classString = "org.kde.qt.TTQCanvasRectangle";
 			break;
-		case TQCanvasItem::Rtti_Spline:
-			classString = "org.kde.qt.TQCanvasSpline";
+		case TTQCanvasItem::Rtti_Spline:
+			classString = "org.kde.qt.TTQCanvasSpline";
 			break;
-		case TQCanvasItem::Rtti_Sprite:
-			classString = "org.kde.qt.TQCanvasSprite";
+		case TTQCanvasItem::Rtti_Sprite:
+			classString = "org.kde.qt.TTQCanvasSprite";
 			break;
-		case TQCanvasItem::Rtti_Text:
-			classString = "org.kde.qt.TQCanvasText";
+		case TTQCanvasItem::Rtti_Text:
+			classString = "org.kde.qt.TTQCanvasText";
 			break;
 		default:
-			classString = "org.kde.qt.TQCanvasItem";
+			classString = "org.kde.qt.TTQCanvasItem";
 			break;
 		}
 
@@ -1666,7 +1666,7 @@ QtSupport::arrayWithQCanvasItemList(JNIEnv * env, TQCanvasItemList * itemList, j
 }
 
 jobject
-QtSupport::arrayWithQListViewItemList(JNIEnv * env, TQListViewItemIterator * iterator, jobject arrayList)
+QtSupport::arrayWithTQListViewItemList(JNIEnv * env, TTQListViewItemIterator * iterator, jobject arrayList)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1691,10 +1691,10 @@ QtSupport::arrayWithQListViewItemList(JNIEnv * env, TQListViewItemIterator * ite
 	}
 	
 	for (	; iterator->current(); ++(*iterator)) {
-		TQListViewItem * currentItem =  iterator->current();
+		TTQListViewItem * currentItem =  iterator->current();
 		
-		/* rtti() is: 0 = TQListViewItem, 1 = TQCheckListItem */
-		className = (currentItem->rtti() == 1 ? "org.kde.qt.TQCheckListItem" : "org.kde.qt.TQListViewItem");
+		/* rtti() is: 0 = TTQListViewItem, 1 = TTQCheckListItem */
+		className = (currentItem->rtti() == 1 ? "org.kde.qt.TTQCheckListItem" : "org.kde.qt.TTQListViewItem");
 		if (! env->CallBooleanMethod(	arrayList,
 										addMid,
 										QtSupport::objectForQtKey(env, currentItem, className) ) )
@@ -1708,7 +1708,7 @@ QtSupport::arrayWithQListViewItemList(JNIEnv * env, TQListViewItemIterator * ite
 }
 
 jobject
-QtSupport::arrayWithQRectList(JNIEnv * env, TQMemArray<TQRect> * rectList, jobject arrayList)
+QtSupport::arrayWithTQRectList(JNIEnv * env, TTQMemArray<TTQRect> * rectList, jobject arrayList)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1732,12 +1732,12 @@ QtSupport::arrayWithQRectList(JNIEnv * env, TQMemArray<TQRect> * rectList, jobje
 	}
 
 	for (unsigned int index = 0; index < rectList->count(); index++) {
-		TQRect currentRect = (TQRect) rectList->at(index);
+		TTQRect currentRect = (TTQRect) rectList->at(index);
 		if (! env->CallBooleanMethod(	arrayList,
 										addMid,
 										QtSupport::objectForQtKey(	env,
-																	new TQRect(currentRect.topLeft(), currentRect.bottomRight()),
-																	"org.kde.qt.TQRect",
+																	new TTQRect(currentRect.topLeft(), currentRect.bottomRight()),
+																	"org.kde.qt.TTQRect",
 																	TRUE ) ) )
 		{
 			return 0;
@@ -1749,7 +1749,7 @@ QtSupport::arrayWithQRectList(JNIEnv * env, TQMemArray<TQRect> * rectList, jobje
 }
 
 jobject
-QtSupport::arrayWithQIconDragItemList(JNIEnv * env, TQValueList<TQIconDragItem> * dragItemList, jobject arrayList)
+QtSupport::arrayWithTQIconDragItemList(JNIEnv * env, TTQValueList<TTQIconDragItem> * dragItemList, jobject arrayList)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1772,11 +1772,11 @@ QtSupport::arrayWithQIconDragItemList(JNIEnv * env, TQValueList<TQIconDragItem>
 		return 0;
 	}
 
-	for (TQValueList<TQIconDragItem>::Iterator it = dragItemList->begin(); it != dragItemList->end(); ++it) {
-		TQIconDragItem currentItem = (TQIconDragItem) *it;
+	for (TTQValueList<TTQIconDragItem>::Iterator it = dragItemList->begin(); it != dragItemList->end(); ++it) {
+		TTQIconDragItem currentItem = (TTQIconDragItem) *it;
 		if (! env->CallBooleanMethod(	arrayList,
 										addMid,
-										QtSupport::objectForQtKey(env, &currentItem, "org.kde.qt.TQIconDragItem") ) )
+										QtSupport::objectForQtKey(env, &currentItem, "org.kde.qt.TTQIconDragItem") ) )
 		{
 			return 0;
 		}
@@ -1787,7 +1787,7 @@ QtSupport::arrayWithQIconDragItemList(JNIEnv * env, TQValueList<TQIconDragItem>
 }
 
 jobject
-QtSupport::arrayWithQUrlInfoList(JNIEnv * env, TQValueList<TQUrlInfo> * infoList, jobject arrayList)
+QtSupport::arrayWithTQUrlInfoList(JNIEnv * env, TTQValueList<TTQUrlInfo> * infoList, jobject arrayList)
 {
 	jclass			cls;
 	jmethodID		clearMid;
@@ -1810,11 +1810,11 @@ QtSupport::arrayWithQUrlInfoList(JNIEnv * env, TQValueList<TQUrlInfo> * infoList
 		return 0;
 	}
 
-	for (TQValueList<TQUrlInfo>::Iterator it = infoList->begin(); it != infoList->end(); ++it) {
-		TQUrlInfo currentItem = (TQUrlInfo) *it;
+	for (TTQValueList<TTQUrlInfo>::Iterator it = infoList->begin(); it != infoList->end(); ++it) {
+		TTQUrlInfo currentItem = (TTQUrlInfo) *it;
 		if (! env->CallBooleanMethod(	arrayList,
 										addMid,
-										QtSupport::objectForQtKey(env, &currentItem, "org.kde.qt.TQUrlInfo") ) )
+										QtSupport::objectForQtKey(env, &currentItem, "org.kde.qt.TTQUrlInfo") ) )
 		{
 			return 0;
 		}