Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

5 files changed, 19 insertions, 19 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";
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 6537e5f..c86739c 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -714,7 +714,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' ||
@@ -858,7 +858,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')
@@ -1884,7 +1884,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";
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";
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 887e3bf..d8d7ac8 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -367,7 +367,7 @@ sub preParseClass
 	    $className eq 'KDEDesktopMimeType::Service' ||
 	    $className eq 'KEntry' ||
 	    $className eq 'KEntryKey' ||
-	    $className eq 'KGlobalSettings::KMouseSettings' ||
+	    $className eq 'TDEGlobalSettings::KMouseSettings' ||
 	    $className eq 'KMimeType::Format' ||
 	    $className eq 'KNotifyClient::Instance' ||
 	    $className eq 'KParts::ComponentFactory' ||
@@ -554,7 +554,7 @@ sub preParseClass
 			|| ($classNode->{astNodeName} eq 'KFileItem' and $name eq 'extraData')
 			|| ($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 'SlaveBase' and $name eq 'checkCachedAuthentication')
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index b72a59b..3533c72 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -913,10 +913,10 @@ BEGIN
 'KFontSizeAction*' => 'kde_KFontSizeAction*',
 'KGenericFactory*' => 'kde_KGenericFactory*',
 'KGenericFactoryBase*' => 'kde_KGenericFactoryBase*',
-'KGlobal*' => 'kde_KGlobal*',
-'KGlobalAccel*'  =>  'kde_KGlobalAccel*' ,
-'KGlobalSettings*' => 'kde_KGlobalSettings*',
-'KGlobalSettings::Completion'  => 'int' ,
+'TDEGlobal*' => 'kde_TDEGlobal*',
+'TDEGlobalAccel*'  =>  'kde_TDEGlobalAccel*' ,
+'TDEGlobalSettings*' => 'kde_TDEGlobalSettings*',
+'TDEGlobalSettings::Completion'  => 'int' ,
 'KGradientSelector*' => 'kde_KGradientSelector*',
 'KGuiItem&' => 'kde_KGuiItem*',
 'KGuiItem' => 'kde_KGuiItem*',
@@ -1056,10 +1056,10 @@ BEGIN
 'KPrinter*' => 'kde_KPrinter*',
 'KPrinterWrapper*' => 'kde_KPrinterWrapper*',
 'KProcIO*'  =>  'kde_KProcIO*' ,
-'KProcess&'  => 'kde_KProcess*' ,
-'KProcess*'  => 'kde_KProcess*' ,
-'KProcessController*' => 'kde_KProcessController*',
-'KProcessRunner*' => 'kde_KProcessRunner*',
+'TDEProcess&'  => 'kde_TDEProcess*' ,
+'TDEProcess*'  => 'kde_TDEProcess*' ,
+'TDEProcessController*' => 'kde_TDEProcessController*',
+'TDEProcessRunner*' => 'kde_TDEProcessRunner*',
 'KProgress*' => 'kde_KProgress*',
 'KPropertiesDialog*'  => 'kde_KPropertiesDialog*' ,
 'KPropsDlgPlugin*'  => 'kde_KPropsDlgPlugin*' ,