From 2407db5f826af170cd6e28cb49d18930309c5518 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 12:59:07 -0600
Subject: [PATCH] Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob,
 KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4

---
 kalyptus/kalyptusCxxToSmoke.pm | 2 +-
 kalyptus/kalyptusDataDict.pm   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 06f555d..e7babfc 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -401,7 +401,7 @@ sub preParseClass
 	    $className eq 'KSharedPixmap' ||
 	    $className eq 'KLibrary' ||
 	    $className eq 'KScanDialogFactory' ||
-	    $className eq 'KBufferedIO' ||
+	    $className eq 'TDEBufferedIO' ||
 	    $className eq 'KDictSpellingHighlighter' ||
 		$className eq 'KPropertiesDialog' ||
 	    $className eq 'ProgressItem' ||
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 7891f6f..23d7f98 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -748,7 +748,7 @@ BEGIN
 'KAutoUnmount*' => 'kde_KAutoUnmount*',
 'KBindingPropsPlugin*' => 'kde_KBindingPropsPlugin*',
 'KBlankEffect*' => 'kde_KBlankEffect*',
-'KBufferedIO*' => 'kde_KBufferedIO*',
+'TDEBufferedIO*' => 'kde_TDEBufferedIO*',
 'KBugReport*' => 'kde_KBugReport*',
 'KButtonBox*' => 'kde_KButtonBox*',
 'TDECModule*'  =>  'kde_TDECModule*' ,
@@ -938,8 +938,8 @@ BEGIN
 'TDEIO::SimpleJob*' => 'kde_SimpleJob*',
 'TDEIO::SkipDlg_Result' => 'int',
 'TDEIO::Slave*' => 'kde_Slave*',
-'KIOInputStream&' => 'kde_KIOInputStream*',
-'KIOInputStream*' => 'kde_KIOInputStream*',
+'TDEIOInputStream&' => 'kde_TDEIOInputStream*',
+'TDEIOInputStream*' => 'kde_TDEIOInputStream*',
 'KIOTestSlow&' => 'kde_KIOTestSlow*',
 'KIOTestSlow' => 'kde_KIOTestSlow*',
 'KIOTestSlow*' => 'kde_KIOTestSlow*',