1 files changed, 16 insertions, 16 deletions

diff --git a/qtjava/javalib/qtjava/QLibrary.cpp b/qtjava/javalib/qtjava/QLibrary.cpp
index cb060bc7..5101263c 100644
--- a/qtjava/javalib/qtjava/QLibrary.cpp
+++ b/qtjava/javalib/qtjava/QLibrary.cpp
@@ -3,19 +3,19 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QLibrary.h>
+#include <qtjava/TQLibrary.h>
 
-class QLibraryJBridge : public QLibrary
+class TQLibraryJBridge : public TQLibrary
 {
 public:
-	QLibraryJBridge(const TQString& arg1) : TQLibrary(arg1) {};
-	~QLibraryJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQLibraryJBridge(const TTQString& arg1) : TTQLibrary(arg1) {};
+	~TQLibraryJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QLibrary_autoUnload(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQLibrary*) QtSupport::getQt(env, obj))->autoUnload();
+	jboolean xret = (jboolean) ((TTQLibrary*) QtSupport::getQt(env, obj))->autoUnload();
 	return xret;
 }
 
@@ -30,7 +30,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QLibrary_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQLibrary*)QtSupport::getQt(env, obj);
+		delete (TTQLibrary*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -45,31 +45,31 @@ Java_org_kde_qt_QLibrary_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QLibrary_isLoaded(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQLibrary*) QtSupport::getQt(env, obj))->isLoaded();
+	jboolean xret = (jboolean) ((TTQLibrary*) QtSupport::getQt(env, obj))->isLoaded();
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QLibrary_library(JNIEnv* env, jobject obj)
 {
-	TQString  _qstring;
-	_qstring = ((TQLibrary*) QtSupport::getQt(env, obj))->library();
-	return QtSupport::fromQString(env, &_qstring);
+	TTQString  _qstring;
+	_qstring = ((TTQLibrary*) QtSupport::getQt(env, obj))->library();
+	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QLibrary_load(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQLibrary*) QtSupport::getQt(env, obj))->load();
+	jboolean xret = (jboolean) ((TTQLibrary*) QtSupport::getQt(env, obj))->load();
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QLibrary_newQLibrary(JNIEnv* env, jobject obj, jstring filename)
+Java_org_kde_qt_QLibrary_newTQLibrary(JNIEnv* env, jobject obj, jstring filename)
 {
-static TQString* _qstring_filename = 0;
+static TTQString* _qstring_filename = 0;
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QLibraryJBridge((const TQString&)*(TQString*) QtSupport::toQString(env, filename, &_qstring_filename)));
+		QtSupport::setQt(env, obj, new TQLibraryJBridge((const TTQString&)*(TTQString*) QtSupport::toTQString(env, filename, &_qstring_filename)));
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -78,14 +78,14 @@ static TQString* _qstring_filename = 0;
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QLibrary_setAutoUnload(JNIEnv* env, jobject obj, jboolean enable)
 {
-	((TQLibrary*) QtSupport::getQt(env, obj))->setAutoUnload((bool) enable);
+	((TTQLibrary*) QtSupport::getQt(env, obj))->setAutoUnload((bool) enable);
 	return;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QLibrary_unload(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQLibrary*) QtSupport::getQt(env, obj))->unload();
+	jboolean xret = (jboolean) ((TTQLibrary*) QtSupport::getQt(env, obj))->unload();
 	return xret;
 }