diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:44:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:44:04 -0600 |
| commit | 72a82366e0b94a52125683f3ee3a8ffd3691294b (patch) | |
| tree | 787ee6497a0bf5e2e730f58d57dcbc9dc5377548 /kalyptus/kalyptusCxxToJNI.pm | |
| parent | 43e3dc950c8050c2ba850b5707077790870aa734 (diff) | |
| download | tdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.tar.gz tdebindings-72a82366e0b94a52125683f3ee3a8ffd3691294b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index ce821ba7..125457b8 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -2407,7 +2407,7 @@ sub preParseClass $className eq 'KBookmarkMenu::DynMenuInfo' || $className eq 'KCompletionMatches' || $className eq 'KDEDesktopMimeType::Service' || - $className eq 'KGlobalSettings::KMouseSettings' || + $className eq 'TDEGlobalSettings::KMouseSettings' || $className eq 'KMimeType::Format' || $className eq 'KNotifyClient::Instance' || $className eq 'KParts::Plugin::PluginInfo' || @@ -2551,7 +2551,7 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KFileDialog' and $name eq 'getDirEntry') || ($classNode->{astNodeName} eq 'KFileView' and $name eq 'selectionMode') || ($classNode->{astNodeName} eq 'KFind' and $name eq 'KFind' and @{$m->{ParamList}} == 4) - || ($classNode->{astNodeName} eq 'KGlobalAccel' and $name eq 'setEnabled') + || ($classNode->{astNodeName} eq 'TDEGlobalAccel' and $name eq 'setEnabled') || ($classNode->{astNodeName} eq 'KCharsets' and $name eq 'encodingsForLanguage') || ($classNode->{astNodeName} eq 'KInputDialog' and $name eq 'getInteger') || ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString') @@ -3803,7 +3803,7 @@ sub generateMethod($$$$$$$$$) $name = "nil"; } elsif ( $name eq 'form' and $javaClassName =~ /^HTML/ ) { $name = "formElement"; - } elsif ( $name eq 'wait' and $javaClassName eq 'KProcess' ) { + } elsif ( $name eq 'wait' and $javaClassName eq 'TDEProcess' ) { $name = "waitThread"; } elsif ( $name eq 'finalize' and $javaClassName eq 'KMD5' ) { $name = "finalizeDigest"; |