From 04dbe5845eb1cf6bcd7e5085bdd43ba21baba745 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:30:53 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kalyptus/kalyptusCxxToKimono.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kalyptus/kalyptusCxxToKimono.pm') diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index ae87531..99fb0b6 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -734,7 +734,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' || @@ -904,7 +904,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') @@ -1934,7 +1934,7 @@ sub generateMethod($$$$$$$) $name = "nil"; } elsif ( $name eq 'form' and $csharpClassName =~ /^HTML/ ) { $name = "formElement"; - } elsif ( $name eq 'wait' and $csharpClassName eq 'KProcess' ) { + } elsif ( $name eq 'wait' and $csharpClassName eq 'TDEProcess' ) { $name = "waitThread"; } elsif ( $name eq 'icon' and $csharpClassName eq 'TQMessageBox' ) { $name = "iconId"; -- cgit v1.2.1