Rename many classes and header files to avoid conflicts with KDE4

5 files changed, 21 insertions, 21 deletions

diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index 51595d3f..f1729b0d 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -141,7 +141,7 @@
 2004-05-20  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
 	* The java '-fjni' option now generates correct java code with Qt/E 2.3.4
-	* TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename ktoolBar() and
+	* TDEMainWindow.toolBar() and TDEMainWindow.menuBar() rename tdetoolBar() and
 	  kmenuBar(). This is because java doesn't have covariant return types
 	  and the methods with the same names in TQMainWindow return a TQToolBar
 	  and TQMenuBar, rather than their KDE equivalent subclasses.
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 3878c84b..cbae3cac 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -43,7 +43,7 @@ use vars qw/
 	$qpixmapExtras $qpixmapjniExtras $qpaintdeviceExtras $qpaintdevicejniExtras
 	$qdragobjectExtras $qdragobjectjniExtras $qiodeviceExtras $qpointarrayExtras $qpointarrayjniExtras
 	$qtextcodecExtras $qtextcodecjniExtras $quridragExtras $quridragjniExtras
-	$kapplicationExtras $kapplicationjniExtras $kmainwindowExtras $kmainwindowjniExtras
+	$kapplicationExtras $kapplicationjniExtras $tdemainwindowExtras $tdemainwindowjniExtras
 	$kcmdlineargsjniExtras $schedulerjniExtras
 	$methodNumber
 	%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %javaImports
@@ -1649,7 +1649,7 @@ Java_org_kde_koala_TDEApplication_setJavaSlotFactory(JNIEnv* env, jclass cls)
 	
 EOF
 	
-	$kmainwindowExtras = <<EOF;	
+	$tdemainwindowExtras = <<EOF;	
 	/**
  		List of members of TDEMainWindow class.
 	*/
@@ -1674,7 +1674,7 @@ EOF
 	
 EOF
 	
-	$kmainwindowjniExtras = <<EOF;
+	$tdemainwindowjniExtras = <<EOF;
 JNIEXPORT jobject JNICALL
 Java_org_kde_koala_TDEMainWindow_memberList(JNIEnv* env, jobject obj)
 {
@@ -3085,8 +3085,8 @@ sub writeClassDoc
 		print CLASS $kapplicationExtras;
 		$jniCode .= $kapplicationjniExtras;
 	} elsif ( $className eq 'TDEMainWindow' ) {
-		print CLASS $kmainwindowExtras;
-		$jniCode .= $kmainwindowjniExtras;
+		print CLASS $tdemainwindowExtras;
+		$jniCode .= $tdemainwindowjniExtras;
 	}
 	
     print CLASS "}\n";
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index 44e5525b..3170eb51 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -42,7 +42,7 @@ use vars qw/
 	$qpixmapExtras $qpaintdeviceExtras
 	$qdragobjectExtras $qiodeviceExtras $qpointarrayExtras
 	$qtextcodecExtras $quridragExtras
-	$kapplicationExtras $kmainwindowExtras
+	$kapplicationExtras $tdemainwindowExtras
 	$methodNumber
 	%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %javaImports
 	%skippedClasses %operatorNames /;
@@ -466,7 +466,7 @@ EOF
 EOF
 
 	
-	$kmainwindowExtras = <<EOF;	
+	$tdemainwindowExtras = <<EOF;	
 	/**
  		List of members of TDEMainWindow class.
 	*/
@@ -1321,7 +1321,7 @@ sub writeClassDoc
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 	} elsif ( $className eq 'TDEMainWindow' ) {
-		print CLASS $kmainwindowExtras;
+		print CLASS $tdemainwindowExtras;
 	}
 	
     print CLASS "}\n";
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index f228af7b..ad136a91 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -41,7 +41,7 @@ use vars qw/
 	$qpixmapExtras $qpaintdeviceExtras
 	$qdragobjectExtras $qiodeviceExtras $qpointarrayExtras
 	$qtextcodecExtras $qsizepolicyExtras $quridragExtras
-	$kapplicationExtras $kmainwindowExtras
+	$kapplicationExtras $tdemainwindowExtras
 	$methodNumber
 	%builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap %csharpImports
 	%skippedClasses %operatorNames /;
@@ -484,7 +484,7 @@ EOF
 EOF
 
 	
-	$kmainwindowExtras = <<EOF;	
+	$tdemainwindowExtras = <<EOF;	
 	
 EOF
 
@@ -1348,7 +1348,7 @@ sub writeClassDoc
 	} elsif ( $className eq 'TDEApplication' ) {
 		print CLASS $kapplicationExtras;
 	} elsif ( $className eq 'TDEMainWindow' ) {
-		print CLASS $kmainwindowExtras;
+		print CLASS $tdemainwindowExtras;
 	}
 	
 	
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index b35553b7..4c4bc9ac 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -927,19 +927,19 @@ my $fhn =1; # static
 	    print $fh "#include <qurl.h>\n";
 		delete $includes{"qurl.h"};
 	}
-	if (defined $includes{"kshortcut.h"}) {
-	    print $fh "#include <kshortcut.h>\n";
-		delete $includes{"kshortcut.h"};
+	if (defined $includes{"tdeshortcut.h"}) {
+	    print $fh "#include <tdeshortcut.h>\n";
+		delete $includes{"tdeshortcut.h"};
 	} 
-	if (defined $includes{"kshortcutlist.h"}) {
+	if (defined $includes{"tdeshortcutlist.h"}) {
 	    print $fh "#include <tdeconfigbase.h>\n";
-	    print $fh "#include <kshortcutlist.h>\n";
+	    print $fh "#include <tdeshortcutlist.h>\n";
 		delete $includes{"tdeconfigbase.h"};
-		delete $includes{"kshortcutlist.h"};
+		delete $includes{"tdeshortcutlist.h"};
 	}
-	if (defined $includes{"kaction.h"}) {
-	    print $fh "#include <kaction.h>\n";
-		delete $includes{"kaction.h"};
+	if (defined $includes{"tdeaction.h"}) {
+	    print $fh "#include <tdeaction.h>\n";
+		delete $includes{"tdeaction.h"};
 	}
 	foreach my $incl (keys %includes) {
 	    die if $incl eq '';