summaryrefslogtreecommitdiffstats
path: root/kalyptus/kalyptusCxxToJNI.pm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:30:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:30:53 -0600
commit04dbe5845eb1cf6bcd7e5085bdd43ba21baba745 (patch)
tree197d9f62931ad000ae3d322d4644de4493555d80 /kalyptus/kalyptusCxxToJNI.pm
parent8e1bd0d2e8cc668950cc6b754026d27d2417040e (diff)
downloadlibtqt-perl-04dbe5845eb1cf6bcd7e5085bdd43ba21baba745.tar.gz
libtqt-perl-04dbe5845eb1cf6bcd7e5085bdd43ba21baba745.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
-rw-r--r--kalyptus/kalyptusCxxToJNI.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 3eba499..a19078e 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";