1 files changed, 33 insertions, 33 deletions

diff --git a/qtjava/javalib/qtjava/QMenuItem.cpp b/qtjava/javalib/qtjava/QMenuItem.cpp
index c2b46049..58f1278f 100644
--- a/qtjava/javalib/qtjava/QMenuItem.cpp
+++ b/qtjava/javalib/qtjava/QMenuItem.cpp
@@ -4,19 +4,19 @@
 #include <tqkeysequence.h>
 
 #include <qtjava/QtSupport.h>
-#include <qtjava/QMenuItem.h>
+#include <qtjava/TQMenuItem.h>
 
-class QMenuItemJBridge : public QMenuItem
+class TQMenuItemJBridge : public TQMenuItem
 {
 public:
-	QMenuItemJBridge() : TQMenuItem() {};
-	~QMenuItemJBridge() {QtSupport::qtKeyDeleted(this);}
+	TQMenuItemJBridge() : TTQMenuItem() {};
+	~TQMenuItemJBridge() {QtSupport::qtKeyDeleted(this);}
 };
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_custom(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->custom(), "org.kde.qt.TQCustomMenuItem");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->custom(), "org.kde.qt.TTQCustomMenuItem");
 	return xret;
 }
 
@@ -31,7 +31,7 @@ JNIEXPORT void JNICALL
 Java_org_kde_qt_QMenuItem_finalize(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::allocatedInJavaWorld(env, obj)) {
-		delete (TQMenuItem*)QtSupport::getQt(env, obj);
+		delete (TTQMenuItem*)QtSupport::getQt(env, obj);
 		QtSupport::setQt(env, obj, 0);
 	}
 	return;
@@ -40,28 +40,28 @@ Java_org_kde_qt_QMenuItem_finalize(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_iconSet(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->iconSet(), "org.kde.qt.TQIconSet");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->iconSet(), "org.kde.qt.TTQIconSet");
 	return xret;
 }
 
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QMenuItem_id(JNIEnv* env, jobject obj)
 {
-	jint xret = (jint) ((TQMenuItem*) QtSupport::getQt(env, obj))->id();
+	jint xret = (jint) ((TTQMenuItem*) QtSupport::getQt(env, obj))->id();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isChecked(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isChecked();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isChecked();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isDirty(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isDirty();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isDirty();
 	return xret;
 }
 
@@ -74,43 +74,43 @@ Java_org_kde_qt_QMenuItem_isDisposed(JNIEnv* env, jobject obj)
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isEnabledAndVisible(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isEnabledAndVisible();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isEnabledAndVisible();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isEnabled(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isEnabled();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isEnabled();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isSeparator(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isSeparator();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isSeparator();
 	return xret;
 }
 
 JNIEXPORT jboolean JNICALL
 Java_org_kde_qt_QMenuItem_isVisible(JNIEnv* env, jobject obj)
 {
-	jboolean xret = (jboolean) ((TQMenuItem*) QtSupport::getQt(env, obj))->isVisible();
+	jboolean xret = (jboolean) ((TTQMenuItem*) QtSupport::getQt(env, obj))->isVisible();
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_key(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)new TQKeySequence(((TQMenuItem*) QtSupport::getQt(env, obj))->key()), "org.kde.qt.TQKeySequence", TRUE);
+	jobject xret = QtSupport::objectForQtKey(env, (void*)new TTQKeySequence(((TTQMenuItem*) QtSupport::getQt(env, obj))->key()), "org.kde.qt.TTQKeySequence", TRUE);
 	return xret;
 }
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QMenuItem_newQMenuItem(JNIEnv* env, jobject obj)
+Java_org_kde_qt_QMenuItem_newTQMenuItem(JNIEnv* env, jobject obj)
 {
 	if (QtSupport::getQt(env, obj) == 0) {
-		QtSupport::setQt(env, obj, new QMenuItemJBridge());
+		QtSupport::setQt(env, obj, new TQMenuItemJBridge());
 		QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
 	}
 	return;
@@ -119,74 +119,74 @@ Java_org_kde_qt_QMenuItem_newQMenuItem(JNIEnv* env, jobject obj)
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_pixmap(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->pixmap(), "org.kde.qt.TQPixmap");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->pixmap(), "org.kde.qt.TTQPixmap");
 	return xret;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_popup(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->popup(), "org.kde.qt.TQPopupMenu");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->popup(), "org.kde.qt.TTQPopupMenu");
 	return xret;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QMenuItem_setDirty(JNIEnv* env, jobject obj, jboolean dirty)
 {
-	((TQMenuItem*) QtSupport::getQt(env, obj))->setDirty((bool) dirty);
+	((TTQMenuItem*) QtSupport::getQt(env, obj))->setDirty((bool) dirty);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QMenuItem_setText(JNIEnv* env, jobject obj, jstring text)
 {
-static TQString* _qstring_text = 0;
-	((TQMenuItem*) QtSupport::getQt(env, obj))->setText((const TQString&)*(TQString*) QtSupport::toQString(env, text, &_qstring_text));
+static TTQString* _qstring_text = 0;
+	((TTQMenuItem*) QtSupport::getQt(env, obj))->setText((const TTQString&)*(TTQString*) QtSupport::toTQString(env, text, &_qstring_text));
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QMenuItem_setVisible(JNIEnv* env, jobject obj, jboolean visible)
 {
-	((TQMenuItem*) QtSupport::getQt(env, obj))->setVisible((bool) visible);
+	((TTQMenuItem*) QtSupport::getQt(env, obj))->setVisible((bool) visible);
 	return;
 }
 
 JNIEXPORT void JNICALL
 Java_org_kde_qt_QMenuItem_setWhatsThis(JNIEnv* env, jobject obj, jstring text)
 {
-static TQString* _qstring_text = 0;
-	((TQMenuItem*) QtSupport::getQt(env, obj))->setWhatsThis((const TQString&)*(TQString*) QtSupport::toQString(env, text, &_qstring_text));
+static TTQString* _qstring_text = 0;
+	((TTQMenuItem*) QtSupport::getQt(env, obj))->setWhatsThis((const TTQString&)*(TTQString*) QtSupport::toTQString(env, text, &_qstring_text));
 	return;
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_signal(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->signal(), "org.kde.qt.TQSignal");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->signal(), "org.kde.qt.TTQSignal");
 	return xret;
 }
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QMenuItem_text(JNIEnv* env, jobject obj)
 {
-	TQString  _qstring;
-	_qstring = ((TQMenuItem*) QtSupport::getQt(env, obj))->text();
-	return QtSupport::fromQString(env, &_qstring);
+	TTQString  _qstring;
+	_qstring = ((TTQMenuItem*) QtSupport::getQt(env, obj))->text();
+	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jstring JNICALL
 Java_org_kde_qt_QMenuItem_whatsThis(JNIEnv* env, jobject obj)
 {
-	TQString  _qstring;
-	_qstring = ((TQMenuItem*) QtSupport::getQt(env, obj))->whatsThis();
-	return QtSupport::fromQString(env, &_qstring);
+	TTQString  _qstring;
+	_qstring = ((TTQMenuItem*) QtSupport::getQt(env, obj))->whatsThis();
+	return QtSupport::fromTQString(env, &_qstring);
 }
 
 JNIEXPORT jobject JNICALL
 Java_org_kde_qt_QMenuItem_widget(JNIEnv* env, jobject obj)
 {
-	jobject xret = QtSupport::objectForQtKey(env, (void*)((TQMenuItem*) QtSupport::getQt(env, obj))->widget(), "org.kde.qt.TQWidget");
+	jobject xret = QtSupport::objectForQtKey(env, (void*)((TTQMenuItem*) QtSupport::getQt(env, obj))->widget(), "org.kde.qt.TTQWidget");
 	return xret;
 }