4 files changed, 20 insertions, 20 deletions
diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
index 4af3dc73..f23ed602 100644
--- a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qmakeapp.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qmakeapp.tar.gz qmakeapp.png
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
 
 
 install( FILES
-    qmakeapp.kdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
+    qmakeapp.tdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qmakeapp/Makefile.am b/languages/cpp/app_templates/qmakeapp/Makefile.am
index 233717d7..11a39e79 100644
--- a/languages/cpp/app_templates/qmakeapp/Makefile.am
+++ b/languages/cpp/app_templates/qmakeapp/Makefile.am
@@ -4,10 +4,10 @@ dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.tdevelop \
 templateName = qmakeapp
 
 ### no need to change below:
-template_DATA = $(templateName).kdevtemplate
+template_DATA = $(templateName).tdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/kdevappwizard
+appwizarddatadir = ${kde_datadir}/tdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
index 48a9bd99..04ec68cb 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop
@@ -10,7 +10,7 @@
       <keyword>Qt</keyword>
     </keywords>
   </general>
-  <kdevfileview>
+  <tdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -21,18 +21,18 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>  
     </tree> 
-  </kdevfileview>
-  <kdevcppsupport>
+  </tdevfileview>
+  <tdevcppsupport>
     <qt>
       <used>true</used>
       <version>3</version>
       <includestyle>3</includestyle>
-      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <designerintegration>EmbeddedTDevDesigner</designerintegration>
       <root>%{QTDIR}</root>
       <qmake>%{QMAKE}</qmake>
     </qt>
-  </kdevcppsupport>
-  <kdevdoctreeview>
+  </tdevcppsupport>
+  <tdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -69,8 +69,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
+  </tdevdoctreeview>
+  <tdevdebugger>
     <general>
       <dbgshell/>
       <breakpoints/>
@@ -85,28 +85,28 @@
       <demanglenames>true</demanglenames>
     </display>
     <breakpoints/>
-  </kdevdebugger>  
-  <kdevtrollproject>
+  </tdevdebugger>  
+  <tdevtrollproject>
     <run>
       <mainprogram>./bin/%{APPNAMELC}</mainprogram>
       <programargs/>
     </run>
-  </kdevtrollproject>
+  </tdevtrollproject>
   <workspace>
     <openfiles/> 
   </workspace>
-  <kdevfilecreate>
+  <tdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="ts" />
     </useglobaltypes>
-  </kdevfilecreate>
-  <kdevdocumentation>
+  </tdevfilecreate>
+  <tdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </kdevdocumentation>
+  </tdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate
index b89e8a52..b89e8a52 100644
--- a/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate
+++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate