From 24b85b785334e8436c975a4323fcbb75d61f6e72 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:31:43 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kalyptus/kalyptusCxxToSmoke.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kalyptus/kalyptusCxxToSmoke.pm')

diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index bfc90c64..5c68d642 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -376,9 +376,9 @@ sub preParseClass
 	    $className eq 'KXMLGUIClient::StateChange' ||
 	    $className eq 'KIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
-		$className eq 'KIO::KBookmarkMenuNSImporter' ||
+		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KExtendedSocket' ||
-	    $className eq 'KSocket' ||
+	    $className eq 'TDESocket' ||
 	    $className eq 'KPerDomainSettings' ||
 	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KOpenWithHandler' ||
@@ -405,7 +405,7 @@ sub preParseClass
 	    $className eq 'KDictSpellingHighlighter' ||
 		$className eq 'KPropertiesDialog' ||
 	    $className eq 'ProgressItem' ||
-	    $className eq 'KIO::ChmodInfo' ||
+	    $className eq 'TDEIO::ChmodInfo' ||
 	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
 	    $className eq 'khtml::MouseDoubleClickEvent' ||
 	    $className eq 'khtml::MouseMoveEvent' ||
@@ -544,7 +544,7 @@ sub preParseClass
 		# or where the code won't compile/link for obscure reasons. Or even obvious reasons..
 		if ( ($classNode->{astNodeName} eq 'KCharSelectTable' and $name eq 'paintCell')
 			|| ($classNode->{astNodeName} eq 'KAnimWidget' and $name eq 'KAnimWidget' and @{$m->{ParamList}} == 2)
-			|| ($classNode->{astNodeName} eq 'KCModuleLoader' and $name eq 'errorModule')
+			|| ($classNode->{astNodeName} eq 'TDECModuleLoader' and $name eq 'errorModule')
 			|| ($classNode->{astNodeName} eq 'KDCOPActionProxy' and $name eq 'actions')
 			|| ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'insertActive')
 			|| ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'removeActive')
-- 
cgit v1.2.3