1 files changed, 24 insertions, 24 deletions

diff --git a/qtjava/javalib/qtjava/QXmlReader.cpp b/qtjava/javalib/qtjava/QXmlReader.cpp
index 869df20e..1b90a8f8 100644
--- a/qtjava/javalib/qtjava/QXmlReader.cpp
+++ b/qtjava/javalib/qtjava/QXmlReader.cpp
@@ -3,57 +3,57 @@
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QXmlReader.h>
+#include <qtjava/TQXmlReader.h>
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_DTDHandler(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->DTDHandler(), "org.kde.qt.QXmlDTDHandlerInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->DTDHandler(), "org.kde.qt.TQXmlDTDHandlerInterface");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_contentHandler(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->contentHandler(), "org.kde.qt.QXmlContentHandlerInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->contentHandler(), "org.kde.qt.TQXmlContentHandlerInterface");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_declHandler(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->declHandler(), "org.kde.qt.QXmlDeclHandlerInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->declHandler(), "org.kde.qt.TQXmlDeclHandlerInterface");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_entityResolver(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->entityResolver(), "org.kde.qt.QXmlEntityResolverInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->entityResolver(), "org.kde.qt.TQXmlEntityResolverInterface");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_errorHandler(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->errorHandler(), "org.kde.qt.QXmlErrorHandlerInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->errorHandler(), "org.kde.qt.TQXmlErrorHandlerInterface");
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlReader_feature__Ljava_lang_String_2(JNIEnv* env, jobject obj, jstring name)
 {
-static TQString* _qstring_name = 0;
-	jboolean xret = (jboolean) ((TQXmlReader*) QtSupport::getQt(env, obj))->feature((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
+static TTQString* _qstring_name = 0;
+	jboolean xret = (jboolean) ((TTQXmlReader*) QtSupport::getQt(env, obj))->feature((const TTQString&)*(TTQString*) QtSupport::toTQString(env, name, &_qstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlReader_feature__Ljava_lang_String_2_3Z(JNIEnv* env, jobject obj, jstring name, jbooleanArray ok)
 {
-static TQString* _qstring_name = 0;
+static TTQString* _qstring_name = 0;
 	bool* _bool_ok = QtSupport::toBooleanPtr(env, ok);
-	jboolean xret = (jboolean) ((TQXmlReader*) QtSupport::getQt(env, obj))->feature((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name),  (bool*) _bool_ok);
+	jboolean xret = (jboolean) ((TTQXmlReader*) QtSupport::getQt(env, obj))->feature((const TTQString&)*(TTQString*) QtSupport::toTQString(env, name, &_qstring_name),  (bool*) _bool_ok);
 	env->SetBooleanArrayRegion(ok, 0, 1, (jboolean*) _bool_ok);
 	return xret;
 }
@@ -61,80 +61,80 @@ static TQString* _qstring_name = 0;
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlReader_hasFeature(JNIEnv* env, jobject obj, jstring name)
 {
-static TQString* _qstring_name = 0;
-	jboolean xret = (jboolean) ((TQXmlReader*) QtSupport::getQt(env, obj))->hasFeature((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
+static TTQString* _qstring_name = 0;
+	jboolean xret = (jboolean) ((TTQXmlReader*) QtSupport::getQt(env, obj))->hasFeature((const TTQString&)*(TTQString*) QtSupport::toTQString(env, name, &_qstring_name));
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlReader_hasProperty(JNIEnv* env, jobject obj, jstring name)
 {
-static TQString* _qstring_name = 0;
-	jboolean xret = (jboolean) ((TQXmlReader*) QtSupport::getQt(env, obj))->hasProperty((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name));
+static TTQString* _qstring_name = 0;
+	jboolean xret = (jboolean) ((TTQXmlReader*) QtSupport::getQt(env, obj))->hasProperty((const TTQString&)*(TTQString*) QtSupport::toTQString(env, name, &_qstring_name));
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QXmlReader_lexicalHandler(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQXmlReader*) QtSupport::getQt(env, obj))->lexicalHandler(), "org.kde.qt.QXmlLexicalHandlerInterface");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQXmlReader*) QtSupport::getQt(env, obj))->lexicalHandler(), "org.kde.qt.TQXmlLexicalHandlerInterface");
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QXmlReader_parse(JNIEnv* env, jobject obj, jobject input)
 {
-	jboolean xret = (jboolean) ((TQXmlReader*) QtSupport::getQt(env, obj))->parse((const TQXmlInputSource&)*(const TQXmlInputSource*) QtSupport::getQt(env, input));
+	jboolean xret = (jboolean) ((TTQXmlReader*) QtSupport::getQt(env, obj))->parse((const TTQXmlInputSource&)*(const TTQXmlInputSource*) QtSupport::getQt(env, input));
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setContentHandler(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setContentHandler((TQXmlContentHandler*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setContentHandler((TTQXmlContentHandler*) QtSupport::getQt(env, handler));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setDTDHandler(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setDTDHandler((TQXmlDTDHandler*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setDTDHandler((TTQXmlDTDHandler*) QtSupport::getQt(env, handler));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setDeclHandler(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setDeclHandler((TQXmlDeclHandler*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setDeclHandler((TTQXmlDeclHandler*) QtSupport::getQt(env, handler));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setEntityResolver(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setEntityResolver((TQXmlEntityResolver*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setEntityResolver((TTQXmlEntityResolver*) QtSupport::getQt(env, handler));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setErrorHandler(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setErrorHandler((TQXmlErrorHandler*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setErrorHandler((TTQXmlErrorHandler*) QtSupport::getQt(env, handler));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setFeature(JNIEnv* env, jobject obj, jstring name, jboolean value)
 {
-static TQString* _qstring_name = 0;
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setFeature((const TQString&)*(TQString*) QtSupport::toQString(env, name, &_qstring_name), (bool) value);
+static TTQString* _qstring_name = 0;
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setFeature((const TTQString&)*(TTQString*) QtSupport::toTQString(env, name, &_qstring_name), (bool) value);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QXmlReader_setLexicalHandler(JNIEnv* env, jobject obj, jobject handler)
 {
-	((TQXmlReader*) QtSupport::getQt(env, obj))->setLexicalHandler((TQXmlLexicalHandler*) QtSupport::getQt(env, handler));
+	((TTQXmlReader*) QtSupport::getQt(env, obj))->setLexicalHandler((TTQXmlLexicalHandler*) QtSupport::getQt(env, handler));
 	return;
 }