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/kalyptusCxxToJNI.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'kalyptus/kalyptusCxxToJNI.pm')

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 125457b8..3b318f94 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -99,7 +99,7 @@ BEGIN
    'signed int' => 'int',
    'unsigned' => 'uint',
    'unsigned int' => 'uint',
-   'KIO::filesize_t' => 'long',
+   'TDEIO::filesize_t' => 'long',
    'signed long' => 'long',
    'unsigned long' => 'ulong',
 
@@ -2415,7 +2415,7 @@ sub preParseClass
 	    $className eq 'KXMLGUIClient::StateChange' ||
 	    $className eq 'KIconTheme' ||
 	    $className eq 'KEditListBox::CustomEditor' ||
-		$className eq 'KIO::KBookmarkMenuNSImporter' ||
+		$className eq 'TDEIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
 	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KPrinter' ||
@@ -2439,16 +2439,16 @@ sub preParseClass
 	    $className eq 'KOCRDialogFactory' ||
 	    $className eq 'KExtendedBookmarkOwner' ||
 	    $className eq 'KSharedPixmap' ||
-	    $className eq 'KSocket' ||
+	    $className eq 'TDESocket' ||
 	    $className eq 'KLibrary' ||
 	    $className eq 'KScanDialogFactory' ||
 	    $className eq 'KDictSpellingHighlighter' ||
 		$className eq 'KPropertiesDialog' ||
 	    $className eq 'ProgressItem' ||
-	    $className eq 'KIO::ChmodInfo' ||
-	    $className eq 'KIO::MetaData' ||
+	    $className eq 'TDEIO::ChmodInfo' ||
+	    $className eq 'TDEIO::MetaData' ||
 	    $className eq 'KFileMimeTypeInfo::ItemInfo' ||
-	    $className eq 'KIO::UDSAtom' ||
+	    $className eq 'TDEIO::UDSAtom' ||
 	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
 	    $className eq 'khtml::MouseDoubleClickEvent' ||
 	    $className eq 'khtml::MouseMoveEvent' ||
@@ -3079,7 +3079,7 @@ sub writeClassDoc
 		$jniCode .= $quridragjniExtras;
 	} elsif ( $className eq 'TDECmdLineArgs' ) {
 		$jniCode .= $kcmdlineargsjniExtras;
-	} elsif ( $className eq 'KIO::Scheduler' ) {
+	} elsif ( $className eq 'TDEIO::Scheduler' ) {
 		$jniCode .= $schedulerjniExtras;
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
@@ -3918,7 +3918,7 @@ sub generateMethod($$$$$$$$$)
 				} elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') {
 	    			$javaReturnType = "long";
 				} elsif ($javaSignature =~ /copyTo/ and $javaClassName eq "KDesktopFile" ) {
-	    			$altReturnType = "KConfig";
+	    			$altReturnType = "TDEConfig";
 				}
 				
 				if ( defined $altReturnType ) {
@@ -5550,7 +5550,7 @@ sub printJavadocComment($$$$)
 	if ( defined $docnode->{See} ) {
 		foreach my $text ( @{$docnode->{See}} ) {
 			next if ($text =~ /TQString|^\s*and\s*$|^\s*$|^[^\w]*$/);
-			$text =~ s/KIO:://g;
+			$text =~ s/TDEIO:://g;
 			$text =~ s/KParts:://g;
 			$text =~ s/bool/boolean/g;
 			$text =~ s/::/#/g;
-- 
cgit v1.2.1