Rename KApplication to TDEApplication to avoid conflicts with KDE4

7 files changed, 15 insertions, 15 deletions

diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index 71757756..793c333a 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -208,7 +208,7 @@
 	  - In Invoke() the method call will be looked up dynamically from the Smoke runtime
 	  - The arguments are marsalled from C# to C++ on the Smoke::Stack, and the method
 	    invoked.
-	* The KDE doc comments are converted to C# xml style tags (eg KApplication.cs)
+	* The KDE doc comments are converted to C# xml style tags (eg TDEApplication.cs)
 	* Problems
 	  - A small fix was need for RealProxies with Mono 0.30. DotGnu doesn't have
 	    RealProxies/remoting yet.
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index ba5aa00e..86612a6c 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -300,7 +300,7 @@ BEGIN
 	'Java_org_kde_qt_QUriDrag_decode__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
 	'Java_org_kde_qt_QUriDrag_decodeToUnicodeUris__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
 	'Java_org_kde_qt_QUriDrag_decodeLocalFiles__Lorg_kde_qt_QMimeSourceInterface_2_3Ljava_lang_String_2' => 1,
-	'Java_org_kde_koala_KApplication_setJavaSlotFactory' => 1,
+	'Java_org_kde_koala_TDEApplication_setJavaSlotFactory' => 1,
 	'Java_org_kde_koala_KMainWindow_memberList' => 1,
 	'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2' => 1,
 	'Java_org_kde_koala_KCmdLineArgs_init__I_3Ljava_lang_String_2Lorg_kde_koala_KAboutData_2' => 1,
@@ -1639,7 +1639,7 @@ EOF
 #include <kdejava/KDEJavaSlot.h>
 
 JNIEXPORT void JNICALL
-Java_org_kde_koala_KApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
+Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
 {
 	(void) env;
 	(void) cls;
@@ -2417,7 +2417,7 @@ sub preParseClass
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'KIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
-	    $className eq 'KApplicationPropsPlugin' ||
+	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KPrinter' ||
 	    $className eq 'KPty' ||
 	    $className eq 'KOpenWithHandler' ||
@@ -3081,7 +3081,7 @@ sub writeClassDoc
 		$jniCode .= $kcmdlineargsjniExtras;
 	} elsif ( $className eq 'KIO::Scheduler' ) {
 		$jniCode .= $schedulerjniExtras;
-	} elsif ( $className eq 'KApplication' ) {
+	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 		$jniCode .= $kapplicationjniExtras;
 	} elsif ( $className eq 'KMainWindow' ) {
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 4ba16825..99f589f5 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -724,7 +724,7 @@ sub preParseClass
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'KIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
-	    $className eq 'KApplicationPropsPlugin' ||
+	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KPrinter' ||
 	    $className eq 'KPty' ||
 	    $className eq 'KOpenWithHandler' ||
@@ -1318,7 +1318,7 @@ sub writeClassDoc
 		print CLASS $qpointarrayExtras;
 	} elsif ( $className eq 'TQUriDrag' ) {
 		print CLASS $quridragExtras;
-	} elsif ( $className eq 'KApplication' ) {
+	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 	} elsif ( $className eq 'KMainWindow' ) {
 		print CLASS $kmainwindowExtras;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index a2a103fd..a60803ac 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -744,7 +744,7 @@ sub preParseClass
 	    $className eq 'KEditListBox::CustomEditor' ||
 		$className eq 'KIO::KBookmarkMenuNSImporter' ||
 	    $className eq 'KPerDomainSettings' ||
-	    $className eq 'KApplicationPropsPlugin' ||
+	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KPrinter' ||
 	    $className eq 'KPty' ||
 	    $className eq 'KOpenWithHandler' ||
@@ -1345,7 +1345,7 @@ sub writeClassDoc
 		print CLASS $qsizepolicyExtras;
 	} elsif ( $className eq 'TQUriDrag' ) {
 		print CLASS $quridragExtras;
-	} elsif ( $className eq 'KApplication' ) {
+	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 	} elsif ( $className eq 'KMainWindow' ) {
 		print CLASS $kmainwindowExtras;
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 4c81e93a..f8b5543d 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -380,7 +380,7 @@ sub preParseClass
 	    $className eq 'KExtendedSocket' ||
 	    $className eq 'KSocket' ||
 	    $className eq 'KPerDomainSettings' ||
-	    $className eq 'KApplicationPropsPlugin' ||
+	    $className eq 'TDEApplicationPropsPlugin' ||
 	    $className eq 'KOpenWithHandler' ||
 	    $className eq 'KFileOpenWithHandler' ||
 	    $className eq 'KBindingPropsPlugin' ||
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index df8c8890..2e922a77 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -731,9 +731,9 @@ BEGIN
 'KAlphaPainter*' => 'kde_KAlphaPainter*',
 'KAnimWidget*'  =>  'kde_KAnimWidget*' ,
 'KAppTreeListItem*'  =>  'kde_KAppTreeListItem*' ,
-'KApplication*'  =>  'kde_KApplication*' ,
-'KApplicationPropsPlugin*' => 'kde_KApplicationPropsPlugin*',
-'KApplicationTree*' => 'kde_KApplicationTree*',
+'TDEApplication*'  =>  'kde_TDEApplication*' ,
+'TDEApplicationPropsPlugin*' => 'kde_TDEApplicationPropsPlugin*',
+'TDEApplicationTree*' => 'kde_TDEApplicationTree*',
 'KArchive*' => 'kde_KArchive*',
 'KArchiveDirectory*' => 'kde_KArchiveDirectory*',
 'KArchiveEntry*' => 'kde_KArchiveEntry*',
diff --git a/kalyptus/kdocLib.pm b/kalyptus/kdocLib.pm
index 700564a3..b8fd0b83 100644
--- a/kalyptus/kdocLib.pm
+++ b/kalyptus/kdocLib.pm
@@ -31,9 +31,9 @@ NOTES ON THE NEW FORMAT
 	<VERSION="2.0">
 	<BASE URL="http://www.kde.org/API/tdecore/">
 
-	<C NAME="KApplication" REF="KApplication.html">
+	<C NAME="TDEApplication" REF="TDEApplication.html">
 		<IN NAME="TQObject">
-		<ME NAME="getConfig" REF="KApplication.html#getConfig">
+		<ME NAME="getConfig" REF="TDEApplication.html#getConfig">
 		<M NAME="" REF="">
 	</C>