TDE
/
libtqt-perl
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libtqt-perl
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

Browse Source
bug/266/move-to-usr
Timothy Pearson 12 years ago
parent 1431b12f04
commit 7c430d1663
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

28
kalyptus/kalyptusCxxToJNI.pm
Unescape View File

@ -302,10 +302,10 @@ BEGIN
'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1, 'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1, 'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
'Java_org_kde_koala_KMainWindow_memberList' => 1, 'Java_org_kde_koala_KMainWindow_memberList' => 1,
'Java_org_kde_koala_KCmdLineArgs_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_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
'Java_org_kde_koala_KCmdLineArgs_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_2' => 1,
'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z' => 1, 'Java_org_kde_koala_TDECmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2Z' => 1,
'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_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__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, 'Java_org_kde_koala_Scheduler_connect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
'Java_org_kde_koala_Scheduler_disconnect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1, 'Java_org_kde_koala_Scheduler_disconnect__Lorg_kde_qt_QObject_2Ljava_lang_String_2Lorg_kde_qt_QObject_2Ljava_lang_String_2' => 1,
@ -1685,7 +1685,7 @@ EOF
$kcmdlineargsjniExtras = <<EOF; $kcmdlineargsjniExtras = <<EOF;
JNIEXPORT void JNICALL 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) Java_org_kde_koala_TDECmdLineArgs_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; (void) cls;
static TQCString* _qstring__appname = 0; static TQCString* _qstring__appname = 0;
@ -1693,12 +1693,12 @@ static TQCString* _qstring_programName = 0;
static TQCString* _qstring__description = 0; static TQCString* _qstring__description = 0;
static TQCString* _qstring__version = 0; static TQCString* _qstring__version = 0;
int argc = (int) env->GetArrayLength(args); 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)); TDECmdLineArgsJBridge::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; return;
} }
JNIEXPORT void JNICALL 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) Java_org_kde_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)
{ {
(void) cls; (void) cls;
static TQCString* _qstring__appname = 0; static TQCString* _qstring__appname = 0;
@ -1706,25 +1706,25 @@ static TQCString* _qstring_programName = 0;
static TQCString* _qstring__description = 0; static TQCString* _qstring__description = 0;
static TQCString* _qstring__version = 0; static TQCString* _qstring__version = 0;
int argc = (int) env->GetArrayLength(args); 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); 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);
return; return;
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_kde_koala_KCmdLineArgs_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_KAboutData_2(JNIEnv* env, jclass cls, jobjectArray args, jobject about)
{ {
(void) cls; (void) cls;
int argc = (int) env->GetArrayLength(args); int argc = (int) env->GetArrayLength(args);
KCmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about)); TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const KAboutData*) QtSupport::getQt(env, about));
return; return;
} }
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_kde_koala_KCmdLineArgs_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_KAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
{ {
(void) cls; (void) cls;
int argc = (int) env->GetArrayLength(args); int argc = (int) env->GetArrayLength(args);
KCmdLineArgsJBridge::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 KAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
return; return;
} }
@ -3077,7 +3077,7 @@ sub writeClassDoc
} elsif ( $className eq 'TQUriDrag' ) { } elsif ( $className eq 'TQUriDrag' ) {
print CLASS $quridragExtras; print CLASS $quridragExtras;
$jniCode .= $quridragjniExtras; $jniCode .= $quridragjniExtras;
} elsif ( $className eq 'KCmdLineArgs' ) { } elsif ( $className eq 'TDECmdLineArgs' ) {
$jniCode .= $kcmdlineargsjniExtras; $jniCode .= $kcmdlineargsjniExtras;
} elsif ( $className eq 'KIO::Scheduler' ) { } elsif ( $className eq 'KIO::Scheduler' ) {
$jniCode .= $schedulerjniExtras; $jniCode .= $schedulerjniExtras;
@ -3721,7 +3721,7 @@ sub generateMethod($$$$$$$$$)
checkIncludesForObject( $argType, $addInclude ); checkIncludesForObject( $argType, $addInclude );
} }
if ( $name eq 'TQApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { if ( $name eq 'TQApplication' or ($javaClassName eq 'TDECmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) {
# Junk the 'int argc' parameter # Junk the 'int argc' parameter
shift @javaArgTypeList; shift @javaArgTypeList;
shift @javaArgList; shift @javaArgList;

2
kalyptus/kalyptusCxxToJava.pm
Unescape View File

@ -1816,7 +1816,7 @@ sub generateMethod($$$$$$$)
checkImportsForObject( $argType, $addImport ); checkImportsForObject( $argType, $addImport );
} }
if ( $name eq 'TQApplication' or ($javaClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) { if ( $name eq 'TQApplication' or ($javaClassName eq 'TDECmdLineArgs' and $name eq 'init' and scalar(@javaArgList) > 1) ) {
# Junk the 'int argc' parameter # Junk the 'int argc' parameter
shift @javaArgTypeList; shift @javaArgTypeList;
shift @javaArgList; shift @javaArgList;

2
kalyptus/kalyptusCxxToKimono.pm
Unescape View File

@ -1865,7 +1865,7 @@ sub generateMethod($$$$$$$)
checkImportsForObject( $argType, $addImport ); checkImportsForObject( $argType, $addImport );
} }
if ( $name eq 'TQApplication' or ($csharpClassName eq 'KCmdLineArgs' and $name eq 'init' and scalar(@csharpArgList) > 1) ) { if ( $name eq 'TQApplication' or ($csharpClassName eq 'TDECmdLineArgs' and $name eq 'init' and scalar(@csharpArgList) > 1) ) {
# Junk the 'int argc' parameter # Junk the 'int argc' parameter
shift @csharpArgTypeList; shift @csharpArgTypeList;
shift @csharpArgList; shift @csharpArgList;

2
kalyptus/kalyptusDataDict.pm
Unescape View File

@ -757,7 +757,7 @@ BEGIN
'KCharSelect*' => 'kde_KCharSelect*', 'KCharSelect*' => 'kde_KCharSelect*',
'KCharSelectTable*' => 'kde_KCharSelectTable*', 'KCharSelectTable*' => 'kde_KCharSelectTable*',
'KCharsets*' => 'kde_KCharsets*' , 'KCharsets*' => 'kde_KCharsets*' ,
'KCmdLineArgs*' => 'kde_KCmdLineArgs*' , 'TDECmdLineArgs*' => 'kde_TDECmdLineArgs*' ,
'KCodecs*' => 'kde_KCodecs*', 'KCodecs*' => 'kde_KCodecs*',
'KColor&' => 'kde_KColor*' , 'KColor&' => 'kde_KColor*' ,
'KColor*' => 'kde_KColor*', 'KColor*' => 'kde_KColor*',

Write Preview
Loading…
Cancel
Save