Revert to .kdevelop files with <kdevelop> entity name for project files.

This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e044c5463329652f28565dfc7de24ef8b0edaa6f)

14 files changed, 25 insertions, 25 deletions

diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt
index 8129bbc1..bbfc746f 100644
--- a/languages/java/app_templates/javahello/CMakeLists.txt
+++ b/languages/java/app_templates/javahello/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( javahello.tar.gz ALL
   COMMAND tar zcf javahello.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Main.java build.xml javahello.filelist javahello.tdevelop
+    Main.java build.xml javahello.filelist javahello.kdevelop
 )
 
 
diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am
index f47e7056..8551a6ac 100644
--- a/languages/java/app_templates/javahello/Makefile.am
+++ b/languages/java/app_templates/javahello/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop
+dataFiles = Main.java build.xml javahello.filelist javahello.kdevelop
 templateName= javahello
 
 ### no need to change below:
diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.kdevelop
index a41fae72..c3eb6898 100644
--- a/languages/java/app_templates/javahello/javahello.tdevelop
+++ b/languages/java/app_templates/javahello/javahello.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
   <general>
     <author>%{AUTHOR}</author>
     <email>%{EMAIL}</email>
@@ -66,4 +66,4 @@
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
   </kdevfileview>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/app_templates/javahello/javahello.kdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate
index 62fcffc5..a7427704 100644
--- a/languages/java/app_templates/javahello/javahello.kdevtemplate
+++ b/languages/java/app_templates/javahello/javahello.kdevtemplate
@@ -73,8 +73,8 @@ Archive=javahello.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/javahello.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/javahello.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt
index 042872fd..3b4abe1e 100644
--- a/languages/java/app_templates/kappjava/CMakeLists.txt
+++ b/languages/java/app_templates/kappjava/CMakeLists.txt
@@ -12,7 +12,7 @@
 add_custom_target( kappjava.tar.gz ALL
   COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.java pref.java appview.java app_client.java appui.rc
-    src-Makefile.am kappjava.png app.tdevelop subdirs
+    src-Makefile.am kappjava.png app.kdevelop subdirs
 )
 
 
diff --git a/languages/java/app_templates/kappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am
index edbd4468..4cda2ef7 100644
--- a/languages/java/app_templates/kappjava/Makefile.am
+++ b/languages/java/app_templates/kappjava/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.java pref.java appview.java  app_client.java appui.rc \
-	src-Makefile.am kappjava.png app.tdevelop subdirs
+	src-Makefile.am kappjava.png app.kdevelop subdirs
 templateName = kappjava
 
 ### no need to change below:
diff --git a/languages/java/app_templates/kappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.kdevelop
index 7ee74558..078f5c1a 100644
--- a/languages/java/app_templates/kappjava/app.tdevelop
+++ b/languages/java/app_templates/kappjava/app.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -85,4 +85,4 @@
       <type ext="java"/>
     </useglobaltypes>
   </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/app_templates/kappjava/kappjava.kdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
index 92cf4710..9f444195 100644
--- a/languages/java/app_templates/kappjava/kappjava.kdevtemplate
+++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate
@@ -78,8 +78,8 @@ File=%{tdevelop}/template-common/dockbook.kdevtemplate
 [FILE4]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE5]
 Type=install
diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt
index 58932352..160b1a14 100644
--- a/languages/java/app_templates/superwaba/CMakeLists.txt
+++ b/languages/java/app_templates/superwaba/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( superwaba.tar.gz ALL
   COMMAND tar zcf superwaba.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
+    superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
 )
 
 
diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am
index bc706fe6..8c27b8d5 100644
--- a/languages/java/app_templates/superwaba/Makefile.am
+++ b/languages/java/app_templates/superwaba/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist
+dataFiles = superwaba.png sw.java src-Makefile sw.kdevelop sw.filelist
 templateName = superwaba
 
 ### no need to change below:
diff --git a/languages/java/app_templates/superwaba/superwaba b/languages/java/app_templates/superwaba/superwaba
index 17183f35..779df155 100644
--- a/languages/java/app_templates/superwaba/superwaba
+++ b/languages/java/app_templates/superwaba/superwaba
@@ -31,8 +31,8 @@ Dest=%{dest}
 
 [PROJECT]
 Type=install
-Source=%{src}/sw.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/sw.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILELIST]
 Type=install
diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
index 27257770..1ea0a785 100644
--- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate
+++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate
@@ -110,8 +110,8 @@ Dest=%{dest}
 [PROJECT]
 Type=install
 EscapeXML=true
-Source=%{src}/sw.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/sw.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILELIST]
 Type=install
diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.kdevelop
index 11db7411..bddee282 100644
--- a/languages/java/app_templates/superwaba/sw.tdevelop
+++ b/languages/java/app_templates/superwaba/sw.kdevelop
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tdevelop>
+<kdevelop>
  <general>
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
@@ -91,4 +91,4 @@
    <type ext="java"/>
   </useglobaltypes>
  </kdevfilecreate>
-</tdevelop>
+</kdevelop>
diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp
index c4aa7390..f9bbbd88 100644
--- a/languages/java/javasupportpart.cpp
+++ b/languages/java/javasupportpart.cpp
@@ -508,12 +508,12 @@ JavaSupportPart::parseProject( )
     TQMap< TQString, TQPair<uint, uint> > pcs;
 
     if( TQFileInfo( project()->projectDirectory() + "/" +
-			    project()->projectName().lower() + ".tdevelop.pcs" ).exists() )
+			    project()->projectName().lower() + ".kdevelop.pcs" ).exists() )
     {
-        d.rename(project()->projectName().lower() + ".tdevelop.pcs",
-			project()->projectName() + ".tdevelop.pcs");
+        d.rename(project()->projectName().lower() + ".kdevelop.pcs",
+			project()->projectName() + ".kdevelop.pcs");
     }
-    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".tdevelop.pcs");
+    TQFile f(project()->projectDirectory() + "/" + project()->projectName() + ".kdevelop.pcs");
     if( f.open(IO_ReadOnly) ){
 	stream.setDevice( &f );
 
@@ -846,7 +846,7 @@ void JavaSupportPart::saveProjectSourceInfo( )
 	return;
 
     TQFile f( project()->projectDirectory() + "/" +
-		    project()->projectName() + ".tdevelop.pcs" );
+		    project()->projectName() + ".kdevelop.pcs" );
     if( !f.open( IO_WriteOnly ) )
 	return;