diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
| commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
| tree | fc53a45a5d9693bfe8a156579b921e960351e31c /kalyptus/kalyptusCxxToJNI.pm | |
| parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
| download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 0b815c3d..ce821ba7 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -303,8 +303,8 @@ BEGIN 'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1, 'Java_org_kde_koala_KMainWindow_memberList' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1, - 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2' => 1, - 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z' => 1, + 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2' => 1, + 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z' => 1, 'Java_org_kde_koala_Scheduler_connect__Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1, 'Java_org_kde_koala_Scheduler_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1, @@ -1711,20 +1711,20 @@ static TQCString* _qstring__version = 0; } JNIEXPORT void JNICALL -Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about) +Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about) { (void) cls; int argc = (int) env->GetArrayLength(args); - TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about)); + TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about)); return; } JNIEXPORT void JNICALL -Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp) +Java_org_kde_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_kde_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp) { (void) cls; int argc = (int) env->GetArrayLength(args); - TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about), (bool) noKApp); + TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noKApp); return; } @@ -2568,8 +2568,8 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'languages') || ($classNode->{astNodeName} eq 'KCombiView' and $name eq 'setDropOptions') || ($classNode->{astNodeName} eq 'KFileMetaInfoItem' and $name eq 'unit') - || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'charsets') - || ($classNode->{astNodeName} eq 'KInstance' and $name eq 'KInstance' and $m->{Access} =~ /protected/) + || ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'charsets') + || ($classNode->{astNodeName} eq 'TDEInstance' and $name eq 'TDEInstance' and $m->{Access} =~ /protected/) || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidQt') || ($classNode->{astNodeName} eq 'KKey' and $name eq 'isValidNative') || ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'init') |