4 files changed, 23 insertions, 23 deletions
diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
index ef38e012..57849362 100644
--- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
+++ b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt
@@ -19,9 +19,9 @@ add_custom_target( qtopia4app.tar.gz ALL
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
 install( FILES
-    qtopia4app.tdevtemplate
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates )
+    qtopia4app.kdevtemplate
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates )
diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am
index 8dcaa585..324291bb 100644
--- a/languages/cpp/app_templates/qtopia4app/Makefile.am
+++ b/languages/cpp/app_templates/qtopia4app/Makefile.am
@@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.desktop \
 templateName = qtopia4app
 
 ### 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 -f9 $(templateName).tar
diff --git a/languages/cpp/app_templates/qtopia4app/app.tdevelop b/languages/cpp/app_templates/qtopia4app/app.tdevelop
index 320ae4d7..b890135e 100644
--- a/languages/cpp/app_templates/qtopia4app/app.tdevelop
+++ b/languages/cpp/app_templates/qtopia4app/app.tdevelop
@@ -11,7 +11,7 @@
     </keywords>
     <ignoreparts/>
   </general>
-  <tdevfileview>
+  <kdevfileview>
     <groups>
       <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
@@ -22,8 +22,8 @@
       <hidenonprojectfiles>false</hidenonprojectfiles>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
     </tree>
-  </tdevfileview>
-  <tdevdoctreeview>
+  </kdevfileview>
+  <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,8 +61,8 @@
     <ignoredoxygen>
       <toc>TDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
-  </tdevdoctreeview>
-  <tdevdebugger>
+  </kdevdoctreeview>
+  <kdevdebugger>
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs></programargs>
@@ -75,8 +75,8 @@
       <staticmembers>false</staticmembers>
       <demanglenames>true</demanglenames>
     </display>
-  </tdevdebugger>
-  <tdevtrollproject>
+  </kdevdebugger>
+  <kdevtrollproject>
     <general>
       <activedir></activedir>
     </general>
@@ -105,11 +105,11 @@
 	<envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" />
       </envvars>
     </make>
-  </tdevtrollproject>
-  <tdevfilecreate>
+  </kdevtrollproject>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes/>
-  </tdevfilecreate>
+  </kdevfilecreate>
   <cppsupportpart>
     <codecompletion>
       <codehinting outputview="1" enablech="0" selectview="0" />
@@ -128,11 +128,11 @@
       <lowercasefilenames>true</lowercasefilenames>
     </filetemplates>
   </cppsupportpart>
-  <tdevclassview>
+  <kdevclassview>
     <folderhierarchy>true</folderhierarchy>
     <depthoffolders>2</depthoffolders>
-  </tdevclassview>
-  <tdevcvs>
+  </kdevclassview>
+  <kdevcvs>
     <cvsoptions>-f</cvsoptions>
     <commitoptions></commitoptions>
     <updateoptions>-dP</updateoptions>
@@ -141,14 +141,14 @@
     <diffoptions>-u3 -p</diffoptions>
     <logoptions></logoptions>
     <rshoptions></rshoptions>
-  </tdevcvs>
-  <tdevdocumentation>
+  </kdevcvs>
+  <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
       <docurl>%{APPNAMELC}.tag</docurl>
     </projectdoc>
-  </tdevdocumentation>
-  <tdevcppsupport>    
+  </kdevdocumentation>
+  <kdevcppsupport>    
     <qt>
       <used>true</used>
       <version>4</version>
@@ -159,5 +159,5 @@
       <designer>/opt/Qtopia/SDK/4.2.4/x86/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
-  </tdevcppsupport>
+  </kdevcppsupport>
 </tdevelop>
diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate
index e6a7ec9e..e6a7ec9e 100644
--- a/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate
+++ b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate