diff options
Diffstat (limited to 'kalyptus')
| -rw-r--r-- | kalyptus/kalyptus | 4 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 8 | ||||
| -rw-r--r-- | kalyptus/kalyptusDataDict.pm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 8b934d3..ae7ec1e 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -130,7 +130,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors); _STYLE_SGI => '', _STYLE_WINDOWS => '', TQ_EXPORT => '', - Q_EXPORT_CODECS_BIG5 => '', + TQ_EXPORT_CODECS_BIG5 => '', TQ_REFCOUNT => '', TQM_EXPORT_CANVAS => '', TQM_EXPORT_DNS => '', @@ -495,7 +495,7 @@ LOOP: $p =~ s/QT_MODULE\(\w+\)//; $p =~ s/QT_WEAK_SYMBOL//; $p =~ s/QT_MOC_COMPAT//; - $p =~ s/Q_EXPORT_CODECS_BIG5//; + $p =~ s/TQ_EXPORT_CODECS_BIG5//; $p =~ s/QT_COMPAT / /; $p =~ s/TQ_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/; $p =~ s/TQWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck! diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 332b44d..393df4f 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -1698,7 +1698,7 @@ static TQCString* _qstring__version = 0; } JNIEXPORT void JNICALL -Java_org_trinitydesktop_koala_TDECmdLineArgs_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) +Java_org_trinitydesktop_koala_TDECmdLineArgs_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 noTDEApp) { (void) cls; static TQCString* _qstring__appname = 0; @@ -1706,7 +1706,7 @@ static TQCString* _qstring_programName = 0; static TQCString* _qstring__description = 0; static TQCString* _qstring__version = 0; int argc = (int) env->GetArrayLength(args); - TDECmdLineArgsJBridge::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); + TDECmdLineArgsJBridge::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) noTDEApp); return; } @@ -1720,11 +1720,11 @@ Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_tri } JNIEXPORT void JNICALL -Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp) +Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noTDEApp) { (void) cls; int argc = (int) env->GetArrayLength(args); - TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noKApp); + TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noTDEApp); return; } diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 0be90aa..c166509 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1055,7 +1055,7 @@ BEGIN 'KPrintDialogPage*' => 'tde_KPrintDialogPage*', 'KPrinter*' => 'tde_KPrinter*', 'KPrinterWrapper*' => 'tde_KPrinterWrapper*', -'KProcIO*' => 'tde_KProcIO*' , +'TDEProcIO*' => 'tde_TDEProcIO*' , 'TDEProcess&' => 'tde_TDEProcess*' , 'TDEProcess*' => 'tde_TDEProcess*' , 'TDEProcessController*' => 'tde_TDEProcessController*', |