From 4d0d14e0800f5edae4702c5105aad4bdb4d1278e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 4 Feb 2013 14:12:22 -0600
Subject: [PATCH] Rename KIcon to enhance compatibility with KDE4

---
 kalyptus/kalyptusCxxToJNI.pm    |  4 ++--
 kalyptus/kalyptusCxxToJava.pm   |  4 ++--
 kalyptus/kalyptusCxxToKimono.pm |  4 ++--
 kalyptus/kalyptusCxxToSmoke.pm  |  2 +-
 kalyptus/kalyptusDataDict.pm    | 24 ++++++++++++------------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index e7530b0..95a36cb 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -2413,7 +2413,7 @@ sub preParseClass
 	    $className eq 'KParts::Plugin::PluginInfo' ||
 	    $className eq 'KProtocolInfo::ExtraField' ||
 	    $className eq 'KXMLGUIClient::StateChange' ||
-	    $className eq 'KIconTheme' ||
+	    $className eq 'TDEIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
@@ -3821,7 +3821,7 @@ sub generateMethod($$$$$$$$$)
 			$name = "iconSize";
 		} elsif ( $name eq 'size' and $javaClassName eq 'TDEFontCombo' ) {
 			$name = "pointSize";
-		} elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') {
+		} elsif ($javaSignature eq "icon()" and $javaClassName eq 'TDEIconButton') {
 			$name = "iconName";
 		} elsif ($javaSignature eq "close()" and $javaClassName eq 'KDirOperator') {
 			$name = "closeLoading";
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index c7cc076..50d3885 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -720,7 +720,7 @@ sub preParseClass
 	    $className eq 'KParts::Plugin::PluginInfo' ||
 	    $className eq 'KProtocolInfo::ExtraField' ||
 	    $className eq 'KXMLGUIClient::StateChange' ||
-	    $className eq 'KIconTheme' ||
+	    $className eq 'TDEIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
@@ -1900,7 +1900,7 @@ sub generateMethod($$$$$$$)
 			$name = "paletteName";
 		} elsif ( $name eq 'size' and $javaClassName eq 'TDEFontCombo' ) {
 			$name = "pointSize";
-		} elsif ($javaSignature eq "icon()" and $javaClassName eq 'KIconButton') {
+		} elsif ($javaSignature eq "icon()" and $javaClassName eq 'TDEIconButton') {
 			$name = "iconName";
 		} elsif ($javaSignature eq "close()" and $javaClassName eq 'KDirOperator') {
 			$name = "closeLoading";
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 6e8f69d..d3e63c7 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -740,7 +740,7 @@ sub preParseClass
 	    $className eq 'KParts::Plugin::PluginInfo' ||
 	    $className eq 'KProtocolInfo::ExtraField' ||
 	    $className eq 'KXMLGUIClient::StateChange' ||
-	    $className eq 'KIconTheme' ||
+	    $className eq 'TDEIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
@@ -1948,7 +1948,7 @@ sub generateMethod($$$$$$$)
 			$name = "paletteName";
 		} elsif ( $name eq 'size' and $csharpClassName eq 'TDEFontCombo' ) {
 			$name = "pointSize";
-		} elsif ($csharpSignature eq "icon()" and $csharpClassName eq 'KIconButton') {
+		} elsif ($csharpSignature eq "icon()" and $csharpClassName eq 'TDEIconButton') {
 			$name = "iconName";
 		} elsif ($csharpSignature eq "close()" and $csharpClassName eq 'KDirOperator') {
 			$name = "closeLoading";
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 49c8930..80b35d2 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -374,7 +374,7 @@ sub preParseClass
 	    $className eq 'KParts::Plugin::PluginInfo' ||
 	    $className eq 'KProtocolInfo::ExtraField' ||
 	    $className eq 'KXMLGUIClient::StateChange' ||
-	    $className eq 'KIconTheme' ||
+	    $className eq 'TDEIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KExtendedSocket' ||
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index b2ea43d..c31a036 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -944,16 +944,16 @@ BEGIN
 'KIOTestSlow' => 'kde_KIOTestSlow*',
 'KIOTestSlow*' => 'kde_KIOTestSlow*',
 'KIPC*' => 'kde_KIPC*',
-'KIcon'  => 'kde_KIcon*' ,
-'KIcon*' => 'kde_KIcon*',
-'KIconButton*' => 'kde_KIconButton*',
-'KIconCanvas*' => 'kde_KIconCanvas*',
-'KIconDialog*' => 'kde_KIconDialog*',
-'KIconEffect*'  =>  'kde_KIconEffect*' ,
-'KIconLoader*'  => 'kde_KIconLoader*' ,
-'KIconSelectAction*' => 'kde_KIconSelectAction*',
-'KIconView*' => 'kde_KIconView*',
-'KIconViewItem*' => 'kde_KIconViewItem*',
+'TDEIcon'  => 'kde_TDEIcon*' ,
+'TDEIcon*' => 'kde_TDEIcon*',
+'TDEIconButton*' => 'kde_TDEIconButton*',
+'TDEIconCanvas*' => 'kde_TDEIconCanvas*',
+'TDEIconDialog*' => 'kde_TDEIconDialog*',
+'TDEIconEffect*'  =>  'kde_TDEIconEffect*' ,
+'TDEIconLoader*'  => 'kde_TDEIconLoader*' ,
+'TDEIconSelectAction*' => 'kde_TDEIconSelectAction*',
+'TDEIconView*' => 'kde_TDEIconView*',
+'TDEIconViewItem*' => 'kde_TDEIconViewItem*',
 'KImageEffect*' => 'kde_KImageEffect*',
 'KImageFilePreview*' => 'kde_KImageFilePreview*',
 'KImageIO*' => 'kde_KImageIO*',
@@ -2802,8 +2802,8 @@ BEGIN
 'KKeyX11*' => 'kde_KKeyX11*',
 'TDEAccelActions' => 'kde_TDEAccelActions*',
 'KRandomSequence&' => 'kde_KRandomSequence*',
-'KIcon::Context' => 'int',
-'KIcon::Group' => 'int',
+'TDEIcon::Context' => 'int',
+'TDEIcon::Group' => 'int',
 );