diff options
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 896 |
1 files changed, 448 insertions, 448 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 65c6fa41..7dfae765 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -73,18 +73,18 @@ BEGIN # Mapping for iterproto, when making up the munged method names %mungedTypeMap = ( - 'QString' => '$', - 'QString*' => '$', - 'QString&' => '$', - 'QCString' => '$', - 'QCString*' => '$', - 'QCString&' => '$', - 'QByteArray' => '$', - 'QByteArray&' => '$', - 'QByteArray*' => '$', + 'TQString' => '$', + 'TQString*' => '$', + 'TQString&' => '$', + 'TQCString' => '$', + 'TQCString*' => '$', + 'TQCString&' => '$', + 'TQByteArray' => '$', + 'TQByteArray&' => '$', + 'TQByteArray*' => '$', 'char*' => '$', - 'QCOORD*' => '?', - 'QRgb*' => '?', + 'TQCOORD*' => '?', + 'TQRgb*' => '?', ); # Yes some of this is in kalyptusDataDict's ctypemap @@ -104,47 +104,47 @@ BEGIN 'unsigned long' => 'ulong', # Anything that is not known is mapped to void*, so no need for those here anymore -# 'QWSEvent*' => 'void*', -# 'QDiskFont*' => 'void*', +# 'TQWSEvent*' => 'void*', +# 'TQDiskFont*' => 'void*', # 'XEvent*' => 'void*', # 'FILE*' => 'void*', -# 'QUnknownInterface*' => 'void*', +# 'TQUnknownInterface*' => 'void*', # 'GDHandle' => 'void*', # '_NPStream*' => 'void*', -# 'QTextFormat*' => 'void*', -# 'QTextDocument*' => 'void*', -# 'QTextCursor*' => 'void*', -# 'QTextParag**' => 'void*', -# 'QTextParag*' => 'void*', -# 'QRemoteInterface*' => 'void*', -# 'QSqlRecordPrivate*' => 'void*', -# 'QTSMFI' => 'void*', # QTextStream's QTSManip +# 'TQTextFormat*' => 'void*', +# 'TQTextDocument*' => 'void*', +# 'TQTextCursor*' => 'void*', +# 'TQTextParag**' => 'void*', +# 'TQTextParag*' => 'void*', +# 'TQRemoteInterface*' => 'void*', +# 'TQSqlRecordPrivate*' => 'void*', +# 'TQTSMFI' => 'void*', # TQTextStream's TQTSManip # 'const GUID&' => 'void*', -# 'QWidgetMapper*' => 'void*', +# 'TQWidgetMapper*' => 'void*', # 'MSG*' => 'void*', -# 'const QSqlFieldInfoList&' => 'void*', # QSqlRecordInfo - TODO (templates) +# 'const TQSqlFieldInfoList&' => 'void*', # TQSqlRecordInfo - TODO (templates) - 'QStyleHintReturn*' => 'void*', - 'QPtrCollection::Item' => 'void*', # to avoid a warning + 'TQStyleHintReturn*' => 'void*', + 'TQPtrCollection::Item' => 'void*', # to avoid a warning 'mode_t' => 'long', - 'QProcess::PID' => 'long', - 'size_type' => 'int', # QSqlRecordInfo - 'Qt::ComparisonFlags' => 'uint', - 'Qt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it - 'QIODevice::Offset' => 'ulong', + 'TQProcess::PID' => 'long', + 'size_type' => 'int', # TQSqlRecordInfo + 'TQt::ComparisonFlags' => 'uint', + 'TQt::ToolBarDock' => 'int', # compat thing, Qt shouldn't use it + 'TQIODevice::Offset' => 'ulong', 'WState' => 'int', 'WId' => 'ulong', - 'QRgb' => 'uint', + 'TQRgb' => 'uint', 'ksocklen_t' => 'uint', - 'QCOORD' => 'int', - 'QTSMFI' => 'int', - 'Qt::WState' => 'int', - 'Qt::WFlags' => 'int', - 'Qt::HANDLE' => 'uint', - 'QEventLoop::ProcessEventsFlags' => 'uint', - 'QStyle::SCFlags' => 'int', - 'QStyle::SFlags' => 'int', + 'TQCOORD' => 'int', + 'TQTSMFI' => 'int', + 'TQt::WState' => 'int', + 'TQt::WFlags' => 'int', + 'TQt::HANDLE' => 'uint', + 'TQEventLoop::ProcessEventsFlags' => 'uint', + 'TQStyle::SCFlags' => 'int', + 'TQStyle::SFlags' => 'int', 'Q_INT16' => 'short', 'Q_INT32' => 'int', 'Q_INT64' => 'long', @@ -204,18 +204,18 @@ BEGIN %skippedJniMethods = ( - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication___3I_3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2I' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2Z' => 1, - 'Java_org_kde_qt_QApplication_newQApplication__I_3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication___3I_3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2I' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2Z' => 1, + 'Java_org_kde_qt_QApplication_newTQApplication__I_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QApplication_args__' => 1, - 'Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QPixmap_2' => 1, - 'Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QImage_2' => 1, + 'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2' => 1, + 'Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2' => 1, 'Java_org_kde_qt_QListView_itemList' => 1, 'Java_org_kde_qt_QListViewItem_itemList' => 1, 'Java_org_kde_qt_Qt_color0' => 1, @@ -321,36 +321,36 @@ EOF static jobjectArray _args = 0; JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2(JNIEnv *env, jobject obj, jobjectArray args) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args))); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2Z(JNIEnv *env, jobject obj, jobjectArray args, jboolean GUIenabled) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args), (bool) GUIenabled)); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args), (bool) GUIenabled)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QApplication_newQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1) +Java_org_kde_qt_QApplication_newTQApplication___3Ljava_lang_String_2I(JNIEnv *env, jobject obj, jobjectArray args, jint arg1) { int argc = (int) env->GetArrayLength(args) + 1; _args = (jobjectArray) env->NewGlobalRef(args); if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new QApplicationJBridge(argc, QtSupport::toArgv(env, args), (QApplication::Type) arg1)); + QtSupport::setQt(env, obj, new TQApplicationJBridge(argc, QtSupport::toArgv(env, args), (TQApplication::Type) arg1)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -367,39 +367,39 @@ Java_org_kde_qt_QApplication_args(JNIEnv *env, jobject obj) EOF $qbitmapExtras = <<EOF; - public QBitmap(QPixmap arg1) { + public TQBitmap(TQPixmap arg1) { super((Class) null); - newQBitmap(arg1); + newTQBitmap(arg1); } - private native void newQBitmap(QPixmap arg1); - public QBitmap(QImage arg1) { + private native void newTQBitmap(TQPixmap arg1); + public TQBitmap(TQImage arg1) { super((Class) null); - newQBitmap(arg1); + newTQBitmap(arg1); } - private native void newQBitmap(QImage arg1); + private native void newTQBitmap(TQImage arg1); EOF $qbitmapjniExtras = <<EOF; JNIEXPORT void JNICALL -Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1) +Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QPixmap_2(JNIEnv *env, jobject obj, jobject arg1) { if (QtSupport::getQt(env, obj) == 0) { - QBitmap temp; - temp = (QPixmap&) *(QPixmap *) QtSupport::getQt(env, arg1); - QtSupport::setQt(env, obj, new QBitmapJBridge(temp)); + TQBitmap temp; + temp = (TQPixmap&) *(TQPixmap *) QtSupport::getQt(env, arg1); + QtSupport::setQt(env, obj, new TQBitmapJBridge(temp)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; } JNIEXPORT void JNICALL -Java_org_kde_qt_QBitmap_newQBitmap__Lorg_kde_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1) +Java_org_kde_qt_QBitmap_newTQBitmap__Lorg_kde_qt_QImage_2(JNIEnv *env, jobject obj, jobject arg1) { if (QtSupport::getQt(env, obj) == 0) { - QBitmap temp; - temp = (QImage&) *(QImage *) QtSupport::getQt(env, arg1); - QtSupport::setQt(env, obj, new QBitmapJBridge(temp)); + TQBitmap temp; + temp = (TQImage&) *(TQImage *) QtSupport::getQt(env, arg1); + QtSupport::setQt(env, obj, new TQBitmapJBridge(temp)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -416,8 +416,8 @@ EOF JNIEXPORT jobject JNICALL Java_org_kde_qt_QListView_itemList(JNIEnv *env, jobject obj) { - QListViewItemIterator iterator((QListView*) QtSupport::getQt(env, obj)); - return QtSupport::arrayWithQListViewItemList(env, &iterator); + TQListViewItemIterator iterator((TQListView*) QtSupport::getQt(env, obj)); + return QtSupport::arrayWithTQListViewItemList(env, &iterator); } EOF @@ -430,8 +430,8 @@ EOF JNIEXPORT jobject JNICALL Java_org_kde_qt_QListViewItem_itemList(JNIEnv *env, jobject obj) { - QListViewItemIterator iterator((QListViewItem*) QtSupport::getQt(env, obj)); - return QtSupport::arrayWithQListViewItemList(env, &iterator); + TQListViewItemIterator iterator((TQListViewItem*) QtSupport::getQt(env, obj)); + return QtSupport::arrayWithTQListViewItemList(env, &iterator); } EOF @@ -463,48 +463,48 @@ EOF } } - public static native QColor color0(); - public static native QColor color1(); - public static native QColor black(); - public static native QColor white(); - public static native QColor darkGray(); - public static native QColor gray(); - public static native QColor lightGray(); - public static native QColor red(); - public static native QColor green(); - public static native QColor blue(); - public static native QColor cyan(); - public static native QColor magenta(); - public static native QColor yellow(); - public static native QColor darkRed(); - public static native QColor darkGreen(); - public static native QColor darkBlue(); - public static native QColor darkCyan(); - public static native QColor darkMagenta(); - public static native QColor darkYellow(); + public static native TQColor color0(); + public static native TQColor color1(); + public static native TQColor black(); + public static native TQColor white(); + public static native TQColor darkGray(); + public static native TQColor gray(); + public static native TQColor lightGray(); + public static native TQColor red(); + public static native TQColor green(); + public static native TQColor blue(); + public static native TQColor cyan(); + public static native TQColor magenta(); + public static native TQColor yellow(); + public static native TQColor darkRed(); + public static native TQColor darkGreen(); + public static native TQColor darkBlue(); + public static native TQColor darkCyan(); + public static native TQColor darkMagenta(); + public static native TQColor darkYellow(); // Global cursors - public static native QCursor arrowCursor(); // standard arrow cursor - public static native QCursor upArrowCursor(); // upwards arrow - public static native QCursor crossCursor(); // crosshair - public static native QCursor waitCursor(); // hourglass/watch - public static native QCursor ibeamCursor(); // ibeam/text entry - public static native QCursor sizeVerCursor(); // vertical resize - public static native QCursor sizeHorCursor(); // horizontal resize - public static native QCursor sizeBDiagCursor(); // diagonal resize (/) - public static native QCursor sizeFDiagCursor(); // diagonal resize (\) - public static native QCursor sizeAllCursor(); // all directions resize - public static native QCursor blankCursor(); // blank/invisible cursor - public static native QCursor splitVCursor(); // vertical bar with left-right + public static native TQCursor arrowCursor(); // standard arrow cursor + public static native TQCursor upArrowCursor(); // upwards arrow + public static native TQCursor crossCursor(); // crosshair + public static native TQCursor waitCursor(); // hourglass/watch + public static native TQCursor ibeamCursor(); // ibeam/text entry + public static native TQCursor sizeVerCursor(); // vertical resize + public static native TQCursor sizeHorCursor(); // horizontal resize + public static native TQCursor sizeBDiagCursor(); // diagonal resize (/) + public static native TQCursor sizeFDiagCursor(); // diagonal resize (\) + public static native TQCursor sizeAllCursor(); // all directions resize + public static native TQCursor blankCursor(); // blank/invisible cursor + public static native TQCursor splitVCursor(); // vertical bar with left-right // arrows - public static native QCursor splitHCursor(); // horizontal bar with up-down + public static native TQCursor splitHCursor(); // horizontal bar with up-down // arrows - public static native QCursor pointingHandCursor(); // pointing hand - public static native QCursor forbiddenCursor(); // forbidden cursor (slashed circle) - public static native QCursor whatsThisCursor(); // arrow with a question mark + public static native TQCursor pointingHandCursor(); // pointing hand + public static native TQCursor forbiddenCursor(); // forbidden cursor (slashed circle) + public static native TQCursor whatsThisCursor(); // arrow with a question mark - public static native QApplication qApp(); + public static native TQApplication qApp(); public static native void qDebug(String message); public static void qDebug(String pattern, Object[] arguments) { @@ -545,7 +545,7 @@ EOF return "1" + sqeezeOut(slot, ' '); } - /** Convert from a UTF-8 string to Unicode - the java equivalent to QString::fromUtf8() */ + /** Convert from a UTF-8 string to Unicode - the java equivalent to TQString::fromUtf8() */ public String fromUtf8(byte[] bytes) { String result = null; @@ -569,258 +569,258 @@ JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_color0(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::color0, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color0, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_color1(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::color1, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::color1, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_black(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::black, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::black, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_white(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::white, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::white, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkGray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkGray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_lightGray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::lightGray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::lightGray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_gray(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::gray, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::gray, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_red(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::red, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::red, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_green(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::green, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::green, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_blue(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::blue, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blue, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_cyan(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::cyan, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::cyan, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_magenta(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::magenta, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::magenta, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_yellow(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::yellow, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::yellow, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkRed(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkRed, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkRed, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkGreen(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkGreen, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkGreen, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkBlue(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkBlue, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkBlue, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkCyan(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkCyan, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkCyan, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkMagenta(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkMagenta, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkMagenta, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_darkYellow(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::darkYellow, "org.kde.qt.QColor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::darkYellow, "org.kde.qt.TQColor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_arrowCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::arrowCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::arrowCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_upArrowCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::upArrowCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::upArrowCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_crossCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::crossCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::crossCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_waitCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::waitCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::waitCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_ibeamCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::ibeamCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::ibeamCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeVerCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeVerCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeVerCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeHorCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeHorCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeHorCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeBDiagCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeBDiagCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeBDiagCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeFDiagCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeFDiagCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeFDiagCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_sizeAllCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::sizeAllCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::sizeAllCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_blankCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::blankCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::blankCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_splitVCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::splitVCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitVCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_splitHCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::splitHCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::splitHCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_pointingHandCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::pointingHandCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::pointingHandCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_forbiddenCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::forbiddenCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::forbiddenCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_whatsThisCursor(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, (void*)&Qt::whatsThisCursor, "org.kde.qt.QCursor"); + return (jobject) QtSupport::objectForQtKey(env, (void*)&TQt::whatsThisCursor, "org.kde.qt.TQCursor"); } JNIEXPORT jobject JNICALL Java_org_kde_qt_Qt_qApp(JNIEnv* env, jclass cls) { (void) cls; - return (jobject) QtSupport::objectForQtKey(env, qApp, "org.kde.qt.QApplication"); + return (jobject) QtSupport::objectForQtKey(env, qApp, "org.kde.qt.TQApplication"); } JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qDebug(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qDebug("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -829,7 +829,7 @@ static QCString * _qstring_message = 0; JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qWarning(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qWarning("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -838,7 +838,7 @@ static QCString * _qstring_message = 0; JNIEXPORT void JNICALL Java_org_kde_qt_Qt_qFatal(JNIEnv* env, jclass cls, jstring message) { -static QCString * _qstring_message = 0; +static TQCString * _qstring_message = 0; (void) cls; qFatal("%s", (const char *) QtSupport::toCharString(env, message, &_qstring_message)); return; @@ -1065,7 +1065,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QWidget_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice*)(QWidget*) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice*)(TQWidget*) QtSupport::getQt(env, obj); } EOF @@ -1075,8 +1075,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kde_qt_QImage_bits(JNIEnv *env, jobject obj) { static uchar * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->bits(); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes(); + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->bits(); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numBytes(); jbyteArray result = env->NewByteArray(len); env->SetByteArrayRegion(result, 0, len, (jbyte *) ptr); return result; @@ -1086,8 +1086,8 @@ JNIEXPORT jbyteArray JNICALL Java_org_kde_qt_QImage_scanLine(JNIEnv *env, jobject obj, jint arg1) { static uchar * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->scanLine(arg1); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes() / ((QImageJBridge*) QtSupport::getQt(env, obj))->height(); + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->scanLine(arg1); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numBytes() / ((TQImageJBridge*) QtSupport::getQt(env, obj))->height(); jbyteArray result = env->NewByteArray(len); env->SetByteArrayRegion(result, 0, len, (jbyte *) ptr); return result; @@ -1096,9 +1096,9 @@ static uchar * ptr = 0; JNIEXPORT jintArray JNICALL Java_org_kde_qt_QImage_colorTable(JNIEnv *env, jobject obj) { -static QRgb * ptr = 0; - ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->colorTable(); - int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numColors(); +static TQRgb * ptr = 0; + ptr = ((TQImageJBridge*) QtSupport::getQt(env, obj))->colorTable(); + int len = ((TQImageJBridge*) QtSupport::getQt(env, obj))->numColors(); jintArray result = env->NewIntArray(len); env->SetIntArrayRegion(result, 0, len, (jint *) ptr); return result; @@ -1118,14 +1118,14 @@ EOF JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPixmap_loadFromData___3C(JNIEnv *env, jobject obj, jcharArray data) { -static QByteArray * _qbyteArray_data = 0; - return (jboolean) ((QPixmapJBridge*) QtSupport::getQt(env, obj))->loadFromData((uchar *) QtSupport::toUcharArray(env, data, &_qbyteArray_data), env->GetArrayLength(data), 0, 0); +static TQByteArray * _qbyteArray_data = 0; + return (jboolean) ((TQPixmapJBridge*) QtSupport::getQt(env, obj))->loadFromData((uchar *) QtSupport::toUcharArray(env, data, &_qbyteArray_data), env->GetArrayLength(data), 0, 0); } JNIEXPORT jlong JNICALL Java_org_kde_qt_QPixmap_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice*)(QPixmap*) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice*)(TQPixmap*) QtSupport::getQt(env, obj); } EOF @@ -1140,7 +1140,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QPaintDevice_paintDevice(JNIEnv* env, jobject obj) { - return (jlong) (QPaintDevice *) QtSupport::getQt(env, obj); + return (jlong) (TQPaintDevice *) QtSupport::getQt(env, obj); } EOF @@ -1155,7 +1155,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QDragObject_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource*) (QDragObject*) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource*) (TQDragObject*) QtSupport::getQt(env, obj); } EOF @@ -1170,7 +1170,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QDropEvent_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource*) (QDropEvent*) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource*) (TQDropEvent*) QtSupport::getQt(env, obj); } EOF @@ -1185,7 +1185,7 @@ EOF JNIEXPORT jlong JNICALL Java_org_kde_qt_QMimeSource_mimeSource(JNIEnv* env, jobject obj) { - return (jlong) (QMimeSource *) QtSupport::getQt(env, obj); + return (jlong) (TQMimeSource *) QtSupport::getQt(env, obj); } EOF @@ -1241,7 +1241,7 @@ EOF public native boolean truncate( int pos); public native int begin(); public native int end(); - public native QPoint at(int index); + public native TQPoint at(int index); EOF @@ -1251,7 +1251,7 @@ Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jin { int argx; int argy; - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->point((uint) i, &argx, &argy); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->point((uint) i, &argx, &argy); env->SetIntArrayRegion(x, 0, 1, (jint *) &argx); env->SetIntArrayRegion(y, 0, 1, (jint *) &argy); return; @@ -1260,13 +1260,13 @@ Java_org_kde_qt_QPointArray_point__I_3I_3I(JNIEnv *env, jobject obj, jint i, jin JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, jshortArray points) { - if (!((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint)nPoints)) { + if (!((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint)nPoints)) { return JNI_FALSE; } short * shortArray = QtSupport::toShortPtr(env, points); for (int index = 0; index < nPoints; index++) { - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(index, shortArray[index * 2], shortArray[(index * 2) + 1]); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(index, shortArray[index * 2], shortArray[(index * 2) + 1]); } return JNI_TRUE; } @@ -1274,15 +1274,15 @@ Java_org_kde_qt_QPointArray_setPoints(JNIEnv *env, jobject obj, jint nPoints, js JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint index, jint nPoints, jshortArray points) { - if ( ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->size() < (uint) nPoints - && !((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) nPoints) ) + if ( ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size() < (uint) nPoints + && !((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) nPoints) ) { return JNI_FALSE; } short * shortArray = QtSupport::toShortPtr(env, points); for (int i = (int) index; nPoints > 0; i++, nPoints--) { - ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(i, shortArray[i * 2], shortArray[(i * 2) + 1]); + ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->setPoint(i, shortArray[i * 2], shortArray[(i * 2) + 1]); } return JNI_TRUE; } @@ -1290,43 +1290,43 @@ Java_org_kde_qt_QPointArray_putPoints__II_3S(JNIEnv *env, jobject obj, jint inde JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_size(JNIEnv* env, jobject obj) { - return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->size(); + return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->size(); } JNIEXPORT jint JNICALL Java_org_kde_qt_QPointArray_count(JNIEnv* env, jobject obj) { - return (jint) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->count(); + return (jint) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->count(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isEmpty(JNIEnv* env, jobject obj) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->isEmpty(); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isEmpty(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_isNull(JNIEnv* env, jobject obj) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->isNull(); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->isNull(); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_resize(JNIEnv* env, jobject obj, jint size) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) size); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->resize((uint) size); } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QPointArray_truncate(JNIEnv *env, jobject obj, jint pos) { - return (jboolean) ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos); + return (jboolean) ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->truncate((uint) pos); } JNIEXPORT jobject JNICALL Java_org_kde_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index) { - QPoint _p= ((QPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index); - return (jobject) QtSupport::objectForQtKey(env, (void *)new QPoint(_p.x(),_p.y()), "org.kde.qt.QPoint", TRUE); + TQPoint _p= ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index); + return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.kde.qt.TQPoint", TRUE); } EOF @@ -1356,7 +1356,7 @@ Java_org_kde_qt_QPopupMenu_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2L JNIEXPORT jint JNICALL Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QPopupMenu_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QPopupMenu_connectItem(env, obj, identifier, receiver, member); @@ -1386,7 +1386,7 @@ Java_org_kde_qt_QPopupMenu_connectItem(JNIEnv *env, jobject obj, jint identifier { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QPopupMenuJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQPopupMenuJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1401,7 +1401,7 @@ Java_org_kde_qt_QPopupMenu_disconnectItem(JNIEnv *env, jobject obj, jint identif { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QPopupMenuJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQPopupMenuJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1438,7 +1438,7 @@ Java_org_kde_qt_QMenuData_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lj JNIEXPORT jint JNICALL Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QMenuData_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QMenuData_connectItem(env, obj, identifier, receiver, member); @@ -1468,7 +1468,7 @@ Java_org_kde_qt_QMenuData_connectItem(JNIEnv *env, jobject obj, jint identifier, { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuDataJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQMenuDataJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1483,7 +1483,7 @@ Java_org_kde_qt_QMenuData_disconnectItem(JNIEnv *env, jobject obj, jint identifi { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuDataJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQMenuDataJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1520,7 +1520,7 @@ Java_org_kde_qt_QMenuBar_insertItem__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lja JNIEXPORT jint JNICALL Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2(JNIEnv *env, jobject obj, jobject icon, jstring text, jobject receiver, jstring member) { -static QString * _qstring_text = 0; +static TQString * _qstring_text = 0; jint identifier = Java_org_kde_qt_QMenuBar_insertItem__Lorg_kde_qt_QIconSet_2Ljava_lang_String_2II(env, obj, icon, text, -1, -1); Java_org_kde_qt_QMenuBar_connectItem(env, obj, identifier, receiver, member); @@ -1550,7 +1550,7 @@ Java_org_kde_qt_QMenuBar_connectItem(JNIEnv *env, jobject obj, jint identifier, { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuBarJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, + if ( ((TQMenuBarJBridge*) QtSupport::getQt(env, obj))->connectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1565,7 +1565,7 @@ Java_org_kde_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifie { JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - if ( ((QMenuBarJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, + if ( ((TQMenuBarJBridge*) QtSupport::getQt(env, obj))->disconnectItem( identifier, javaSlot, javaSlot->javaToQtSlotName(env, member) ) ) { @@ -1579,9 +1579,9 @@ Java_org_kde_qt_QMenuBar_disconnectItem(JNIEnv *env, jobject obj, jint identifie EOF $quridragExtras = <<EOF; - public static native boolean decode(QMimeSourceInterface e, ArrayList i); - public static native boolean decodeToUnicodeUris(QMimeSourceInterface e, ArrayList i); - public static native boolean decodeLocalFiles(QMimeSourceInterface e, ArrayList i); + public static native boolean decode(TQMimeSourceInterface e, ArrayList i); + public static native boolean decodeToUnicodeUris(TQMimeSourceInterface e, ArrayList i); + public static native boolean decodeLocalFiles(TQMimeSourceInterface e, ArrayList i); EOF @@ -1589,39 +1589,39 @@ EOF JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decode(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStrList * _qlist_i = 0; +static TQStrList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStrList(); + _qlist_i = new TQStrList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decode(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStrList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decode(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStrList(env, _qlist_i, i); return result; } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decodeToUnicodeUris(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStringList * _qlist_i = 0; +static TQStringList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStringList(); + _qlist_i = new TQStringList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decodeToUnicodeUris(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStringList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decodeToUnicodeUris(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStringList(env, _qlist_i, i); return result; } JNIEXPORT jboolean JNICALL Java_org_kde_qt_QUriDrag_decodeLocalFiles(JNIEnv *env, jclass cls, jobject e, jobject i) { -static QStringList * _qlist_i = 0; +static TQStringList * _qlist_i = 0; if (_qlist_i == 0) { - _qlist_i = new QStringList(); + _qlist_i = new TQStringList(); } (void) cls; - jboolean result = (jboolean) QUriDragJBridge::decodeLocalFiles(QtSupport::mimeSource(env, e), *_qlist_i); - QtSupport::arrayWithQStringList(env, _qlist_i, i); + jboolean result = (jboolean) TQUriDragJBridge::decodeLocalFiles(QtSupport::mimeSource(env, e), *_qlist_i); + QtSupport::arrayWithTQStringList(env, _qlist_i, i); return result; } @@ -1688,10 +1688,10 @@ JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version) { (void) cls; -static QCString* _qstring__appname = 0; -static QCString* _qstring_programName = 0; -static QCString* _qstring__description = 0; -static QCString* _qstring__version = 0; +static TQCString* _qstring__appname = 0; +static TQCString* _qstring_programName = 0; +static TQCString* _qstring__description = 0; +static TQCString* _qstring__version = 0; int argc = (int) env->GetArrayLength(args); KCmdLineArgsJBridge::init((int) argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version)); return; @@ -1701,10 +1701,10 @@ JNIEXPORT void JNICALL Java_org_kde_koala_KCmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp) { (void) cls; -static QCString* _qstring__appname = 0; -static QCString* _qstring_programName = 0; -static QCString* _qstring__description = 0; -static QCString* _qstring__version = 0; +static TQCString* _qstring__appname = 0; +static TQCString* _qstring_programName = 0; +static TQCString* _qstring__description = 0; +static TQCString* _qstring__version = 0; int argc = (int) env->GetArrayLength(args); KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noKApp); return; @@ -1736,8 +1736,8 @@ Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Lj { (void) cls; JavaSlot * javaSlot = QtSupport::slotForReceiver(env, receiver, member); - QString qtSignalName(javaSlot->javaToQtSignalName(env, signal, 0)); - jboolean xret = (jboolean) SchedulerJBridge::connect((const char*) qtSignalName, (const QObject*) javaSlot, javaSlot->javaToQtSlotName(env, member, qtSignalName)); + TQString qtSignalName(javaSlot->javaToQtSignalName(env, signal, 0)); + jboolean xret = (jboolean) SchedulerJBridge::connect((const char*) qtSignalName, (const TQObject*) javaSlot, javaSlot->javaToQtSlotName(env, member, qtSignalName)); return xret; } @@ -1796,9 +1796,9 @@ sub cplusplusToJava my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|QGfx|^Display\s*\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QIconDragItem>|QValueList<QCString>|QValueList<QVariant>|QValueList<QPixmap>|QValueListConstIterator<QString>|QMap|EditMode|QPtrList<QPixmap>|QPtrList<QPoint>|QTextFormat|QTextCursor|QTextDocument|QNetworkProtocolFactoryBase|QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldInfoList|QObjectUserData|QUObject|QTextParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ ) { + if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|TQGfx|^Display\s*\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type - } elsif ( $cplusplusType =~ /QSignal\s*\*|QMenuItem|QWSEvent|QWSDisplay|QWSSocket|QPaintDeviceX11Data|QWindowsMime|QDirectPainter|QMember|QDiskFont|QGCache|QRichText|QWSDecoration/ && $main::qt_embedded ) { + } elsif ( $cplusplusType =~ /TQSignal\s*\*|TQMenuItem|TQWSEvent|TQWSDisplay|TQWSSocket|TQPaintDeviceX11Data|TQWindowsMime|TQDirectPainter|TQMember|TQDiskFont|TQGCache|TQRichText|TQWSDecoration/ && $main::qt_embedded ) { return ""; # Unsupported Qt/E type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "boolean"; @@ -1817,7 +1817,7 @@ sub cplusplusToJava return "short[]"; } elsif ( $cplusplusType =~ /KCmdLineOptions/ ) { return "String[][]"; - } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /QStringList/|| $cplusplusType =~ /QStrList/) { + } elsif ( $cplusplusType =~ /char\s*\*\*/ || $cplusplusType =~ /TQStringList/|| $cplusplusType =~ /TQStrList/) { return "String[]"; } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QUrlInfoValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/ @@ -1835,25 +1835,25 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/ - || $cplusplusType =~ /QMemArray<QRect>/ - || $cplusplusType =~ /QArray<QRect>/ + || $cplusplusType =~ /TQMemArray<TQRect>/ + || $cplusplusType =~ /TQArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" } elsif ( $cplusplusType =~ /uchar\s*\*/ ) { return "char[]"; } elsif ( $cplusplusType =~ /QC?String/ and !$isConst ) { return "StringBuffer" - } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /QString/ || $cplusplusType =~ /QCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { + } elsif ( $cplusplusType =~ /(DOM::)?DOMString/ || $cplusplusType =~ /TQString/ || $cplusplusType =~ /TQCString/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /^(const )?char\s*\*/ ) { return "String" - } elsif ( $cplusplusType =~ /QChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { + } elsif ( $cplusplusType =~ /TQChar\s*[&\*]?/ || $cplusplusType =~ /^char$/ ) { return "char" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QTime\s*\*/ ) { return "Date" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDateTime\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDate\s*\*/ ) { return "Calendar" - } elsif ( $cplusplusType =~ /QPaintDevice/ ) { - return "QPaintDeviceInterface" - } elsif ( $cplusplusType =~ /QByteArray/ ) { + } elsif ( $cplusplusType =~ /TQPaintDevice/ ) { + return "TQPaintDeviceInterface" + } elsif ( $cplusplusType =~ /TQByteArray/ ) { return "byte[]" } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { if ( kalyptusDataDict::interfacemap($1) ne () ) { @@ -2028,7 +2028,7 @@ sub jniArgTocplusplus my $jniType = cplusplusToJNI( $cplusplusType ); if ( $javaType =~ /^Calendar$/ ) { - my $dateclass = $cplusplusType =~ /QDateTime/ ? "QDateTime" : "QDate"; + my $dateclass = $cplusplusType =~ /TQDateTime/ ? "TQDateTime" : "TQDate"; $jniLocal = "static $dateclass* _qdate_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) QtSupport::to$dateclass(env, $argName, &_qdate_$argName)"; @@ -2036,11 +2036,11 @@ sub jniArgTocplusplus $jniArg = "($cplusplusType)*($dateclass*) QtSupport::to$dateclass(env, $argName, &_qdate_$argName)"; } } elsif ( $javaType =~ /^Date$/ ) { - $jniLocal = "static QTime* _qtime_$argName = 0;\n"; + $jniLocal = "static TQTime* _qtime_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQTime(env, $argName, &_qtime_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQTime(env, $argName, &_qtime_$argName)"; } else { - $jniArg = "($cplusplusType)*(QTime*) QtSupport::toQTime(env, $argName, &_qtime_$argName)"; + $jniArg = "($cplusplusType)*(TQTime*) QtSupport::toTQTime(env, $argName, &_qtime_$argName)"; } } elsif ( $javaType =~ /ArrayList/ ) { if ( $cplusplusType =~ /KFileItemList/ ) { @@ -2048,14 +2048,14 @@ sub jniArgTocplusplus if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStrList*) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStrList*) KDESupport::toKFileItemList(env, $argName, &_qlist_$argName)"; } - } elsif ( $cplusplusType =~ /QCStringList/ ) { - $jniLocal ="static QCStringList* _qlist_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQCStringList/ ) { + $jniLocal ="static TQCStringList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QCStringList*) KDESupport::toQCStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQCStringList*) KDESupport::toTQCStringList(env, $argName, &_qlist_$argName)"; } } elsif ( $cplusplusType =~ /KURL::List/ ) { $jniLocal ="static KURL::List* _qlist_$argName = 0;\n"; @@ -2070,58 +2070,58 @@ sub jniArgTocplusplus $jniArg = "(KCmdLineOptions*) KDESupport::toKCmdLineOptions(env, $argName)"; } } elsif ( $javaType =~ /String\[\]/ ) { - if ( $cplusplusType =~ /QStringList/ ) { - $jniLocal ="static QStringList* _qlist_$argName = 0;\n"; + if ( $cplusplusType =~ /TQStringList/ ) { + $jniLocal ="static TQStringList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStringList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStringList*) QtSupport::toQStringList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStringList*) QtSupport::toTQStringList(env, $argName, &_qlist_$argName)"; } - } elsif ( $cplusplusType =~ /QStrList/ ) { - $jniLocal ="static QStrList* _qlist_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQStrList/ ) { + $jniLocal ="static TQStrList* _qlist_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStrList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStrList(env, $argName, &_qlist_$argName)"; } else { - $jniArg = "($cplusplusType)*(QStrList*) QtSupport::toQStrList(env, $argName, &_qlist_$argName)"; + $jniArg = "($cplusplusType)*(TQStrList*) QtSupport::toTQStrList(env, $argName, &_qlist_$argName)"; } } elsif ( $cplusplusType =~ /char\s*\*\*/ ) { $jniArg = "($cplusplusType) QtSupport::toStringArray(env, $argName)"; } } elsif ( $javaType =~ /StringBuffer/ ) { - if ( $cplusplusType =~ /QCString/ ) { - $jniLocal = "static QCString* _qcstring_$argName = 0;\n"; + if ( $cplusplusType =~ /TQCString/ ) { + $jniLocal = "static TQCString* _qcstring_$argName = 0;\n"; $jniLocal .= "\tif (_qcstring_$argName == 0) {\n"; - $jniLocal .= "\t\t_qcstring_$argName = new QCString();\n"; + $jniLocal .= "\t\t_qcstring_$argName = new TQCString();\n"; $jniLocal .= "\t}\n"; if ( $cplusplusType =~ /[\*]/ ) { $jniArg = "($cplusplusType) _qcstring_$argName"; } else { - $jniArg = "($cplusplusType)*(QCString*) _qcstring_$argName"; + $jniArg = "($cplusplusType)*(TQCString*) _qcstring_$argName"; } - $jniCleanup = "\tQtSupport::fromQCStringToStringBuffer(env, _qcstring_$argName, $argName);\n"; + $jniCleanup = "\tQtSupport::fromTQCStringToStringBuffer(env, _qcstring_$argName, $argName);\n"; } else { - $jniLocal ="static QString* _qstring_$argName = 0;\n"; + $jniLocal ="static TQString* _qstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QString*) QtSupport::toQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, $argName, &_qstring_$argName)"; } - $jniCleanup = "\tQtSupport::fromQStringToStringBuffer(env, _qstring_$argName, $argName);\n"; + $jniCleanup = "\tQtSupport::fromTQStringToStringBuffer(env, _qstring_$argName, $argName);\n"; } } elsif ( $javaType =~ /^String$/ ) { - if ( $cplusplusType =~ /QString/ ) { - $jniLocal ="static QString* _qstring_$argName = 0;\n"; + if ( $cplusplusType =~ /TQString/ ) { + $jniLocal ="static TQString* _qstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQString(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQString(env, $argName, &_qstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QString*) QtSupport::toQString(env, $argName, &_qstring_$argName)"; + $jniArg = "($cplusplusType)*(TQString*) QtSupport::toTQString(env, $argName, &_qstring_$argName)"; } - } elsif ( $cplusplusType =~ /QCString/ ) { - $jniLocal ="static QCString* _qcstring_$argName = 0;\n"; + } elsif ( $cplusplusType =~ /TQCString/ ) { + $jniLocal ="static TQCString* _qcstring_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQCString(env, $argName, &_qcstring_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQCString(env, $argName, &_qcstring_$argName)"; } else { - $jniArg = "($cplusplusType)*(QCString*) QtSupport::toQCString(env, $argName, &_qcstring_$argName)"; + $jniArg = "($cplusplusType)*(TQCString*) QtSupport::toTQCString(env, $argName, &_qcstring_$argName)"; } } elsif ( $cplusplusType =~ /DOMString/ ) { $jniLocal ="static DOM::DOMString* _domstring_$argName = 0;\n"; @@ -2131,7 +2131,7 @@ sub jniArgTocplusplus $jniArg = "(DOM::DOMString)*(DOM::DOMString*) KDESupport::toDOMString(env, $argName, &_domstring_$argName)"; } } else { - $jniLocal ="static QCString* _qstring_$argName = 0;\n"; + $jniLocal ="static TQCString* _qstring_$argName = 0;\n"; $jniArg = "($cplusplusType) ". ($cplusplusType =~ /[\&]/ ? "*(char*)" : "") . "QtSupport::toCharString(env, $argName, &_qstring_$argName)"; } } elsif ( $javaType =~ /boolean\[\]/ ) { @@ -2139,23 +2139,23 @@ sub jniArgTocplusplus $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_bool_$argName"; $jniCleanup = "\tenv->SetBooleanArrayRegion($argName, 0, 1, (jboolean*) _bool_$argName);\n"; } elsif ( $javaType =~ /char\[\]/ ) { - $jniLocal ="static QByteArray* _qbytearray_$argName = 0;\n"; + $jniLocal ="static TQByteArray* _qbytearray_$argName = 0;\n"; $jniArg = "($cplusplusType) QtSupport::toUcharArray(env, $argName, &_qbytearray_$argName)"; } elsif ( $javaType =~ /byte\[\]/ ) { - $jniLocal = "static QByteArray* _qbyteArray_$argName = 0;\n"; + $jniLocal = "static TQByteArray* _qbyteArray_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQByteArray(env, $argName, &_qbyteArray_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQByteArray(env, $argName, &_qbyteArray_$argName)"; } else { - $jniArg = "($cplusplusType)*(QByteArray*) QtSupport::toQByteArray(env, $argName, &_qbyteArray_$argName)"; + $jniArg = "($cplusplusType)*(TQByteArray*) QtSupport::toTQByteArray(env, $argName, &_qbyteArray_$argName)"; } } elsif ( $javaType =~ /short\[\]/ ) { $jniLocal ="\tshort* _short_$argName = QtSupport::toShortPtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_short_$argName"; $jniCleanup = "\tenv->SetShortArrayRegion($argName, 0, 1, (jshort*) _short_$argName);\n"; } elsif ( $javaType =~ /int\[\]/ ) { - if ( $cplusplusType =~ /QValueList/ ) { - $jniLocal = "static QValueList<int>* _qlist_$argName = 0;\n"; - $jniArg = "($cplusplusType) QtSupport::toQIntValueList(env, $argName, &_qlist_$argName)"; + if ( $cplusplusType =~ /TQValueList/ ) { + $jniLocal = "static TQValueList<int>* _qlist_$argName = 0;\n"; + $jniArg = "($cplusplusType) QtSupport::toTQIntValueList(env, $argName, &_qlist_$argName)"; } else { $jniLocal ="\tint* _int_$argName = QtSupport::toIntPtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_int_$argName"; @@ -2165,9 +2165,9 @@ sub jniArgTocplusplus $jniLocal ="\tdouble* _double_$argName = QtSupport::toDoublePtr(env, $argName);\n"; $jniArg = " ($cplusplusType) " . ($cplusplusType =~ /[\*]/ ? "" : "*") . "_double_$argName"; $jniCleanup = "\tenv->SetDoubleArrayRegion($argName, 0, 1, (jdouble*) _double_$argName);\n"; - } elsif ( $javaType =~ /^QPaintDeviceInterface$/ ) { + } elsif ( $javaType =~ /^TQPaintDeviceInterface$/ ) { $jniArg = "($cplusplusType) QtSupport::paintDevice(env, $argName)"; - } elsif ( $javaType =~ /^QMimeSourceInterface$/ ) { + } elsif ( $javaType =~ /^TQMimeSourceInterface$/ ) { $jniArg = "($cplusplusType) QtSupport::mimeSource(env, $argName)"; } elsif ( $javaType =~ /^[A-Z]/ ) { ( my $className = $cplusplusType ) =~ s/[&*]//g; @@ -2177,12 +2177,12 @@ sub jniArgTocplusplus } elsif ( $javaType =~ /^byte\s*/ ) { $jniArg = "($cplusplusType) $argName"; } elsif ( $javaType =~ /^char\s*/ ) { - if ( $cplusplusType =~ /QChar/ ) { - $jniLocal = "static QChar* _qchar_$argName = 0;\n"; + if ( $cplusplusType =~ /TQChar/ ) { + $jniLocal = "static TQChar* _qchar_$argName = 0;\n"; if ( $cplusplusType =~ /[\*]/ ) { - $jniArg = "($cplusplusType) QtSupport::toQChar(env, $argName, &_qchar_$argName)"; + $jniArg = "($cplusplusType) QtSupport::toTQChar(env, $argName, &_qchar_$argName)"; } else { - $jniArg = "($cplusplusType)*(QChar*) QtSupport::toQChar(env, $argName, &_qchar_$argName)"; + $jniArg = "($cplusplusType)*(TQChar*) QtSupport::toTQChar(env, $argName, &_qchar_$argName)"; } } else { $jniArg = "($cplusplusType) $argName"; @@ -2217,15 +2217,15 @@ sub jniToReturnValue($$$) $returnCall = "\t$functionCall;\n\treturn;\n"; $returnCall = "\t$functionCall;\n$jniCleanups\treturn;\n"; } elsif ( $javaType =~ /^Calendar$/ ) { - $cplusplusType =~ /(QDateTime|QDate)\s*(\*)?&?\s*$/; + $cplusplusType =~ /(TQDateTime|TQDate)\s*(\*)?&?\s*$/; $jniLocal = "\t$1 $2 _qdate;\n"; $returnCall = "\t_qdate = $functionCall;\n$jniCleanups"; $returnCall .= "\treturn (jobject) QtSupport::from$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qdate);\n"; } elsif ( $javaType =~ /^Date$/ ) { - $cplusplusType =~ /(QTime)\s*(\*)?&?\s*$/; + $cplusplusType =~ /(TQTime)\s*(\*)?&?\s*$/; $jniLocal = "\t$1 $2 _qtime;\n"; $returnCall = "\t_qtime = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn (jobject) QtSupport::fromQTime(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qtime);\n"; + $returnCall .= "\treturn (jobject) QtSupport::fromTQTime(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qtime);\n"; } elsif ( $javaType =~ /ArrayList/ || $javaType =~ /String\[\]/ ) { if ( $cplusplusType !~ /\*/ ) { $const = ""; @@ -2233,34 +2233,34 @@ sub jniToReturnValue($$$) $cplusplusType =~ /(const )?([^\&]*)(\*)?&?/; $jniLocal = "\t$const$2 $3 _qlist;\n"; $returnCall = "\t_qlist = $functionCall;\n$jniCleanups"; - if ( $cplusplusType =~ /(QStrList|QStringList|QCanvasItemList|QWidgetList|QDomNodeList|QObjectList)\s*([\*\&])?\s*$/ ) { + if ( $cplusplusType =~ /(TQStrList|TQStringList|TQCanvasItemList|TQWidgetList|TQDomNodeList|TQObjectList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) QtSupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /DOM::(NodeList|StyleSheetList|MediaList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, (DOM::$1 *) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /(QCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) { + } elsif ( $cplusplusType =~ /(TQCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /(KTrader::OfferList)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithOfferList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; } elsif ( $cplusplusType =~ /(KURL::List)\s*([\*\&])?\s*$/ ) { $returnCall .= "\treturn (jobject) KDESupport::arrayWithKURLList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QValueList<QIconDragItem>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQIconDragItemList(env, (QValueList<QIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QMemArray<QRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQRectList(env, (QMemArray<QRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; - } elsif ( $cplusplusType =~ /QArray<QRect>\s*([\*\&])?\s*$/ ) { - $returnCall .= "\treturn (jobject) QtSupport::arrayWithQRectList(env, (QArray<QRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; + } elsif ( $cplusplusType =~ /TQValueList<TQIconDragItem>\s*([\*\&])?\s*$/ ) { + $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQIconDragItemList(env, (TQValueList<TQIconDragItem>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; + } elsif ( $cplusplusType =~ /TQMemArray<TQRect>\s*([\*\&])?\s*$/ ) { + $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQMemArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; + } elsif ( $cplusplusType =~ /TQArray<TQRect>\s*([\*\&])?\s*$/ ) { + $returnCall .= "\treturn (jobject) QtSupport::arrayWithTQRectList(env, (TQArray<TQRect>*) " . ($1 eq "\*" ? "" : "&") . "_qlist);\n"; } } elsif ( $javaType =~ /String\[\]/ ) { ; # Do nothing, string arrays are ArrayLists as return values } elsif ( $javaType =~ /String/ || $javaType =~ /StringBuffer/ ) { - if ( $cplusplusType =~ /QString(\s*\*)?/ ) { - $jniLocal = "\tQString $1 _qstring;\n"; + if ( $cplusplusType =~ /TQString(\s*\*)?/ ) { + $jniLocal = "\tTQString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; - } elsif ($cplusplusType =~ /QCString(\s*\*)?/) { - $jniLocal = "\tQCString $1 _qstring;\n"; + $returnCall .= "\treturn QtSupport::fromTQString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; + } elsif ($cplusplusType =~ /TQCString(\s*\*)?/) { + $jniLocal = "\tTQCString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQCString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; + $returnCall .= "\treturn QtSupport::fromTQCString(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qstring);\n"; } elsif ($cplusplusType =~ /DOM::DOMString(\s*\*)?/) { $jniLocal = "\tDOM::DOMString $1 _qstring;\n"; $returnCall = "\t_qstring = $functionCall;\n$jniCleanups"; @@ -2277,20 +2277,20 @@ sub jniToReturnValue($$$) } elsif ( $javaType =~ /char\[\]/ ) { ; } elsif ( $javaType =~ /byte\[\]/ ) { - $jniLocal = "\tQByteArray " . ($cplusplusType =~ /\*/ ? "*" : "") . "_qbyteArray;\n"; + $jniLocal = "\tTQByteArray " . ($cplusplusType =~ /\*/ ? "*" : "") . "_qbyteArray;\n"; $returnCall = "\t_qbyteArray = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQByteArray(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qbyteArray);\n"; + $returnCall .= "\treturn QtSupport::fromTQByteArray(env, " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qbyteArray);\n"; } elsif ( $javaType =~ /short\[\]/ ) { ; } elsif ( $javaType =~ /int\[\]/ && $cplusplusType !~ /\&/ ) { - if ( $cplusplusType =~ /(int\*|QRgb\*)/ ) { + if ( $cplusplusType =~ /(int\*|TQRgb\*)/ ) { $jniLocal = "\t$1 _qint;\n"; $returnCall = "\t_qint = $functionCall;\n$jniCleanups"; $returnCall .= "\treturn QtSupport::fromIntPtr(env, (int*)_qint);\n"; } else { - $jniLocal = "\tQValueList<int> _qintArray;\n"; + $jniLocal = "\tTQValueList<int> _qintArray;\n"; $returnCall = "\t_qintArray = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn QtSupport::fromQIntValueList(env, &_qintArray);\n"; + $returnCall .= "\treturn QtSupport::fromTQIntValueList(env, &_qintArray);\n"; } } elsif ( $javaType =~ /double\[\]/ ) { ; @@ -2308,10 +2308,10 @@ sub jniToReturnValue($$$) } $returnCall .= "$jniCleanups\treturn xret;\n"; } elsif ( $javaType =~ /^char\s*/ ) { - if ( $cplusplusType =~ /(QChar)(\s*\*)?\s*$/ ) { + if ( $cplusplusType =~ /(TQChar)(\s*\*)?\s*$/ ) { $jniLocal = "\t$const$1 $2 _qchar;\n"; $returnCall = "\t_qchar = $functionCall;\n$jniCleanups"; - $returnCall .= "\treturn (jchar) QtSupport::fromQChar(env, (QChar*) " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qchar);\n"; + $returnCall .= "\treturn (jchar) QtSupport::fromTQChar(env, (TQChar*) " . ($cplusplusType =~ /\*/ ? "" : "&") . "_qchar);\n"; } else { $returnCall = "\tjchar xret = (jchar) $functionCall;\n$jniCleanups"; $returnCall .= "\treturn xret;\n"; @@ -2337,10 +2337,10 @@ sub writeDoc mkpath( $outputdir ) unless -f $outputdir; - # Define QPtrCollection::Item, for resolveType - unless ( kdocAstUtil::findRef( $rootnode, "QPtrCollection::Item" ) ) { - my $cNode = kdocAstUtil::findRef( $rootnode, "QPtrCollection" ); - warn "QPtrCollection not found" if (!$cNode); + # Define TQPtrCollection::Item, for resolveType + unless ( kdocAstUtil::findRef( $rootnode, "TQPtrCollection::Item" ) ) { + my $cNode = kdocAstUtil::findRef( $rootnode, "TQPtrCollection" ); + warn "TQPtrCollection not found" if (!$cNode); my $node = Ast::New( 'Item' ); $node->AddProp( "NodeType", "Forward" ); $node->AddProp( "Source", $cNode->{Source} ) if ($cNode); @@ -2377,33 +2377,33 @@ sub preParseClass if( $#{$classNode->{Kids}} < 0 || $classNode->{Access} eq "private" || - $classNode->{Access} eq "protected" || # e.g. QPixmap::QPixmapData + $classNode->{Access} eq "protected" || # e.g. TQPixmap::TQPixmapData exists $classNode->{Tmpl} || - # Don't generate standard bindings for QString, this class is handled as a native type - $className eq 'QString' || - $className eq 'QConstString' || - $className eq 'QCString' || + # Don't generate standard bindings for TQString, this class is handled as a native type + $className eq 'TQString' || + $className eq 'TQConstString' || + $className eq 'TQCString' || # Don't map classes which are really arrays - $className eq 'QStringList' || - $className eq 'QCanvasItemList' || - $className eq 'QWidgetList' || - $className eq 'QObjectList' || - $className eq 'QStrList' || + $className eq 'TQStringList' || + $className eq 'TQCanvasItemList' || + $className eq 'TQWidgetList' || + $className eq 'TQObjectList' || + $className eq 'TQStrList' || # Those are template related - $className eq 'QTSManip' || # cause compiler errors with several gcc versions - $className eq 'QIconFactory' || - $className eq 'QGDict' || - $className eq 'QGList' || - $className eq 'QGVector' || - $className eq 'QStrIList' || - $className eq 'QStrIVec' || - $className eq 'QByteArray' || - $className eq 'QBitArray' || - $className eq 'QWExtra' || - $className eq 'QTLWExtra' || - $className eq 'QMetaEnum::Item' || - $className eq 'QWidgetContainerPlugin' || - $className eq 'QGArray::array_data' || + $className eq 'TQTSManip' || # cause compiler errors with several gcc versions + $className eq 'TQIconFactory' || + $className eq 'TQGDict' || + $className eq 'TQGList' || + $className eq 'TQGVector' || + $className eq 'TQStrIList' || + $className eq 'TQStrIVec' || + $className eq 'TQByteArray' || + $className eq 'TQBitArray' || + $className eq 'TQWExtra' || + $className eq 'TQTLWExtra' || + $className eq 'TQMetaEnum::Item' || + $className eq 'TQWidgetContainerPlugin' || + $className eq 'TQGArray::array_data' || $className eq 'KBookmarkMenu::DynMenuInfo' || $className eq 'KCompletionMatches' || $className eq 'KDEDesktopMimeType::Service' || @@ -2462,7 +2462,7 @@ sub preParseClass $className =~ /.*Impl$/ || $className =~ /.*Internal.*/ || # $classNode->{Deprecated} || - $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. QPDevCmdParam + $classNode->{NodeType} eq 'union' # Skip unions for now, e.g. TQPDevCmdParam ) { print STDERR "Skipping $className\n" if ($debug); print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union'); @@ -2496,7 +2496,7 @@ sub preParseClass my $name = $m->{astNodeName}; if( $m->{NodeType} eq "method" ) { - if ( $m->{ReturnType} eq 'typedef' # QFile's EncoderFn/DecoderFn callback, very badly parsed + if ( $m->{ReturnType} eq 'typedef' # TQFile's EncoderFn/DecoderFn callback, very badly parsed ) { $m->{NodeType} = 'deleted'; next; @@ -2590,18 +2590,18 @@ sub preParseClass # Various methods to skip in Qt/E (Qt 2.3.x) || ($main::qt_embedded - && ( ($classNode->{astNodeName} eq 'QUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) - || ($classNode->{astNodeName} eq 'QApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) - || ($classNode->{astNodeName} eq 'QPrinter' and $name =~ /^setIdle$|^setActive$/) - || ($classNode->{astNodeName} eq 'QDragObject' and $name eq 'dragLink') - || ($classNode->{astNodeName} eq 'QFont' and $name eq 'qwsRenderToDisk') - || ($classNode->{astNodeName} eq 'QFontInfo' and $name eq 'font') - || ($classNode->{astNodeName} eq 'QLineEdit' and $name eq 'getSelection') - || ($classNode->{astNodeName} eq 'QMainWindow' and $name eq 'toolBars') - || ($classNode->{astNodeName} eq 'QMovie' and $name eq 'setDisplayWidget') - || ($classNode->{astNodeName} eq 'QMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) - || ($classNode->{astNodeName} eq 'QPainter' and $name eq 'pos') - || ($classNode->{astNodeName} eq 'QPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) + && ( ($classNode->{astNodeName} eq 'TQUriDrag' and $name =~ /^decode$|decodeLocalFiles|decodeToUnicodeUris/) + || ($classNode->{astNodeName} eq 'TQApplication' and $name =~ /^qwsSetCustomColors|^setArgs$|^winMouseButtonUp|^winFocus|^winMouseButtonUP$|^winVersion$/) + || ($classNode->{astNodeName} eq 'TQPrinter' and $name =~ /^setIdle$|^setActive$/) + || ($classNode->{astNodeName} eq 'TQDragObject' and $name eq 'dragLink') + || ($classNode->{astNodeName} eq 'TQFont' and $name eq 'qwsRenderToDisk') + || ($classNode->{astNodeName} eq 'TQFontInfo' and $name eq 'font') + || ($classNode->{astNodeName} eq 'TQLineEdit' and $name eq 'getSelection') + || ($classNode->{astNodeName} eq 'TQMainWindow' and $name eq 'toolBars') + || ($classNode->{astNodeName} eq 'TQMovie' and $name eq 'setDisplayWidget') + || ($classNode->{astNodeName} eq 'TQMetaObject' and $name =~ /^new_metaenum_item$|^new_metaaccess$/) + || ($classNode->{astNodeName} eq 'TQPainter' and $name eq 'pos') + || ($classNode->{astNodeName} eq 'TQPixmap' and $name =~ /^allocCell$|^clut$|^freeCell|^hbm|^isMultiCellPixmap|^multiCellPixmap|^multiCellBitmap|^multiCellHandle|^multiCellOffset|^numCols/) || ($name eq 'handle') || ($name eq 'resetInputContext') || ($name eq 'propagateUpdates') @@ -2646,12 +2646,12 @@ sub preParseClass } if ( $arg->{ArgType} eq '...' # refuse a method with variable arguments - or $arg->{ArgType} eq 'image_io_handler' # QImage's callback - or $arg->{ArgType} eq 'DecoderFn' # QFile's callback - or $arg->{ArgType} eq 'EncoderFn' # QFile's callback - or $arg->{ArgType} =~ /bool \(\*\)\(QObject/ # QMetaObject's ctor - or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # QMetaObjectCleanUp's ctor with func pointer - or $arg->{ArgType} eq 'const QTextItem&' # ref to a private class in 3.2.0b1 + or $arg->{ArgType} eq 'image_io_handler' # TQImage's callback + or $arg->{ArgType} eq 'DecoderFn' # TQFile's callback + or $arg->{ArgType} eq 'EncoderFn' # TQFile's callback + or $arg->{ArgType} =~ /bool \(\*\)\(TQObject/ # TQMetaObject's ctor + or $arg->{ArgType} eq 'QtStaticMetaObjectFunction' # TQMetaObjectCleanUp's ctor with func pointer + or $arg->{ArgType} eq 'const TQTextItem&' # ref to a private class in 3.2.0b1 or $arg->{ArgType} eq 'FILE*' # won't be able to handle that I think or $arg->{ArgType} eq 'const KKeyNative&' # ) { @@ -2659,8 +2659,8 @@ sub preParseClass } else { - # Resolve type in full, e.g. for QSessionManager::RestartHint - # (QSessionManagerJBridge doesn't inherit QSessionManager) + # Resolve type in full, e.g. for TQSessionManager::RestartHint + # (TQSessionManagerJBridge doesn't inherit TQSessionManager) $arg->{ArgType} = kalyptusDataDict::resolveType($arg->{ArgType}, $classNode, $rootnode); registerType( $arg->{ArgType} ); $argId++; @@ -2693,7 +2693,7 @@ sub preParseClass } elsif( $m->{NodeType} eq 'var' ) { my $varType = $m->{Type}; - # We are interested in public static vars, like QColor::blue + # We are interested in public static vars, like TQColor::blue if ( $varType =~ s/static\s+// && $m->{Access} ne 'private' && $className."::".$m->{astNodeName} ne "KSpell::modalListText" ) { @@ -2747,14 +2747,14 @@ sub preParseClass $methodNode->AddProp( "Access", "public" ); } - # If we have a private pure virtual, then the class can't be instanciated (e.g. QCanvasItem) - # Same if the class has only private constructors (e.g. QInputDialog) + # If we have a private pure virtual, then the class can't be instanciated (e.g. TQCanvasItem) + # Same if the class has only private constructors (e.g. TQInputDialog) $classNode->AddProp( "CanBeInstanciated", $hasPublicProtectedConstructor # && !$hasPrivatePureVirtual - && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'QValidator') + && (!$classNode->{Pure} or $classNode->{astNodeName} eq 'TQValidator') && !($classNode->{NodeType} eq 'namespace') && ($classNode->{astNodeName} !~ /^DrawContentsEvent$|^MouseEvent$|^MouseDoubleClickEvent$|^MouseMoveEvent$|^MouseReleaseEvent$|^MousePressEvent$/) - && ($classNode->{astNodeName} !~ /QMetaObject|QDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); + && ($classNode->{astNodeName} !~ /TQMetaObject|TQDragObject|Slave|CopyJob|KMdiChildFrm|KNamedCommand/) ); # We will derive from the class only if it has public or protected constructors. # (_Even_ if it has pure virtuals. But in that case the *.cpp class can't be instantiated either.) @@ -2763,9 +2763,9 @@ sub preParseClass # We need a public dtor to destroy the object --- ### aren't protected dtors ok too ?? $classNode->AddProp( "HasPublicDestructor", $hasPublicDestructor ); - # Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor, + # Hack for TQAsyncIO. We don't implement the "if a class has no explicit copy ctor, # then all of its member variables must be copiable, otherwise the class isn't copiable". - $hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' ); + $hasPrivateCopyConstructor = 1 if ( $className eq 'TQAsyncIO' ); # Remember if this class can't be copied - it means all its descendants can't either $classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor ); @@ -2835,7 +2835,7 @@ sub writeClassDoc my @ancestor_nodes = (); Iter::Ancestors( $node, $rootnode, undef, undef, sub { my ( $ances, $name, $type, $template ) = @_; - if ( $name ne "QMemArray" and $name ne "QArray" and $name ne "QSqlFieldInfoList" ) { + if ( $name ne "TQMemArray" and $name ne "TQArray" and $name ne "TQSqlFieldInfoList" ) { push @ancestor_nodes, $ances; push @ancestors, $name; } @@ -2885,7 +2885,7 @@ sub writeClassDoc print CLASS "import java.text.MessageFormat;\n"; print CLASS "import java.lang.reflect.*;\n"; } else { - if ( $className eq 'QListView' or $className eq 'QListViewItem' or $className eq 'QUriDrag' ) { + if ( $className eq 'TQListView' or $className eq 'TQListViewItem' or $className eq 'TQUriDrag' ) { # Special case these two classes as they have methods that use ArrayList added as 'extras' print CLASS "import java.util.ArrayList;\n"; } @@ -3014,67 +3014,67 @@ sub writeClassDoc if ( $className eq 'Qt' ) { if ($main::qt_embedded) { - $qtExtras =~ s/public static native QCursor whatsThisCursor\(\);//; + $qtExtras =~ s/public static native TQCursor whatsThisCursor\(\);//; $qtjniExtras =~ s/JNIEXPORT jobject JNICALL\nJava_org_kde_qt_Qt_whatsThisCursor[^}]*}//; } print CLASS $qtExtras; $jniCode .= $qtjniExtras; - } elsif ( $className eq 'QApplication' ) { + } elsif ( $className eq 'TQApplication' ) { print CLASS $qapplicationExtras; $jniCode .= $qapplicationjniExtras; - } elsif ( $className eq 'QBitmap' ) { + } elsif ( $className eq 'TQBitmap' ) { print CLASS $qbitmapExtras; $jniCode .= $qbitmapjniExtras; - } elsif ( $className eq 'QDropEvent' ) { + } elsif ( $className eq 'TQDropEvent' ) { print CLASS $qdropeventExtras; $jniCode .= $qdropeventjniExtras; - } elsif ( $className eq 'QDragObject' ) { + } elsif ( $className eq 'TQDragObject' ) { print CLASS $qdragobjectExtras; $jniCode .= $qdragobjectjniExtras; - } elsif ( $className eq 'QObject' ) { + } elsif ( $className eq 'TQObject' ) { print CLASS $qobjectExtras; $jniCode .= $qobjectjniExtras; - } elsif ( $className eq 'QImage' ) { + } elsif ( $className eq 'TQImage' ) { $jniCode .= $qimagejniExtras; - } elsif ( $className eq 'QListView' ) { + } elsif ( $className eq 'TQListView' ) { print CLASS $qlistviewExtras; $jniCode .= $qlistviewjniExtras; - } elsif ( $className eq 'QListViewItem' ) { + } elsif ( $className eq 'TQListViewItem' ) { print CLASS $qlistviewitemExtras; $jniCode .= $qlistviewitemjniExtras; - } elsif ( $className eq 'QMenuBar' ) { + } elsif ( $className eq 'TQMenuBar' ) { if ($main::qt_embedded) { $qmenubarjniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qmenubarjniExtras; - } elsif ( $className eq 'QMenuData' ) { + } elsif ( $className eq 'TQMenuData' ) { if ($main::qt_embedded) { $qmenudatajniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qmenudatajniExtras; - } elsif ( $className eq 'QMimeSource' ) { + } elsif ( $className eq 'TQMimeSource' ) { print CLASS $qmimesourceExtras; $jniCode .= $qmimesourcejniExtras; - } elsif ( $className eq 'QPopupMenu' ) { + } elsif ( $className eq 'TQPopupMenu' ) { if ($main::qt_embedded) { $qpopupmenujniExtras =~ s/jobject accel/jlong accel/; } $jniCode .= $qpopupmenujniExtras; - } elsif ( $className eq 'QWidget' ) { + } elsif ( $className eq 'TQWidget' ) { print CLASS $qwidgetExtras; $jniCode .= $qwidgetjniExtras; - } elsif ( $className eq 'QPaintDevice' ) { + } elsif ( $className eq 'TQPaintDevice' ) { print CLASS $qpaintdeviceExtras; $jniCode .= $qpaintdevicejniExtras; - } elsif ( $className eq 'QPixmap' ) { + } elsif ( $className eq 'TQPixmap' ) { print CLASS $qpixmapExtras; $jniCode .= $qpixmapjniExtras; - } elsif ( $className eq 'QIODevice' ) { + } elsif ( $className eq 'TQIODevice' ) { print CLASS $qiodeviceExtras; - } elsif ( $className eq 'QPointArray' ) { + } elsif ( $className eq 'TQPointArray' ) { print CLASS $qpointarrayExtras; $jniCode .= $qpointarrayjniExtras; - } elsif ( $className eq 'QUriDrag' ) { + } elsif ( $className eq 'TQUriDrag' ) { print CLASS $quridragExtras; $jniCode .= $quridragjniExtras; } elsif ( $className eq 'KCmdLineArgs' ) { @@ -3289,7 +3289,7 @@ sub coerce_type($$$$) { } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $type =~ s/^const\s+//; if($new) { $code .= "(void*)new $type($var);\n"; @@ -3305,7 +3305,7 @@ sub coerce_type($$$$) { } # Generate the list of args casted to their real type, e.g. -# (QObject*)x[1].s_class,(QEvent*)x[2].s_class,x[3].s_int +# (TQObject*)x[1].s_class,(TQEvent*)x[2].s_class,x[3].s_int sub makeCastedArgList { my @castedList; @@ -3337,7 +3337,7 @@ sub makeCastedArgList } else { if ( $unionfield eq 's_class' or ( $unionfield eq 's_voidp' and $type ne 'void*' ) - or $type eq 'QString' ) { # hack + or $type eq 'TQString' ) { # hack $cast = "*($type *)"; } else { $cast = "($type)"; @@ -3575,8 +3575,8 @@ sub generateMethod($$$$$$$$$) @heritage = kdocAstUtil::heritage($mainClassNode); my $mainClassName = join( "::", @heritage ); - # The javaClassName might be 'QWidget', while currentClassName is 'QRangeControl' - # and the QRangeControl methods are being copied into QWidget. + # The javaClassName might be 'TQWidget', while currentClassName is 'TQRangeControl' + # and the TQRangeControl methods are being copied into TQWidget. my $javaClassName = $mainClassNode->{astNodeName}; my $currentClassName = $classNode->{astNodeName}; @@ -3614,7 +3614,7 @@ sub generateMethod($$$$$$$$$) if ($classNode->{astNodeName} eq $main::globalSpaceClassName) { my $sourcename = $m->{Source}->{astNodeName}; # Only put Global methods which came from sources beginning with q into class Qt - # Skip any methods in qstring.h/qcstring.h apart from QByteArray compress/uncompress + # Skip any methods in qstring.h/qcstring.h apart from TQByteArray compress/uncompress if ($javaClassName eq 'Qt' and ( $sourcename !~ /\/q[^\/]*$/ or ($sourcename =~ /string.h$/ and $name !~ /[Cc]ompress/) )) { return; @@ -3649,18 +3649,18 @@ sub generateMethod($$$$$$$$$) # # Skip internal methods, which return unknown types # # Hmm, the C# bindings have a list of those too. -# return if ( $returnType =~ m/QGfx\s*\*/ ); +# return if ( $returnType =~ m/TQGfx\s*\*/ ); # return if ( $returnType eq 'CGContextRef' ); -# return if ( $returnType eq 'QWSDisplay *' ); +# return if ( $returnType eq 'TQWSDisplay *' ); # # This stuff needs callback, or ** # return if ( $name eq 'defineIOHandler' or $name eq 'qt_init_internal' ); # # Skip casting operators, but not == < etc. # return if ( $name =~ /operator \w+/ ); -# # QFile's EncoderFn/DecoderFn +# # TQFile's EncoderFn/DecoderFn # return if ( $name =~ /set[ED][ne]codingFunction/ ); -# # How to implement this? (QXmlDefaultHandler/QXmlEntityResolver::resolveEntity, needs A*&) -# return if ( $name eq 'resolveEntity' and $className =~ /^QXml/ ); -# return if ( $className eq 'QBitArray' && $m->{Access} eq 'protected' ); +# # How to implement this? (TQXmlDefaultHandler/TQXmlEntityResolver::resolveEntity, needs A*&) +# return if ( $name eq 'resolveEntity' and $className =~ /^TQXml/ ); +# return if ( $className eq 'TQBitArray' && $m->{Access} eq 'protected' ); #print STDERR "Tests passed, generating.\n"; @@ -3721,7 +3721,7 @@ sub generateMethod($$$$$$$$$) checkIncludesForObject( $argType, $addInclude ); } - if ( $name eq 'QApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { + if ( $name eq 'TQApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { # Junk the 'int argc' parameter shift @javaArgTypeList; shift @javaArgList; @@ -3796,8 +3796,8 @@ sub generateMethod($$$$$$$$$) # $jniCode .= "x_$methodNumber(args);"; # $jniCode .= "\tbreak;\n"; - if ($name eq 'find' and $javaClassName eq 'QButtonGroup') { - # Can't override a static method find() in QWidget + if ($name eq 'find' and $javaClassName eq 'TQButtonGroup') { + # Can't override a static method find() in TQWidget $name = "findButton"; } elsif ( $name eq 'null' ) { $name = "nil"; @@ -3807,7 +3807,7 @@ sub generateMethod($$$$$$$$$) $name = "waitThread"; } elsif ( $name eq 'finalize' and $javaClassName eq 'KMD5' ) { $name = "finalizeDigest"; - } elsif ( $name eq 'icon' and $javaClassName eq 'QMessageBox' ) { + } elsif ( $name eq 'icon' and $javaClassName eq 'TQMessageBox' ) { $name = "iconId"; } elsif ( $name eq 'icon' and $javaClassName eq 'KURLBarItemDialog' ) { $name = "iconName"; @@ -3835,7 +3835,7 @@ sub generateMethod($$$$$$$$$) $name = "kstatusBar"; } elsif ($javaSignature eq "menuBar()" and $javaClassName =~ /^K/ ) { $name = "kmenuBar"; - } elsif ( $name eq 'addLabel' and $javaClassName eq 'QTableHeader' ) { + } elsif ( $name eq 'addLabel' and $javaClassName eq 'TQTableHeader' ) { $name = "addHeaderLabel"; } @@ -3873,9 +3873,9 @@ sub generateMethod($$$$$$$$$) $jniCode .= join( "", @jniCleanups ); $jniCode .= "\t}\n\treturn;\n}\n\n"; - # Look for args which are are a QQbject/slot string pair and replace with a java proxy slot + # Look for args which are are a TQQbject/slot string pair and replace with a java proxy slot if ($jniCode =~ s/QtSupport::getQt\(env, (receiver|recvr|pObjSlot)\), \(const char\*\) QtSupport::toCharString\(env, (member|slot|psMethodSlot), \&_qstring_(member|slot|psMethodSlot)\)/QtSupport::slotForReceiver(env, $1, $2), "1invoke()"/) { - $jniCode =~ s/static QCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; + $jniCode =~ s/static TQCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; } $jniSignature =~ /^([^\)]*)\(.*/; @@ -3910,9 +3910,9 @@ sub generateMethod($$$$$$$$$) if ($name =~ /^xForm$/ ) { $javaReturnType = "Object"; } elsif ($javaSignature eq "layout()" and $javaReturnType ne 'void') { - $altReturnType = "QLayout"; - } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'QSqlEditorFactory') { - $javaReturnType = "QEditorFactory"; + $altReturnType = "TQLayout"; + } elsif ($javaSignature eq "defaultFactory()" and $javaReturnType eq 'TQSqlEditorFactory') { + $javaReturnType = "TQEditorFactory"; } elsif ($javaSignature =~ /^bits|^scanLine/) { $javaReturnType = "byte[]"; } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { @@ -3933,7 +3933,7 @@ sub generateMethod($$$$$$$$$) } my $methodName = $m->{astNodeName}; - # Hack to stop calling super for QWidget::polish() from looping + # Hack to stop calling super for TQWidget::polish() from looping if ( $m->{Access} =~ /public/ && $returnType eq '' && $m->{Flags} =~ "v" @@ -3985,16 +3985,16 @@ sub generateMethod($$$$$$$$$) if ($name eq 'insertAnimatedWidget' or $name eq 'connectStatus' or $name eq 'disconnectStatus') { $slotArgType = 'int'; } elsif ($name eq 'connectResize' or $name eq 'disconnectResize') { - $slotArgType = 'const QSize&'; + $slotArgType = 'const TQSize&'; } elsif ($name eq 'connectUpdate' or $name eq 'disconnectUpdate') { - $slotArgType = 'const QRect&'; + $slotArgType = 'const TQRect&'; } - # Look for args which are are a QQbject/slot string pair and replace with a java proxy slot + # Look for args which are are a TQQbject/slot string pair and replace with a java proxy slot $locals .= join( "", @jniArgLocals ); if ($fcall =~ s/QtSupport::getQt\(env, (receiver|recvr|pObjSlot)\), \(const char\*\) QtSupport::toCharString\(env, (member|slot|psMethodSlot), \&_qstring_(member|slot|psMethodSlot)\)/QtSupport::slotForReceiver(env, $1, $2), "1invoke($slotArgType)"/) { - $locals =~ s/static QCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; + $locals =~ s/static TQCString\* _qstring_(member|slot|psMethodSlot) = 0;\n//; } $jniCode .= $locals; @@ -4005,10 +4005,10 @@ sub generateMethod($$$$$$$$$) $jniCode =~ s/jstring/jobject/; $jniCode =~ /(jlong|jint) (\w+)\)/; my $arg2 = $2; - $jniCode =~ s/_qstring_(\w+) = 0;\n/_qstring_$1 = 0;\n\tif \(_qstring_$1 == 0\) { _qstring_$1 = new QCString\(\); }\n\t_qstring_$1->resize\(\(uint\) $arg2\);\n/; + $jniCode =~ s/_qstring_(\w+) = 0;\n/_qstring_$1 = 0;\n\tif \(_qstring_$1 == 0\) { _qstring_$1 = new TQCString\(\); }\n\t_qstring_$1->resize\(\(uint\) $arg2\);\n/; my $arg1 = $1; $fcall =~ s/QtSupport::toCharString\([^\)]*\)/_qstring_$arg1->data()/; - $fcall =~ s/return xret;/QtSupport::fromQCStringToStringBuffer(env, _qstring_$arg1, $arg1);\n\treturn xret;/; + $fcall =~ s/return xret;/QtSupport::fromTQCStringToStringBuffer(env, _qstring_$arg1, $arg1);\n\treturn xret;/; } $jniCode .= $fcall; @@ -4149,8 +4149,8 @@ sub generateAllMethods($$$$$$$$) my $javaClassName = $mainClassNode->{astNodeName}; my $jniClassName = ($classNode->{astNodeName} =~ /^Q/ ? "Java_org_kde_qt_" : "Java_org_kde_koala_") . $classNode->{astNodeName}; # If the C++ class had multiple inheritance, then the code for all but one of the - # parents must be copied into the code for javaClassName. Hence, for QWidget current - # classname might be QPaintDevice, as its methods are needed in QWidget. + # parents must be copied into the code for javaClassName. Hence, for TQWidget current + # classname might be TQPaintDevice, as its methods are needed in TQWidget. my $currentClassName = join( ".", kdocAstUtil::heritage($classNode) ); my $sourcename = $classNode->{Source}->{astNodeName}; @@ -4247,33 +4247,33 @@ sub generateAllMethods($$$$$$$$) $jniSignature = $jniClassName . "_finalize"; $jniCode = "JNIEXPORT void JNICALL\n$jniSignature(JNIEnv* env, jobject obj)\n{"; - if ( is_kindof($classNode, 'QCheckListItem') ) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QCheckListItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((QCheckListItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; + if ( is_kindof($classNode, 'TQCheckListItem') ) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQCheckListItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQCheckListItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; } elsif ( $classNode->{astNodeName} =~ /^KFileTreeViewToolTip$/ ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QTableItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QTableItem*)($className*)QtSupport::getQt(env, obj))->table() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QPopupMenu')) { + } elsif ( is_kindof($classNode, 'TQTableItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQTableItem*)($className*)QtSupport::getQt(env, obj))->table() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQPopupMenu')) { if ($main::qt_embedded) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; } else { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n"; } - } elsif ( is_kindof($classNode, 'QListViewItem') ) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((QListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QIconViewItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QIconViewItem*)($className*)QtSupport::getQt(env, obj))->iconView() == 0) {\n"; - } elsif ( is_kindof($classNode, 'QLayoutItem')) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->layout() == 0 && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->widget() == 0 && ((QLayoutItem*)($className*)QtSupport::getQt(env, obj))->spacerItem() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQListViewItem') ) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQIconViewItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQIconViewItem*)($className*)QtSupport::getQt(env, obj))->iconView() == 0) {\n"; + } elsif ( is_kindof($classNode, 'TQLayoutItem')) { + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->layout() == 0 && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->widget() == 0 && ((TQLayoutItem*)($className*)QtSupport::getQt(env, obj))->spacerItem() == 0) {\n"; } elsif ( $classNode->{astNodeName} =~ /^KSpell$|^KReplace$/ ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj)) {\n"; - } elsif ( $classNode->{astNodeName} =~ /^QWidget$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parentWidget" ) ) { + } elsif ( $classNode->{astNodeName} =~ /^TQWidget$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parentWidget" ) ) { if ($main::qt_embedded) { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n"; } else { - $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((QWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n"; + $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n"; } - } elsif ( $classNode->{astNodeName} =~ /^QObject$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) { + } elsif ( $classNode->{astNodeName} =~ /^TQObject$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parent() == 0) {\n"; } else { $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj)) {\n"; @@ -4322,7 +4322,7 @@ sub virtualMethodCallbacks my $m; my $name; - my $isQObject = is_kindof($node, 'QObject'); + my $isTQObject = is_kindof($node, 'TQObject'); kdocAstUtil::allMembers( \%allmem, $node ); @@ -4355,7 +4355,7 @@ sub virtualMethodCallbacks $qobjectType =~ s/^(Q.*)/org.kde.qt.$1/; if( $m->{ReturnType} eq 'void' && $#argTypeList eq 0 && cplusplusToJNISignature( @argTypeList[0] ) =~ /Lorg_kde/ - && $isQObject ) + && $isTQObject ) { @castedArgList = makeCastedArgList( @argTypeList ); my $eventType = cplusplusToJava( @argTypeList[0] ); @@ -4367,29 +4367,29 @@ sub virtualMethodCallbacks $jbridgeCode .= "\t\t\t" . $parent->{astNodeName} . "::" . "$name(arg1);\n"; $jbridgeCode .= "\t\t}\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( $name =~ /eventFilter$/ and $isQObject and $#argTypeList eq 1) { - $jbridgeCode .= "\tbool eventFilter(QObject* object,QEvent* event) {\n"; + } elsif( $name =~ /eventFilter$/ and $isTQObject and $#argTypeList eq 1) { + $jbridgeCode .= "\tbool eventFilter(TQObject* object,TQEvent* event) {\n"; $jbridgeCode .= "\t\tif (!QtSupport::eventFilterDelegate(this,\"$qobjectType\",object,event)) {\n"; $jbridgeCode .= "\t\t\treturn " . $parent->{astNodeName} . "::eventFilter(object,event);\n"; $jbridgeCode .= "\t\t} else {\n"; $jbridgeCode .= "\t\t\treturn TRUE;\n"; $jbridgeCode .= "\t\t}\n\t}\n"; - } elsif( $name =~ /^fixup$/ and $node->{astNodeName} eq 'QValidator' ) { - $jbridgeCode .= "\tQValidator::State validate(QString& input,int& pos) const\n"; + } elsif( $name =~ /^fixup$/ and $node->{astNodeName} eq 'TQValidator' ) { + $jbridgeCode .= "\tTQValidator::State validate(TQString& input,int& pos) const\n"; $jbridgeCode .= "\t{\n"; - $jbridgeCode .= "\t\treturn (QValidator::State) QtSupport::validateDelegate((QValidator*)this,input,pos);\n"; + $jbridgeCode .= "\t\treturn (TQValidator::State) QtSupport::validateDelegate((TQValidator*)this,input,pos);\n"; $jbridgeCode .= "\t}\n"; - $jbridgeCode .= "\tvoid fixup(QString& input) const\n"; + $jbridgeCode .= "\tvoid fixup(TQString& input) const\n"; $jbridgeCode .= "\t{\n"; - $jbridgeCode .= "\t\tQtSupport::fixupDelegate((QValidator*) this, input);\n"; + $jbridgeCode .= "\t\tQtSupport::fixupDelegate((TQValidator*) this, input);\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( $m->{ReturnType} eq 'void' and $#argTypeList eq -1 and $isQObject) { + } elsif( $m->{ReturnType} eq 'void' and $#argTypeList eq -1 and $isTQObject) { $jbridgeCode .= "\tvoid $name() {\n"; $jbridgeCode .= "\t\tif (!QtSupport::voidDelegate(this,\"$qobjectType\",\"$name\")) {\n"; $jbridgeCode .= "\t\t\t" . $parent->{astNodeName} . "::$name();\n"; $jbridgeCode .= "\t\t}\n"; $jbridgeCode .= "\t\treturn;\n\t}\n"; - } elsif( cplusplusToJava( $m->{ReturnType} ) eq 'boolean' and $#argTypeList eq -1 and $isQObject ) { + } elsif( cplusplusToJava( $m->{ReturnType} ) eq 'boolean' and $#argTypeList eq -1 and $isTQObject ) { $jbridgeCode .= "\t" . $m->{ReturnType} . " $name() {\n"; $jbridgeCode .= "\t\treturn QtSupport::booleanDelegate(this,\"$name\");\n"; $jbridgeCode .= "\t}\n"; @@ -4530,7 +4530,7 @@ sub registerType($$) { return; } - die if $type eq 'QTextEdit::UndoRedoInfo::Type'; + die if $type eq 'TQTextEdit::UndoRedoInfo::Type'; die if $type eq ''; my $realType = $type; @@ -4593,7 +4593,7 @@ sub direct_superclass_list($) Iter::Ancestors( $classNode, $rootnode, undef, undef, sub { ( $direct_ancestor, $name ) = @_; - if ($name =~ /QMemArray|QSqlFieldInfoList/) { + if ($name =~ /TQMemArray|TQSqlFieldInfoList/) { # Template classes, give up for now.. $has_ancestor = 1; } elsif (kalyptusDataDict::interfacemap($name) eq "") { @@ -4700,8 +4700,8 @@ sub prepareCaseDict($) { $ok = 0 if ( $ok && $m->{Flags} =~ "p" ); # Bugfix for Qt-3.0.4: those methods are NOT implemented (report sent). - $ok = 0 if ( $ok && $className eq 'QLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); - $ok = 0 if ( $ok && $className eq 'QWidgetItem' && $name eq 'widgetSizeHint' ); + $ok = 0 if ( $ok && $className eq 'TQLineEdit' && ( $name eq 'setPasswordChar' || $name eq 'passwordChar' ) ); + $ok = 0 if ( $ok && $className eq 'TQWidgetItem' && $name eq 'widgetSizeHint' ); if ( !$ok ) { @@ -4955,7 +4955,7 @@ sub writeSmokeDataFile($) { # First write the name # print OUT "\t{ \"$type\", "; # Then write the classId (and find out the typeid at the same time) - if(exists $classidx{$realType}) { # this one first, we want t_class for QBlah* + if(exists $classidx{$realType}) { # this one first, we want t_class for TQBlah* $typeId = 't_class'; # print OUT "$classidx{$realType}, "; } @@ -5461,11 +5461,11 @@ sub printJavadocComment($$$$) $line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g; } $line =~ s/NodeList|KTrader::OfferList/ArrayList/g; - $line =~ s/(const )?QDate(Time)?(\s*&)?/Calendar/g; - $line =~ s/(const )?QTime([^r])/Date$1/g; - $line =~ s/QString::null/null/g; + $line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g; + $line =~ s/(const )?TQTime([^r])/Date$1/g; + $line =~ s/TQString::null/null/g; $line =~ s/(const )?QC?String(\s*&)?/String/g; - $line =~ s/QByteArray/byte[]/g; + $line =~ s/TQByteArray/byte[]/g; $line =~ s/(const )?KCmdLineOptions\s*(\w+)\[\]/String[][] $2/; $line =~ s/KCmdLineLastOption//g; $line =~ s/virtual //g; @@ -5527,7 +5527,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{Returns} ) { my $text = $docnode->{Returns}; - $text =~ s/QString::null/null/g; + $text =~ s/TQString::null/null/g; $returntext .= "\t\t\@return $text\n"; } @@ -5549,7 +5549,7 @@ sub printJavadocComment($$$$) if ( defined $docnode->{See} ) { foreach my $text ( @{$docnode->{See}} ) { - next if ($text =~ /QString|^\s*and\s*$|^\s*$|^[^\w]*$/); + next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/); $text =~ s/KIO:://g; $text =~ s/KParts:://g; $text =~ s/bool/boolean/g; @@ -5568,10 +5568,10 @@ sub printJavadocComment($$$$) $returntext =~ s/KIO#([A-Z])/$1/g; $returntext =~ s/KParts#([A-Z])/$1/g; $returntext =~ s/const\s+(\w+)\s*\&/$1/g; - $returntext =~ s/QChar/char/g; - $returntext =~ s/QStringList/ArrayList/g; + $returntext =~ s/TQChar/char/g; + $returntext =~ s/TQStringList/ArrayList/g; $returntext =~ s/([Aa]) ArrayList/$1n ArrayList/g; - $returntext =~ s/QString/String/g; + $returntext =~ s/TQString/String/g; $returntext =~ s/KCmdLineOptions/String[][]/; $returntext =~ s!\\note!<b>Note:<\b>!g; $returntext =~ s!\\(code|verbatim)!<pre>!g; |