Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 29 insertions, 29 deletions

diff --git a/cvs2cl.pl b/cvs2cl.pl
index 7d1f5f0..e633a5e 100644
--- a/cvs2cl.pl
+++ b/cvs2cl.pl
@@ -822,17 +822,17 @@ sub derive_change_log ()
       foreach my $time (sort {$main::a <=> $main::b} (keys %$timehash))
       {
         my $msghash = $timehash->{$time};
-        while (my ($msg,$qunklist) = each %$msghash)
+        while (my ($msg,$quntdelist) = each %$msghash)
         {
  	  my $stamptime = $stamptime{$msg};
           if ((defined $stamptime)
               and (($time - $stamptime) < $Max_Checkin_Duration)
               and (defined $changelog{$stamptime}{$author}{$msg}))
           {
- 	    push(@{$changelog{$stamptime}{$author}{$msg}}, @$qunklist);
+ 	    push(@{$changelog{$stamptime}{$author}{$msg}}, @$quntdelist);
           }
           else {
-            $changelog{$time}{$author}{$msg} = $qunklist;
+            $changelog{$time}{$author}{$msg} = $quntdelist;
             $stamptime{$msg} = $time;
           }
         }
@@ -941,14 +941,14 @@ sub derive_change_log ()
         # We sort here to enable predictable ordering for the testing porpoises
         for my $msg (sort keys %$mesghash)
         {
-          my $qunklist = $mesghash->{$msg};
+          my $quntdelist = $mesghash->{$msg};
 
           ## MJP: 19.xii.01 : Exclude @ignore_tags
           for my $ignore_tag (keys %ignore_tags) {
             next FOOBIE
               if grep($_ eq $ignore_tag, map(@{$_->{tags}},
                                              grep(defined $_->{tags},
-                                                  @$qunklist)));
+                                                  @$quntdelist)));
           }
           ## MJP: 19.xii.01 : End exclude @ignore_tags
 	
@@ -957,10 +957,10 @@ sub derive_change_log ()
             next FOOBIE
               if !grep(exists $show_tags{$_}, map(@{$_->{tags}},
                                                   grep(defined $_->{tags},
-                                                       @$qunklist)));
+                                                       @$quntdelist)));
           }
 
-          my $files               = &pretty_file_list ($qunklist);
+          my $files               = &pretty_file_list ($quntdelist);
           my $header_line;          # date and author
           my $body;                 # see below
           my $wholething;           # $header_line + $body
@@ -1014,7 +1014,7 @@ sub derive_change_log ()
             # performed.  Files which were added have no line change
             # indicator, whereas deleted files have state dead.
             #
-            foreach $qunk ( @$qunklist )
+            foreach $qunk ( @$quntdelist )
             {
               if ( "dead" eq $qunk->{'state'})
               {
diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index 51595d3..f1729b0 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -141,7 +141,7 @@
 2004-05-20  Richard Dale  <[email protected]>
 
 	* 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 c57735f..e7530b0 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 7538621..c7cc076 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 caae60c..6e8f69d 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 1812996..49c8930 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -927,19 +927,19 @@ my $fhn =1; # static
 	    print $fh "#include <ntqurl.h>\n";
 		delete $includes{"ntqurl.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 '';