From 5538de896d91beba2d934e4d218f1d2bb52e937b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 10:50:32 -0600
Subject: Rename KLock and KTrader to avoid conflicts with KDE4

---
 kalyptus/kalyptusCxxToJNI.pm    | 4 ++--
 kalyptus/kalyptusCxxToJava.pm   | 2 +-
 kalyptus/kalyptusCxxToKimono.pm | 2 +-
 kalyptus/kalyptusDataDict.pm    | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kalyptus')

diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index b3512c6e..47f8266a 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -2239,7 +2239,7 @@ sub jniToReturnValue($$$)
 			$returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, (DOM::$1 *) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
 		} elsif ( $cplusplusType =~ /(QCStringList|KFileItemList|KFileViewItemList)\s*([\*\&])?\s*$/ ) {
 			$returnCall .= "\treturn (jobject) KDESupport::arrayWith$1(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
-		} elsif ( $cplusplusType =~ /(KTrader::OfferList)\s*([\*\&])?\s*$/ ) {
+		} elsif ( $cplusplusType =~ /(TDETrader::OfferList)\s*([\*\&])?\s*$/ ) {
 			$returnCall .= "\treturn (jobject) KDESupport::arrayWithOfferList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
 		} elsif ( $cplusplusType =~ /(KURL::List)\s*([\*\&])?\s*$/ ) {
 			$returnCall .= "\treturn (jobject) KDESupport::arrayWithKURLList(env, ($1*) " . ($2 eq "\*" ? "" : "&") . "_qlist);\n";
@@ -5460,7 +5460,7 @@ sub printJavadocComment($$$$)
 		} else {
 			$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
 		}
-		$line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+		$line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
 		$line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g;
 		$line =~ s/(const )?TQTime([^r])/Date$1/g;
 		$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index a3f28dcc..e8b830af 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -3299,7 +3299,7 @@ sub printJavadocComment($$$$)
 		} else {
 			$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
 		}
-		$line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+		$line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
 		$line =~ s/(const )?TQDate(Time)?(\s*&)?/Calendar/g;
 		$line =~ s/(const )?TQTime([^r])/Date$1/g;
 		$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index ff5d3fff..1c59aac1 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -3493,7 +3493,7 @@ sub printCSharpdocComment($$$$)
 		} else {
 			$line =~ s/(const )?QC?StringList(\s*&)?/ArrayList/g;
 		}
-		$line =~ s/NodeList|KTrader::OfferList/ArrayList/g;
+		$line =~ s/NodeList|TDETrader::OfferList/ArrayList/g;
 		$line =~ s/(const )?TQDate(Time)?(\s*&)?/DateTime/g;
 		$line =~ s/(const )?TQTime([^r])/DateTime$1/g;
 		$line =~ s/TQString::null/null/g;
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index bfd4582c..7feca3ff 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -1204,7 +1204,7 @@ BEGIN
 'KToolBarRadioGroup*' => 'kde_KToolBarRadioGroup*',
 'KToolBarSeparator*' => 'kde_KToolBarSeparator*',
 'KToolButtonType'  => 'int' ,
-'KTrader*'  =>  'kde_KTrader*' ,
+'TDETrader*'  =>  'kde_TDETrader*' ,
 'KTypeList*' => 'kde_KTypeList*',
 'KURIFilter*'  =>  'kde_KURIFilter*' ,
 'KURIFilterData&'  => 'kde_KURIFilterData*' ,
@@ -1374,7 +1374,7 @@ BEGIN
 'Object_stub*' => 'kde_Object_stub*',
 'Observer*' => 'kde_Observer*',
 'OfferList'  =>  'kde_OfferList*' ,
-'KTrader::OfferList'  =>  'kde_OfferList*' ,
+'TDETrader::OfferList'  =>  'kde_OfferList*' ,
 'Offset' => 'int',
 'OnewayDispatchFunction' => 'kde_OnewayDispatchFunction*',
 'OnewayInvocation&' => 'kde_OnewayInvocation*',
@@ -2867,7 +2867,7 @@ sub addNamespace
 
 	if ( $className =~ /^(OfferList)/ )
 	{
-		return "KTrader::".$className;
+		return "TDETrader::".$className;
 	}
 
 	if ( $className =~ /^(BlockSelectionInterface|ClipboardInterface|CodeCompletionInterface|CompletionEntry|ConfigInterface|Cursor|CursorInterface|Document|EditInterface|Editor|HighlightingInterface|Mark|MarkInterface|PopupMenuInterface|PrintInterface|SearchInterface|SelectionInterface|UndoInterface|View|ViewCursorInterface)/ )
-- 
cgit v1.2.1