Rename a number of libraries and executables to avoid conflicts with KDE4

8 files changed, 40 insertions, 40 deletions

diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index 15fe6676..be1c44e6 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -273,7 +273,7 @@
 
 	* Fixed parsing default argument values cast to a numeric literal, eg:
 	    mode_t mode = (mode_t)-1
-	* Excluded a couple of structs from kparts/browserextension
+	* Excluded a couple of structs from tdeparts/browserextension
 
 2003-11-04  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 
diff --git a/kalyptus/README b/kalyptus/README
index e56448e4..ee3d36c9 100644
--- a/kalyptus/README
+++ b/kalyptus/README
@@ -52,7 +52,7 @@ KDE headers
 
 # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp'
 kalyptus -fjava test/tmp/*.h test/tmp/dom/*.h test/tmp/kio/*.h test/tmp/tdeprint/*.h \
-   test/tmp/kjs/*.h test/tmp/kparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libkmid/*.h
+   test/tmp/kjs/*.h test/tmp/tdeparts/*.h test/tmp/tdesu/*.h test/ktextedit/*.h test/tmp/libtdemid/*.h
 
 # Shorten generated filenames
 mv DOM__Node.cpp DOMNode.cpp
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 3b318f94..ec89863e 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -2449,12 +2449,12 @@ sub preParseClass
 	    $className eq 'TDEIO::MetaData' ||
 	    $className eq 'KFileMimeTypeInfo::ItemInfo' ||
 	    $className eq 'TDEIO::UDSAtom' ||
-	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
-	    $className eq 'khtml::MouseDoubleClickEvent' ||
-	    $className eq 'khtml::MouseMoveEvent' ||
-	    $className eq 'khtml::MousePressEvent' ||
-	    $className eq 'khtml::MouseReleaseEvent' ||
-	    $className eq 'khtml::MouseEvent' ||
+	    $className eq 'tdehtml::DrawContentsEvent' || # the tdehtml:: classes build, but don't link
+	    $className eq 'tdehtml::MouseDoubleClickEvent' ||
+	    $className eq 'tdehtml::MouseMoveEvent' ||
+	    $className eq 'tdehtml::MousePressEvent' ||
+	    $className eq 'tdehtml::MouseReleaseEvent' ||
+	    $className eq 'tdehtml::MouseEvent' ||
 	    $className eq 'KURL::List' ||
 	    $className eq 'KWin::Info' ||
 	    $className eq 'TerminalInterface' ||
@@ -3355,7 +3355,7 @@ sub addIncludeForClass($$$)
 {
     my ( $node, $addInclude, $debugMe ) = @_;
     my $sourcename = $node->{Source}->{astNodeName};
-    if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+    if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $node->{astNodeName}" if ( $sourcename eq '' );
@@ -3624,7 +3624,7 @@ sub generateMethod($$$$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -4155,7 +4155,7 @@ sub generateAllMethods($$$$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
 #    die "Empty source name for $classNode->{astNodeName} $classNode->{Source}->{astNodeName}" if ( $sourcename eq '' );
@@ -4164,7 +4164,7 @@ sub generateAllMethods($$$$$$$$)
     	$addInclude->{$sourcename} = 1;
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index d1aa7c3f..2bc86651 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -756,12 +756,12 @@ sub preParseClass
 	    $className eq 'TDEIO::MetaData' ||
 	    $className eq 'KFileMimeTypeInfo::ItemInfo' ||
 	    $className eq 'TDEIO::UDSAtom' ||
-	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
-	    $className eq 'khtml::MouseDoubleClickEvent' ||
-	    $className eq 'khtml::MouseMoveEvent' ||
-	    $className eq 'khtml::MousePressEvent' ||
-	    $className eq 'khtml::MouseReleaseEvent' ||
-	    $className eq 'khtml::MouseEvent' ||
+	    $className eq 'tdehtml::DrawContentsEvent' || # the tdehtml:: classes build, but don't link
+	    $className eq 'tdehtml::MouseDoubleClickEvent' ||
+	    $className eq 'tdehtml::MouseMoveEvent' ||
+	    $className eq 'tdehtml::MousePressEvent' ||
+	    $className eq 'tdehtml::MouseReleaseEvent' ||
+	    $className eq 'tdehtml::MouseEvent' ||
 	    $className eq 'KURL::List' ||
 	    $className eq 'KWin::Info' ||
 	    $className eq 'TerminalInterface' ||
@@ -1732,7 +1732,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2124,7 +2124,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2148,7 +2148,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 07a1ace7..710a5219 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -776,12 +776,12 @@ sub preParseClass
 	    $className eq 'TDEIO::MetaData' ||
 	    $className eq 'KFileMimeTypeInfo::ItemInfo' ||
 	    $className eq 'TDEIO::UDSAtom' ||
-	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
-	    $className eq 'khtml::MouseDoubleClickEvent' ||
-	    $className eq 'khtml::MouseMoveEvent' ||
-	    $className eq 'khtml::MousePressEvent' ||
-	    $className eq 'khtml::MouseReleaseEvent' ||
-	    $className eq 'khtml::MouseEvent' ||
+	    $className eq 'tdehtml::DrawContentsEvent' || # the tdehtml:: classes build, but don't link
+	    $className eq 'tdehtml::MouseDoubleClickEvent' ||
+	    $className eq 'tdehtml::MouseMoveEvent' ||
+	    $className eq 'tdehtml::MousePressEvent' ||
+	    $className eq 'tdehtml::MouseReleaseEvent' ||
+	    $className eq 'tdehtml::MouseEvent' ||
 	    $className eq 'KURL::List' ||
 	    $className eq 'KWin::Info' ||
 	    $className eq 'TerminalInterface' ||
@@ -1777,7 +1777,7 @@ sub generateMethod($$$$$$$)
 			return;
 		}
 
-		if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+		if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 			$sourcename =~ s!.*/(.*)!$1!m;
 		}
 		if ( $sourcename eq '' ) {
@@ -2317,7 +2317,7 @@ sub generateAllMethods($$$$$$)
 
     my $sourcename = $classNode->{Source}->{astNodeName};
     
-	if ( $sourcename !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+	if ( $sourcename !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
     	$sourcename =~ s!.*/(.*)!$1!m;
 	}
     die "Empty source name for $classNode->{astNodeName}" if ( $sourcename eq '' );
@@ -2339,7 +2339,7 @@ sub generateAllMethods($$$$$$)
 	if ($classNode->{astNodeName} ne $main::globalSpaceClassName) {
 #		my $s;
 #        for my $sn( @{$classNode->{Sources}} ) {
-#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
+#    	if ( ($s = $sn->{astNodeName}) !~ s!.*(kio/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/)(.*)!$1$2!m ) {
 #    		$s =~ s!.*/(.*)!$1!m;
 #		}
 #		$addInclude->{$s} = 1;
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index fbfc1b9f..42d9f222 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -230,7 +230,7 @@ BEGIN
    'TQStyle::SubControls' => 'int',
 );
 
-$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|tdeprint/|tdesu/|knewstuff/"
+$headerSubdirectories = "kio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|kabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
 
 }
 
@@ -406,13 +406,13 @@ sub preParseClass
 		$className eq 'KPropertiesDialog' ||
 	    $className eq 'ProgressItem' ||
 	    $className eq 'TDEIO::ChmodInfo' ||
-	    $className eq 'khtml::DrawContentsEvent' || # the khtml:: classes build, but don't link
-	    $className eq 'khtml::MouseDoubleClickEvent' ||
-	    $className eq 'khtml::MouseMoveEvent' ||
-	    $className eq 'khtml::MousePressEvent' ||
-	    $className eq 'khtml::MouseReleaseEvent' ||
-	    $className eq 'khtml::MouseEvent' ||
-	    $className eq 'khtml' ||
+	    $className eq 'tdehtml::DrawContentsEvent' || # the tdehtml:: classes build, but don't link
+	    $className eq 'tdehtml::MouseDoubleClickEvent' ||
+	    $className eq 'tdehtml::MouseMoveEvent' ||
+	    $className eq 'tdehtml::MousePressEvent' ||
+	    $className eq 'tdehtml::MouseReleaseEvent' ||
+	    $className eq 'tdehtml::MouseEvent' ||
+	    $className eq 'tdehtml' ||
 	    $className eq 'KURL::List' ||
 	    $className eq 'KWin::Info' ||
 	    $className eq 'TerminalInterface' ||
diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm
index 555cf30f..8cd2bc12 100644
--- a/kalyptus/kalyptusCxxToSwig.pm
+++ b/kalyptus/kalyptusCxxToSwig.pm
@@ -838,7 +838,7 @@ sub writeClassDoc
 
   my $sourcename = $node->{Source}->{astNodeName};
 
-  if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|kparts|ktexteditor|libkmid)/([^/]*$)! ) {
+  if ( $sourcename =~ m!.*(dom|kabc|tdeprint|tdesu|kio|kjs|tdeparts|tdetexteditor|libtdemid)/([^/]*$)! ) {
     $sourcename = $1."/".$2;
   } else {
     $sourcename =~ s!.*/([^/]*$)!$1!;
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index ed8b1f5d..023c1203 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -2862,7 +2862,7 @@ sub addNamespace
 
 	if ( $className =~ /^(DrawContentsEvent|MouseDoubleClickEvent|MouseEvent|MouseMoveEvent|MousePressEvent|MouseReleaseEvent)/ )
 	{
-		return "khtml::".$className;
+		return "tdehtml::".$className;
 	}
 
 	if ( $className =~ /^(OfferList)/ )