4 files changed, 20 insertions, 20 deletions
diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
index 71d9301b..64b3b0bd 100644
--- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
+++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt
@@ -17,9 +17,9 @@ add_custom_target( qmakesimple.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qmakesimple.tar.gz qmakesimple.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    qmakesimple.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    qmakesimple.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am
index 728d63ba..ac17219f 100644
--- a/languages/cpp/app_templates/qmakesimple/Makefile.am
+++ b/languages/cpp/app_templates/qmakesimple/Makefile.am
@@ -2,10 +2,10 @@ dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro
 templateName = qmakesimple
 
 ### no need to change below:
-template_DATA = $(templateName).tdevtemplate
+template_DATA = $(templateName).kdevtemplate
 templatedir = ${appwizarddatadir}/templates
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 $(templateName).tar.gz: ${dataFiles}
 	$(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles}
 	$(GZIP_COMMAND) -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.tdevelop
index a8e39ca6..2af4f7ad 100644
--- a/languages/cpp/app_templates/qmakesimple/app.tdevelop
+++ b/languages/cpp/app_templates/qmakesimple/app.tdevelop
@@ -10,25 +10,25 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
    <group pattern="*.png" name="Icons" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevcppsupport>
+ </kdevfileview>
+ <kdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
-     <designerintegration>EmbeddedTDevDesigner</designerintegration>
+     <designerintegration>EmbeddedKDevDesigner</designerintegration>
       <root>%{QTDIR}</root>
       <qmake>%{QMAKE}</qmake>
    </qt>
- </tdevcppsupport>
- <tdevdoctreeview>
+ </kdevcppsupport>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -66,8 +66,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <programargs></programargs>
    <gdbpath>/usr/bin/gdb</gdbpath>
@@ -76,25 +76,25 @@
    <floatingtoolbar>false</floatingtoolbar>  
    <dbgshell/>
   </general>
- </tdevdebugger>
- <tdevtrollproject>
+ </kdevdebugger>
+ <kdevtrollproject>
    <run>
     <mainprogram>./bin/%{APPNAMELC}</mainprogram>
     <programargs/>
    </run>
-  </tdevtrollproject>
-  <tdevfilecreate>
+  </kdevtrollproject>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="ts" />
     </useglobaltypes>
-  </tdevfilecreate>
-  <tdevdocumentation>
+  </kdevfilecreate>
+  <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </tdevdocumentation>
+  </kdevdocumentation>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate
index 8f2dbee7..8f2dbee7 100644
--- a/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate
+++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate