Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

58 files changed, 318 insertions, 318 deletions

diff --git a/parts/appwizard/CMakeLists.txt b/parts/appwizard/CMakeLists.txt
index 8a69f06e..bdeaf541 100644
--- a/parts/appwizard/CMakeLists.txt
+++ b/parts/appwizard/CMakeLists.txt
@@ -35,18 +35,18 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard )
+install( FILES kdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard )
 
 
-##### libtdevappwizard (module) #################
+##### libkdevappwizard (module) #################
 
-tde_add_kpart( libtdevappwizard AUTOMOC
+tde_add_kpart( libkdevappwizard AUTOMOC
   SOURCES
     appwizardfactory.cpp appwizardpart.cpp appwizarddlg.cpp
     importdlg.cpp filepropspagebase.ui filepropspage.cpp
     appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui
-    tdevfile.cpp tdevlicense.cpp profilesupport.cpp
+    kdevfile.cpp kdevlicense.cpp profilesupport.cpp
   LINK profileengine-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/appwizard/Makefile.am b/parts/appwizard/Makefile.am
index 012f6f29..34af3163 100644
--- a/parts/appwizard/Makefile.am
+++ b/parts/appwizard/Makefile.am
@@ -7,22 +7,22 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets \
 	-I$(top_srcdir)/src/profileengine/lib $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevappwizard.la
-libtdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/util/libtdevutil.la \
-	$(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
+kde_module_LTLIBRARIES = libkdevappwizard.la
+libkdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/util/libkdevutil.la \
+	$(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la
 
-libtdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
+libkdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \
 		appwizarddlg.cpp importdlg.cpp filepropspagebase.ui filepropspage.cpp \
 		appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui\
-		tdevfile.cpp tdevlicense.cpp profilesupport.cpp
+		kdevfile.cpp kdevlicense.cpp profilesupport.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevappwizard.desktop
+service_DATA = kdevappwizard.desktop
 
-rcdir = $(kde_datadir)/tdevappwizard
-rc_DATA = tdevappwizard.rc
+rcdir = $(kde_datadir)/kdevappwizard
+rc_DATA = kdevappwizard.rc
 noinst_HEADERS = profilesupport.h
diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index 4cbf716d..d5160075 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -64,14 +64,14 @@
 #include <tqlayout.h>
 
 #include "domutil.h"
-#include "tdevversioncontrol.h"
-#include "tdevmakefrontend.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugincontroller.h"
-#include "tdevappfrontend.h"
-#include "tdevplugininfo.h"
-#include "tdevlicense.h"
-#include "tdevcore.h"
+#include "kdevversioncontrol.h"
+#include "kdevmakefrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugincontroller.h"
+#include "kdevappfrontend.h"
+#include "kdevplugininfo.h"
+#include "kdevlicense.h"
+#include "kdevcore.h"
 #include "appwizardfactory.h"
 #include "appwizardpart.h"
 #include "filepropspage.h"
@@ -309,8 +309,8 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch
     appname_edit->setValidator(appname_edit_validator);
 
     // insert the licenses into the license_combo
-    TQDict< TDevLicense > lics( licenses() );
-    TQDictIterator< TDevLicense > dit(lics);
+    TQDict< KDevLicense > lics( licenses() );
+    TQDictIterator< KDevLicense > dit(lics);
     int idx=1;
     for( ; dit.current(); ++dit )
     {
@@ -356,8 +356,8 @@ void AppWizardDialog::loadVcs()
 		}
 		TQStringList args;
 		TQObject *obj = factory->create(0, service->name().latin1(),
-									"TDevVCSIntegrator", args);
-		TDevVCSIntegrator *integrator = (TDevVCSIntegrator*) obj;
+									"KDevVCSIntegrator", args);
+		KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj;
 
 		if (!integrator)
 			kdDebug(9010) << "    failed to create vcs integrator " << service->name() << endl;
@@ -418,20 +418,20 @@ void AppWizardDialog::licenseChanged()
 			edit->setText( TQString() );
 		}
 	} else {
-		TDevLicense* lic = licenses()[ license_combo->currentText() ];
+		KDevLicense* lic = licenses()[ license_combo->currentText() ];
 		for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) {
 			TQString style = (*it).style;
 			TQMultiLineEdit *edit = (*it).edit;
 
-			TDevFile::CommentingStyle commentStyle = TDevFile::CPPStyle;
+			KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle;
 			if (style == "PStyle") {
-				commentStyle = TDevFile::PascalStyle;
+				commentStyle = KDevFile::PascalStyle;
 			} else if (style == "AdaStyle") {
-				commentStyle = TDevFile::AdaStyle;
+				commentStyle = KDevFile::AdaStyle;
 			} else if (style == "ShellStyle") {
-				commentStyle = TDevFile::BashStyle;
+				commentStyle = KDevFile::BashStyle;
 			} else if (style == "XMLStyle") {
-				commentStyle = TDevFile::XMLStyle;
+				commentStyle = KDevFile::XMLStyle;
 			}
 
 			TQString text;
@@ -577,7 +577,7 @@ void AppWizardDialog::accept()
     if( license_combo->currentItem() != 0 )
     {
         licenseName = license_combo->currentText();
-        TDevLicense* lic = licenses()[ licenseName ];
+        KDevLicense* lic = licenses()[ licenseName ];
         if( lic )
         {
             TQStringList files( lic->copyFiles() );
@@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file)
 	}
 }
 
-TQDict<TDevLicense> AppWizardDialog::licenses()
+TQDict<KDevLicense> AppWizardDialog::licenses()
 {
 	return m_licenses;
 }
@@ -1291,7 +1291,7 @@ void AppWizardDialog::loadLicenses()
 		TQString licPath( dirs->findResource( "licenses", *it ) );
 		kdDebug(9010) << "Loading license file: " << licPath << endl;
 		TQString licName = licPath.mid( licPath.findRev('/') + 1 );
-		TDevLicense* lic = new TDevLicense( licName, licPath );
+		KDevLicense* lic = new KDevLicense( licName, licPath );
 		m_licenses.insert( licName, lic );
 	}
 	// kdDebug(9010) << "======================== Done loadLicenses" << endl;
diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h
index 4a160bd2..392cd1b6 100644
--- a/parts/appwizard/appwizarddlg.h
+++ b/parts/appwizard/appwizarddlg.h
@@ -32,12 +32,12 @@ class ProfileSupport;
 #include <tqstringlist.h>
 #include <tdelistview.h>
 #include <kiconview.h>
-#include "tdevversioncontrol.h"
-#include "tdevvcsintegrator.h"
+#include "kdevversioncontrol.h"
+#include "kdevvcsintegrator.h"
 #include "appwizarddlgbase.h"
 #include "vcs_form.h"
 //#include "autoform.h"
-#include "tdevlicense.h"
+#include "kdevlicense.h"
 
 namespace PropertyLib {
 	class PropertyList;
@@ -132,7 +132,7 @@ public:
 protected:
     virtual void accept();
 
-	virtual TQDict<TDevLicense> licenses();
+	virtual TQDict<KDevLicense> licenses();
 	void loadLicenses();
 
 protected slots:
@@ -181,7 +181,7 @@ private: //data
     TQDict<TQListViewItem> m_categoryMap;
 	TQValueList<TQListViewItem*> m_categoryItems;
     //! A list of currently available version control systems
-//    TQDict<TDevVersionControl> m_availVcs;
+//    TQDict<KDevVersionControl> m_availVcs;
 
     TQHBoxLayout *m_custom_options_layout;
 	PropertyLib::PropertyEditor *m_customOptions;
@@ -195,8 +195,8 @@ private: //data
 	TDEPopupMenu* m_favouritesMenu;
 	TDEPopupMenu* m_templatesMenu;
 
-	TQDict<TDevLicense> m_licenses;
-	TQDict<TDevVCSIntegrator> m_integrators;
+	TQDict<KDevLicense> m_licenses;
+	TQDict<KDevVCSIntegrator> m_integrators;
 	TQMap<int, VCSDialog*> m_integratorDialogs;
 
 	ProfileSupport *m_profileSupport;
diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp
index 6749add0..5288105d 100644
--- a/parts/appwizard/appwizardfactory.cpp
+++ b/parts/appwizard/appwizardfactory.cpp
@@ -11,30 +11,30 @@
 
 
 #include <kstandarddirs.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include "appwizardfactory.h"
 
-static const TDevPluginInfo data("tdevappwizard");
-K_EXPORT_COMPONENT_FACTORY( libtdevappwizard, AppWizardFactory )
+static const KDevPluginInfo data("kdevappwizard");
+K_EXPORT_COMPONENT_FACTORY( libkdevappwizard, AppWizardFactory )
 
 AppWizardFactory::AppWizardFactory()
-    : TDevGenericFactory<AppWizardPart>( data )
+    : KDevGenericFactory<AppWizardPart>( data )
 {
 }
 
 TDEInstance *AppWizardFactory::createInstance()
 {
-    TDEInstance *instance = TDevGenericFactory<AppWizardPart>::createInstance();
+    TDEInstance *instance = KDevGenericFactory<AppWizardPart>::createInstance();
     TDEStandardDirs *dirs = instance->dirs();
-    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/templates/");
-    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "tdevappwizard/imports/");
-    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "tdevappwizard/importfiles/");
+    dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/templates/");
+    dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "kdevappwizard/imports/");
+    dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "kdevappwizard/importfiles/");
 
     return instance;
 }
 
-const TDevPluginInfo *AppWizardFactory::info()
+const KDevPluginInfo *AppWizardFactory::info()
 {
     return &data;
 }
diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h
index 3de35631..3bbc6e1e 100644
--- a/parts/appwizard/appwizardfactory.h
+++ b/parts/appwizard/appwizardfactory.h
@@ -12,18 +12,18 @@
 #ifndef _APPWIZARDFACTORY_H_
 #define _APPWIZARDFACTORY_H_
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 #include "appwizardpart.h"
 
-class TDevPluginInfo;
+class KDevPluginInfo;
 
-class AppWizardFactory : public TDevGenericFactory<AppWizardPart>
+class AppWizardFactory : public KDevGenericFactory<AppWizardPart>
 {
 public:
     AppWizardFactory();
     
-    static const TDevPluginInfo *info();
+    static const KDevPluginInfo *info();
 
 protected:
     virtual TDEInstance *createInstance();
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index ada3b362..dd2fae65 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -19,7 +19,7 @@
 #include <tdelocale.h>
 #include <tdemessagebox.h>
 #include <kprocess.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
@@ -28,17 +28,17 @@
 #include "importdlg.h"
 #include "appwizarddlg.h"
 #include "appwizardfactory.h"
-#include <tdevmakefrontend.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
-#include <tdevcore.h>
+#include <kdevmakefrontend.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
+#include <kdevcore.h>
 #include <codemodel.h>
 
 AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
+    : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart")
 {
     setInstance(AppWizardFactory::instance());
-    setXMLFile("tdevappwizard.rc");
+    setXMLFile("kdevappwizard.rc");
 
     TDEAction *action;
 
diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h
index 901d51ad..59280631 100644
--- a/parts/appwizard/appwizardpart.h
+++ b/parts/appwizard/appwizardpart.h
@@ -13,7 +13,7 @@
 #define _APPWIZARDPART_H_
 
 #include <tqguardedptr.h>
-#include "tdevplugin.h"
+#include "kdevplugin.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <kurl.h>
@@ -21,7 +21,7 @@
 class AppWizardDialog;
 
 
-class AppWizardPart : public TDevPlugin
+class AppWizardPart : public KDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt
index 81ee38b4..62a5b97b 100644
--- a/parts/appwizard/common/CMakeLists.txt
+++ b/parts/appwizard/common/CMakeLists.txt
@@ -20,7 +20,7 @@ generate_tar( gnome2.tar.gz gnome2 macros )
 generate_tar( gnu.tar.gz gnu AUTHORS COPYING ChangeLog INSTALL NEWS README TODO )
 generate_tar( wxwidgets.tar.gz wx macros )
 generate_tar( incadmin.tar.gz incadmin config.guess config.sub depcomp install-sh ltmain.sh  missing  mkinstalldirs )
-generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py )
+generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py )
 
 install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/admin.tar.gz
@@ -29,18 +29,18 @@ install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/gnome.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz
     ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz
-    tde-app.lsm tde-Makefile.am tde-Makefile.cvs
+    kde-app.lsm kde-Makefile.am kde-Makefile.cvs
     tde-configure.in.in tde-index.docbook
-    tde-po-Makefile.am tde-doc-Makefile.am
-    tde-doc-en-Makefile.am hi16-app-app.png
+    kde-po-Makefile.am kde-doc-Makefile.am
+    kde-doc-en-Makefile.am hi16-app-app.png
     hi32-app-app.png tde-app.desktop
     tde-part.desktop gnome-app.lsm
     gnome-Makefile.am gnome-Makefile.cvs
     gnome-pixmaps-Makefile.am gnome-app.png
     wx-configure.in wx-Makefile.am wx-Makefile.cvs
     COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD
-    Artistic admin.tdevtemplate gnu.tdevtemplate
-    dockbook.tdevtemplate incadmin.tdevtemplate
-    gnome2.tdevtemplate scons.tdevtemplate
+    Artistic admin.kdevtemplate gnu.kdevtemplate
+    dockbook.kdevtemplate incadmin.kdevtemplate
+    gnome2.kdevtemplate scons.kdevtemplate
     ${CMAKE_CURRENT_BINARY_DIR}/scons.tar.gz
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/template-common )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/template-common )
diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am
index e068df5b..2d6e5278 100644
--- a/parts/appwizard/common/Makefile.am
+++ b/parts/appwizard/common/Makefile.am
@@ -28,19 +28,19 @@ incadmin.tar.gz:
 	gzip incadmin.tar
 
 scons.tar.gz:
-	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py
+	$(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py
 	gzip scons.tar
 
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 commondatadir = ${appwizarddatadir}/template-common
 commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \
-	tde-app.lsm tde-Makefile.am tde-Makefile.cvs tde-configure.in.in \
-	tde-index.docbook tde-po-Makefile.am tde-doc-Makefile.am tde-doc-en-Makefile.am \
+	kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \
+	tde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \
 	hi16-app-app.png hi32-app-app.png tde-app.desktop tde-part.desktop \
 	gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \
 	gnome-pixmaps-Makefile.am gnome-app.png \
 	wx-configure.in wx-Makefile.am wx-Makefile.cvs \
 	COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD Artistic \
-	admin.tdevtemplate gnu.tdevtemplate dockbook.tdevtemplate\
-	incadmin.tdevtemplate gnome2.tdevtemplate scons.tdevtemplate scons.tar.gz
+	admin.kdevtemplate gnu.kdevtemplate dockbook.kdevtemplate\
+	incadmin.kdevtemplate gnome2.kdevtemplate scons.kdevtemplate scons.tar.gz
 
diff --git a/parts/appwizard/common/admin.tdevtemplate b/parts/appwizard/common/admin.kdevtemplate
index 73573b47..73573b47 100644
--- a/parts/appwizard/common/admin.tdevtemplate
+++ b/parts/appwizard/common/admin.kdevtemplate
diff --git a/parts/appwizard/common/dockbook.tdevtemplate b/parts/appwizard/common/dockbook.kdevtemplate
index 41b65f62..41b65f62 100644
--- a/parts/appwizard/common/dockbook.tdevtemplate
+++ b/parts/appwizard/common/dockbook.kdevtemplate
diff --git a/parts/appwizard/common/gnome2.tdevtemplate b/parts/appwizard/common/gnome2.kdevtemplate
index ce4e3f3d..ce4e3f3d 100644
--- a/parts/appwizard/common/gnome2.tdevtemplate
+++ b/parts/appwizard/common/gnome2.kdevtemplate
diff --git a/parts/appwizard/common/gnu.tdevtemplate b/parts/appwizard/common/gnu.kdevtemplate
index e1876440..e1876440 100644
--- a/parts/appwizard/common/gnu.tdevtemplate
+++ b/parts/appwizard/common/gnu.kdevtemplate
diff --git a/parts/appwizard/common/incadmin.tdevtemplate b/parts/appwizard/common/incadmin.kdevtemplate
index d7fbfb61..d7fbfb61 100644
--- a/parts/appwizard/common/incadmin.tdevtemplate
+++ b/parts/appwizard/common/incadmin.kdevtemplate
diff --git a/parts/appwizard/common/tde-Makefile.am b/parts/appwizard/common/kde-Makefile.am
index 06057100..06057100 100644
--- a/parts/appwizard/common/tde-Makefile.am
+++ b/parts/appwizard/common/kde-Makefile.am
diff --git a/parts/appwizard/common/tde-Makefile.cvs b/parts/appwizard/common/kde-Makefile.cvs
index 4c0afd1a..4c0afd1a 100644
--- a/parts/appwizard/common/tde-Makefile.cvs
+++ b/parts/appwizard/common/kde-Makefile.cvs
diff --git a/parts/appwizard/common/tde-app.lsm b/parts/appwizard/common/kde-app.lsm
index 06055a96..06055a96 100644
--- a/parts/appwizard/common/tde-app.lsm
+++ b/parts/appwizard/common/kde-app.lsm
diff --git a/parts/appwizard/common/tde-doc-Makefile.am b/parts/appwizard/common/kde-doc-Makefile.am
index a1f777a1..a1f777a1 100644
--- a/parts/appwizard/common/tde-doc-Makefile.am
+++ b/parts/appwizard/common/kde-doc-Makefile.am
diff --git a/parts/appwizard/common/tde-doc-en-Makefile.am b/parts/appwizard/common/kde-doc-en-Makefile.am
index bdd63b79..bdd63b79 100644
--- a/parts/appwizard/common/tde-doc-en-Makefile.am
+++ b/parts/appwizard/common/kde-doc-en-Makefile.am
diff --git a/parts/appwizard/common/tde-po-Makefile.am b/parts/appwizard/common/kde-po-Makefile.am
index 0fa209cd..0fa209cd 100644
--- a/parts/appwizard/common/tde-po-Makefile.am
+++ b/parts/appwizard/common/kde-po-Makefile.am
diff --git a/parts/appwizard/common/scons.tdevtemplate b/parts/appwizard/common/scons.kdevtemplate
index 84ed350f..84ed350f 100644
--- a/parts/appwizard/common/scons.tdevtemplate
+++ b/parts/appwizard/common/scons.kdevtemplate
diff --git a/parts/appwizard/common/scons/admin/tde.py b/parts/appwizard/common/scons/admin/kde.py
index 2fe7a4c9..d194fd84 100644
--- a/parts/appwizard/common/scons/admin/tde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -1,4 +1,4 @@
-# Made from scons qt.py and (heavily) modified into tde.py
+# Made from scons qt.py and (heavily) modified into kde.py
 # Thomas Nagy, 2004, 2005 <tnagy2^8@yahoo.fr>
 
 """
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 15f432b2..5f07f5b4 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -37,9 +37,9 @@
 #include <tdeparts/componentfactory.h>
 #include <kprocess.h>
 
-#include "tdevcore.h"
-#include "tdevversioncontrol.h"
-#include "tdevplugincontroller.h"
+#include "kdevcore.h"
+#include "kdevversioncontrol.h"
+#include "kdevplugincontroller.h"
 
 #include "domutil.h"
 #include "settings.h"
@@ -272,7 +272,7 @@ void ImportDialog::dirChanged()
     // KDevelop legacy project?
     TQStringList files = dir.entryList("*.kdevprj");
     if (!files.isEmpty()) {
-        scanLegacyTDevelopProject(dir.absFilePath(files.first()));
+        scanLegacyKDevelopProject(dir.absFilePath(files.first()));
         return;
     }
 
@@ -328,7 +328,7 @@ void ImportDialog::dirChanged()
 }
 
 
-void ImportDialog::scanLegacyTDevelopProject(const TQString &fileName)
+void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName)
 {
     kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl;
 
@@ -524,7 +524,7 @@ void ImportDialog::slotFinishedCheckout( TQString destinationDir )
 void ImportDialog::slotFetchModulesFromRepository()
 {
 
-    TDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
+    KDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() );
     if (!vcs)
         return;
 
diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h
index af4d3859..5b334668 100644
--- a/parts/appwizard/importdlg.h
+++ b/parts/appwizard/importdlg.h
@@ -48,7 +48,7 @@ private slots:
     void slotProjectNameChanged( const TQString &_text );
 private:
 //    void scanAvailableVCS();
-    void scanLegacyTDevelopProject(const TQString &fileName);
+    void scanLegacyKDevelopProject(const TQString &fileName);
     void scanLegacyStudioProject(const TQString &fileName);
     void scanAutomakeProject(const TQString &dirName);
     void setProjectType(const TQString &type);
diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt
index d59750c4..e7b303c3 100644
--- a/parts/appwizard/imports/CMakeLists.txt
+++ b/parts/appwizard/imports/CMakeLists.txt
@@ -10,16 +10,16 @@
 #################################################
 
 install( FILES
-    c-auto cpp-auto fortran-auto java-auto tde gnome c cpp
+    c-auto cpp-auto fortran-auto java-auto kde gnome c cpp
     fortran python php perl java java-ant qttmake qtqmake
     qt4qmake ruby pascal ada
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/imports )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports )
 
 install( FILES
     c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop
-    java-auto.tdevelop tde.tdevelop gnome.tdevelop
+    java-auto.tdevelop kde.tdevelop gnome.tdevelop
     c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop
     php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop
     qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop
     ruby.tdevelop pascal.tdevelop ada.tdevelop
-  DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/importfiles )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles )
diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am
index aaefd91f..c7f74dcd 100644
--- a/parts/appwizard/imports/Makefile.am
+++ b/parts/appwizard/imports/Makefile.am
@@ -1,7 +1,7 @@
-appwizarddatadir = ${kde_datadir}/tdevappwizard
+appwizarddatadir = ${kde_datadir}/kdevappwizard
 importsdir = ${appwizarddatadir}/imports
 importfilesdir = ${appwizarddatadir}/importfiles
 
-imports_DATA = c-auto cpp-auto fortran-auto java-auto tde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
-importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop tde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
+imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome                    c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada
+importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop 		   java-auto.tdevelop kde.tdevelop gnome.tdevelop 		   c.tdevelop cpp.tdevelop fortran.tdevelop 		   python.tdevelop php.tdevelop perl.tdevelop 		   java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop 		   pascal.tdevelop ada.tdevelop
 
diff --git a/parts/appwizard/imports/ada.tdevelop b/parts/appwizard/imports/ada.tdevelop
index 188fbea6..cdb35b40 100644
--- a/parts/appwizard/imports/ada.tdevelop
+++ b/parts/appwizard/imports/ada.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevadaproject>
+ <kdevadaproject>
   <run>
    <terminal>true</terminal>
   </run>
- </tdevadaproject>
- <tdevdoctreeview>
+ </kdevadaproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -63,11 +63,11 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="adb"/>
    <type ext="ads"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c-auto.tdevelop b/parts/appwizard/imports/c-auto.tdevelop
index 002e6e1d..892dd88d 100644
--- a/parts/appwizard/imports/c-auto.tdevelop
+++ b/parts/appwizard/imports/c-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -32,13 +32,13 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevdebugger>
+ </kdevautoproject>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,12 +85,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/c.tdevelop b/parts/appwizard/imports/c.tdevelop
index e578fba4..e0c06089 100644
--- a/parts/appwizard/imports/c.tdevelop
+++ b/parts/appwizard/imports/c.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -65,12 +65,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="c" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp-auto.tdevelop b/parts/appwizard/imports/cpp-auto.tdevelop
index 0a1b05b1..74de8db0 100644
--- a/parts/appwizard/imports/cpp-auto.tdevelop
+++ b/parts/appwizard/imports/cpp-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -30,13 +30,13 @@
         <cxxflags>-O0 -g3</cxxflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevdebugger>
+ </kdevautoproject>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -81,13 +81,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/cpp.tdevelop b/parts/appwizard/imports/cpp.tdevelop
index 3eade8de..b351de38 100644
--- a/parts/appwizard/imports/cpp.tdevelop
+++ b/parts/appwizard/imports/cpp.tdevelop
@@ -4,21 +4,21 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
- <tdevdoctreeview>
+ </kdevdebugger>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -63,13 +63,13 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <filetypes/>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran-auto.tdevelop b/parts/appwizard/imports/fortran-auto.tdevelop
index 4be630a6..8fdd5f89 100644
--- a/parts/appwizard/imports/fortran-auto.tdevelop
+++ b/parts/appwizard/imports/fortran-auto.tdevelop
@@ -9,7 +9,7 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,15 +57,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/fortran.tdevelop b/parts/appwizard/imports/fortran.tdevelop
index e7141b4f..c852870e 100644
--- a/parts/appwizard/imports/fortran.tdevelop
+++ b/parts/appwizard/imports/fortran.tdevelop
@@ -4,16 +4,16 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>Fortran77</primarylanguage>
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
   </general>
- </tdevautoproject>
- <tdevdoctreeview>
+ </kdevautoproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -61,15 +61,15 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="f"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/gnome.tdevelop b/parts/appwizard/imports/gnome.tdevelop
index cad92fda..0b8c5c95 100644
--- a/parts/appwizard/imports/gnome.tdevelop
+++ b/parts/appwizard/imports/gnome.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>C</primarylanguage>
   <ignoreparts>
-   <part>TDevJavaDebugger</part>
+   <part>KDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <tdevautoproject>
+ <kdevautoproject>
   <general>
    <useconfiguration>debug</useconfiguration>
   </general>
@@ -31,8 +31,8 @@
         <cflags>-O0 -g3</cflags>
       </debug>
     </configurations>
- </tdevautoproject>
- <tdevfileview>
+ </kdevautoproject>
+ <kdevfileview>
   <groups>
    <group pattern="*.c;*.h" name="Sources" />
    <group pattern="*.glade" name="User Interface" />
@@ -40,8 +40,8 @@
    <group pattern="*.po" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -85,16 +85,16 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="c"/>
       <type ext="h"/>      
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-ant.tdevelop b/parts/appwizard/imports/java-ant.tdevelop
index 1d64dc64..a4db806b 100644
--- a/parts/appwizard/imports/java-ant.tdevelop
+++ b/parts/appwizard/imports/java-ant.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevAntProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevcustomproject>
+ <kdevcustomproject>
   <build>
    <buildtool>ant</buildtool>
   </build>
- </tdevcustomproject>
- <tdevdoctreeview>
+ </kdevcustomproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -59,10 +59,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java-auto.tdevelop b/parts/appwizard/imports/java-auto.tdevelop
index f5de6138..9a42ec82 100644
--- a/parts/appwizard/imports/java-auto.tdevelop
+++ b/parts/appwizard/imports/java-auto.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/java.tdevelop b/parts/appwizard/imports/java.tdevelop
index f5de6138..9a42ec82 100644
--- a/parts/appwizard/imports/java.tdevelop
+++ b/parts/appwizard/imports/java.tdevelop
@@ -7,10 +7,10 @@
   <projectmanagement>KDevAutoProject</projectmanagement>
   <primarylanguage>Java</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevdoctreeview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -54,10 +54,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="java"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/tde b/parts/appwizard/imports/kde
index 13614802..13614802 100644
--- a/parts/appwizard/imports/tde
+++ b/parts/appwizard/imports/kde
diff --git a/parts/appwizard/imports/tde.tdevelop b/parts/appwizard/imports/kde.tdevelop
index fe54fadc..5bff727f 100644
--- a/parts/appwizard/imports/tde.tdevelop
+++ b/parts/appwizard/imports/kde.tdevelop
@@ -11,7 +11,7 @@
    <keyword>KDE</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -19,8 +19,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -57,17 +57,17 @@
     <ignoreqt_xml>
       <toc>qmake User Guide</toc>
     </ignoreqt_xml>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/pascal.tdevelop b/parts/appwizard/imports/pascal.tdevelop
index 7db5a9d8..551ac91e 100644
--- a/parts/appwizard/imports/pascal.tdevelop
+++ b/parts/appwizard/imports/pascal.tdevelop
@@ -11,12 +11,12 @@
    <keyword>Code</keyword>
   </keywords>
  </general>
- <tdevpascalproject>
+ <kdevpascalproject>
   <run>
    <terminal>true</terminal>
   </run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -64,12 +64,12 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
   <useglobaltypes>
    <type ext="pp"/>
    <type ext="pas"/>
    <type ext="dpr"/>
   </useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/perl.tdevelop b/parts/appwizard/imports/perl.tdevelop
index 0b4f4fba..bbf18ee3 100644
--- a/parts/appwizard/imports/perl.tdevelop
+++ b/parts/appwizard/imports/perl.tdevelop
@@ -9,11 +9,11 @@
   <ignoreparts>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <run>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="perl"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/php.tdevelop b/parts/appwizard/imports/php.tdevelop
index 4135828b..64651d3b 100644
--- a/parts/appwizard/imports/php.tdevelop
+++ b/parts/appwizard/imports/php.tdevelop
@@ -11,11 +11,11 @@
    <part>KDevdistpart</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
   </general>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>kde</toc>
@@ -23,15 +23,15 @@
    <toc>python</toc>
    <toc>perl</toc>
   </ignoretocs>
- </tdevdoctreeview>
-<tdevphpsupport>
+ </kdevdoctreeview>
+<kdevphpsupport>
 	<codeHelp>
 	   <codeCompletion>true</codeCompletion>
 	   <codeHinting>true</codeHinting>
 	   <realtimeParsing>false</realtimeParsing>
 	  </codeHelp>
-</tdevphpsupport>
- <tdevdoctreeview>
+</kdevphpsupport>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>ada</toc>
       <toc>ada_bugs_gcc</toc>
@@ -75,10 +75,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="php"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/python.tdevelop b/parts/appwizard/imports/python.tdevelop
index d85480b9..3c6ece1a 100644
--- a/parts/appwizard/imports/python.tdevelop
+++ b/parts/appwizard/imports/python.tdevelop
@@ -7,15 +7,15 @@
   <projectmanagement>KDevScriptProject</projectmanagement>
   <primarylanguage>Python</primarylanguage>
   <ignoreparts>
-   <part>TDevDebugger</part>
-   <part>TDevJavaDebugger</part>
+   <part>KDevDebugger</part>
+   <part>KDevJavaDebugger</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <run>
   </run>
- </tdevscriptproject>
- <tdevdoctreeview>
+ </kdevscriptproject>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -60,10 +60,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="py"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt-auto.tdevelop b/parts/appwizard/imports/qt-auto.tdevelop
index a8ac37de..b4bba39e 100644
--- a/parts/appwizard/imports/qt-auto.tdevelop
+++ b/parts/appwizard/imports/qt-auto.tdevelop
@@ -10,7 +10,7 @@
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,8 +18,8 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
   <ignoretocs>
    <toc>gtk</toc>
    <toc>gnustep</toc>
@@ -27,17 +27,17 @@
    <toc>php</toc>
    <toc>perl</toc>
   </ignoretocs>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell>libtool</dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt.tdevelop b/parts/appwizard/imports/qt.tdevelop
index 713510e0..6b716a7b 100644
--- a/parts/appwizard/imports/qt.tdevelop
+++ b/parts/appwizard/imports/qt.tdevelop
@@ -4,13 +4,13 @@
   <author>%{AUTHOR}</author>
   <email>%{EMAIL}</email>
   <version>%{VERSION}</version>
-  <projectmanagement>TDevCustomProject</projectmanagement>
+  <projectmanagement>KDevCustomProject</projectmanagement>
   <primarylanguage>C++</primarylanguage>
   <keywords>
    <keyword>Qt</keyword>
   </keywords>
  </general>
- <tdevfileview>
+ <kdevfileview>
   <groups>
    <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
    <group pattern="*.ui" name="User Interface" />
@@ -18,21 +18,21 @@
    <group pattern="*.po;*.ts" name="Translations" />
    <group pattern="*" name="Others" />
   </groups>
- </tdevfileview>
- <tdevcustomproject>
+ </kdevfileview>
+ <kdevcustomproject>
   <run>
   </run>
- </tdevcustomproject>
- <tdevdebugger>
+ </kdevcustomproject>
+ <kdevdebugger>
   <general>
    <dbgshell></dbgshell>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qt4qmake.tdevelop b/parts/appwizard/imports/qt4qmake.tdevelop
index e211a470..3be6c94c 100644
--- a/parts/appwizard/imports/qt4qmake.tdevelop
+++ b/parts/appwizard/imports/qt4qmake.tdevelop
@@ -10,15 +10,15 @@
    <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>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,26 +55,26 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
- <tdevcppsupport>
+ </kdevdebugger>
+ <kdevcppsupport>
    <qt>
      <version>4</version>
      <used>true</used>
      <includestyle>4</includestyle>
      <designerintegration>ExternalDesigner</designerintegration>
    </qt>
- </tdevcppsupport>
-  <tdevfilecreate>
+ </kdevcppsupport>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
       <type ext="qrc" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qtqmake.tdevelop b/parts/appwizard/imports/qtqmake.tdevelop
index 8a9d6b17..2e9b089a 100644
--- a/parts/appwizard/imports/qtqmake.tdevelop
+++ b/parts/appwizard/imports/qtqmake.tdevelop
@@ -10,15 +10,15 @@
    <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>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -55,25 +55,25 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
- <tdevcppsupport>
+ </kdevdebugger>
+ <kdevcppsupport>
    <qt>
      <version>3</version>
      <used>true</used>
      <includestyle>3</includestyle>
      <designerintegration>KDevEmbeddedDesigner</designerintegration>
    </qt>
- </tdevcppsupport>
-  <tdevfilecreate>
+ </kdevcppsupport>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/qttmake.tdevelop b/parts/appwizard/imports/qttmake.tdevelop
index 015f4278..713655b6 100644
--- a/parts/appwizard/imports/qttmake.tdevelop
+++ b/parts/appwizard/imports/qttmake.tdevelop
@@ -10,15 +10,15 @@
    <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>
- <tdevdoctreeview>
+ </kdevfileview>
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -58,17 +58,17 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
- <tdevdebugger>
+ </kdevdoctreeview>
+ <kdevdebugger>
   <general>
    <dbgshell/>
   </general>
- </tdevdebugger>
-  <tdevfilecreate>
+ </kdevdebugger>
+  <kdevfilecreate>
     <useglobaltypes>
       <type ext="ui" />
       <type ext="cpp" />
       <type ext="h" />
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/imports/ruby.tdevelop b/parts/appwizard/imports/ruby.tdevelop
index 0a29b0a7..90dbe34a 100644
--- a/parts/appwizard/imports/ruby.tdevelop
+++ b/parts/appwizard/imports/ruby.tdevelop
@@ -13,22 +13,22 @@
    <part>KDevDoxygen</part>
    <part>KDevdistpart</part>
    <part>KDevVisualBoyAdvance</part>
-   <part>TDevDebugger</part>
+   <part>KDevDebugger</part>
   </ignoreparts>
  </general>
- <tdevscriptproject>
+ <kdevscriptproject>
   <general>
 		<activedir>src</activedir>
 		<includepatterns>*.rb</includepatterns>
 		<excludepatterns>*~</excludepatterns>
   </general>
- </tdevscriptproject>
- <tdevfileview>
+ </kdevscriptproject>
+ <kdevfileview>
 	 <groups>
 	   <group pattern="*.rb" name="Scripts" />
 	 </groups>
- </tdevfileview>											 
- <tdevdoctreeview>
+ </kdevfileview>											 
+ <kdevdoctreeview>
     <ignoretocs>
       <toc>bash</toc>
       <toc>bash_bugs</toc>
@@ -73,10 +73,10 @@
     <ignoredoxygen>
       <toc>KDE Libraries (Doxygen)</toc>
     </ignoredoxygen>
- </tdevdoctreeview>
-  <tdevfilecreate>
+ </kdevdoctreeview>
+  <kdevfilecreate>
     <useglobaltypes>
 			<type ext="rb"/>
     </useglobaltypes>
-  </tdevfilecreate>
+  </kdevfilecreate>
 </tdevelop>
diff --git a/parts/appwizard/tdevappwizard.desktop b/parts/appwizard/kdevappwizard.desktop
index bda84ba5..fa9dd541 100644
--- a/parts/appwizard/tdevappwizard.desktop
+++ b/parts/appwizard/kdevappwizard.desktop
@@ -36,7 +36,7 @@ Comment[tg]=Устои сохтани гузориш
 Comment[tr]=Uygulama Sihirbazı
 Comment[zh_CN]=应用程序向导
 Comment[zh_TW]=應用程式精靈
-Name=TDevAppWizard
+Name=KDevAppWizard
 Name[da]=TDevelop Programguide
 Name[de]=Anwendungs-Assistent (TDevelop)
 Name[hi]=के-डेव-एप-विज़ार्ड
@@ -81,7 +81,7 @@ GenericName[tr]=Uygulama Sihirbazı
 GenericName[zh_CN]=应用程序向导
 GenericName[zh_TW]=應用程式精靈
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevappwizard
+X-TDE-Library=libkdevappwizard
 X-TDevelop-Scope=Core
 X-TDevelop-Version=5
 X-TDevelop-Properties=ProjectCreation
diff --git a/parts/appwizard/tdevappwizard.rc b/parts/appwizard/kdevappwizard.rc
index 2705a29f..c86e0f44 100644
--- a/parts/appwizard/tdevappwizard.rc
+++ b/parts/appwizard/kdevappwizard.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevAppWizard" version="1">
+<kpartgui name="KDevAppWizard" version="1">
 <MenuBar>
   <Menu name="project" >
     <Action name="project_new" group="project_new"/>
diff --git a/parts/appwizard/tdevfile.cpp b/parts/appwizard/kdevfile.cpp
index 4a748d47..4edb62c7 100644
--- a/parts/appwizard/tdevfile.cpp
+++ b/parts/appwizard/kdevfile.cpp
@@ -16,31 +16,31 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevfile.h"
+#include "kdevfile.h"
 
 static struct MimeTypeMapping
 {
 	const char* szMimeType;
-	TDevFile::CommentingStyle commentStyle;
+	KDevFile::CommentingStyle commentStyle;
 } mimeTypeMapping[] = {
-{	"text/x-c++hdr",            TDevFile::CPPStyle           },
-{	"text/x-c++src",            TDevFile::CPPStyle           },
-{	"text/x-chdr",              TDevFile::CStyle             },
-{	"text/x-csrc",              TDevFile::CStyle             },
-{	"text/adasrc",              TDevFile::AdaStyle           },
-{	"text/x-pascal",            TDevFile::PascalStyle        },
-{	"text/x-perl",              TDevFile::BashStyle          },
-{	"text/xml",                 TDevFile::XMLStyle           },
-{	"text/x-xslt",              TDevFile::XMLStyle           },
-{	"text/x-xslfo",             TDevFile::XMLStyle           },
-{	"text/html",                TDevFile::XMLStyle           },
-{	"text/docbook",             TDevFile::XMLStyle           },
-{	"application/x-php",        TDevFile::CPPStyle           },
-{	"application/x-shellscript",TDevFile::BashStyle          },
-{	NULL,                       TDevFile::NoCommenting       }
+{	"text/x-c++hdr",            KDevFile::CPPStyle           },
+{	"text/x-c++src",            KDevFile::CPPStyle           },
+{	"text/x-chdr",              KDevFile::CStyle             },
+{	"text/x-csrc",              KDevFile::CStyle             },
+{	"text/adasrc",              KDevFile::AdaStyle           },
+{	"text/x-pascal",            KDevFile::PascalStyle        },
+{	"text/x-perl",              KDevFile::BashStyle          },
+{	"text/xml",                 KDevFile::XMLStyle           },
+{	"text/x-xslt",              KDevFile::XMLStyle           },
+{	"text/x-xslfo",             KDevFile::XMLStyle           },
+{	"text/html",                KDevFile::XMLStyle           },
+{	"text/docbook",             KDevFile::XMLStyle           },
+{	"application/x-php",        KDevFile::CPPStyle           },
+{	"application/x-shellscript",KDevFile::BashStyle          },
+{	NULL,                       KDevFile::NoCommenting       }
 };
 
-TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString& mimeType )
+KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType )
 {
 	int idx = 0;
 	while( mimeTypeMapping[idx].szMimeType )
@@ -49,10 +49,10 @@ TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString&
 			return mimeTypeMapping[idx].commentStyle;
 		idx++;
 	}
-	return TDevFile::NoCommenting;
+	return KDevFile::NoCommenting;
 }
 
-TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
+KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType )
 {
 	return commentingStyleFromMimeType( mimeType->name() );
 }
diff --git a/parts/appwizard/tdevfile.h b/parts/appwizard/kdevfile.h
index b1280f54..6b2e2699 100644
--- a/parts/appwizard/tdevfile.h
+++ b/parts/appwizard/kdevfile.h
@@ -18,18 +18,18 @@
 */
 
 /**
-@file tdevfile.h
+@file kdevfile.h
 File abstraction layer.
 */
-#ifndef TDEVFILE_H
-#define TDEVFILE_H
+#ifndef KDEVFILE_H
+#define KDEVFILE_H
 
 #include <kmimetype.h>
 
 /**
 File abstraction.
 */
-class TDevFile
+class KDevFile
 {
 public:
     /**Styles of comment-formats a source file can have.*/
diff --git a/parts/appwizard/tdevlicense.cpp b/parts/appwizard/kdevlicense.cpp
index a720c6c3..5e189422 100644
--- a/parts/appwizard/tdevlicense.cpp
+++ b/parts/appwizard/kdevlicense.cpp
@@ -16,19 +16,19 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevlicense.h"
+#include "kdevlicense.h"
 
 #include <tqfile.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
-TDevLicense::TDevLicense( const TQString& name, const TQString& fileName )
+KDevLicense::KDevLicense( const TQString& name, const TQString& fileName )
 	: m_name( name )
 {
 	readFile( fileName );
 }
 
-void TDevLicense::readFile( const TQString& fileName )
+void KDevLicense::readFile( const TQString& fileName )
 {
 	TQFile f(fileName);
 	if (!f.open(IO_ReadOnly))
@@ -57,7 +57,7 @@ void TDevLicense::readFile( const TQString& fileName )
 
 }
 
-TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
+TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces )
 {
 	// first, build a CPP Style license
 	
@@ -82,29 +82,29 @@ TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const
 
 	switch( commentingStyle )
 	{
-		case TDevFile::CPPStyle:
-		case TDevFile::CStyle:
+		case KDevFile::CPPStyle:
+		case KDevFile::CStyle:
 			return str;
 			
-		case TDevFile::PascalStyle:
+		case KDevFile::PascalStyle:
 			str.replace(TQRegExp("/\\**\n \\*"), "{\n  ");
 			str.replace(TQRegExp("\\*\n \\*"), " \n  ");
 			str.replace(TQRegExp(" *\\**/\n"), "}\n");
 			return str;
 			
-		case TDevFile::AdaStyle:
+		case KDevFile::AdaStyle:
 			str.replace(TQRegExp("/\\*"), "--");
 			str.replace(TQRegExp(" \\*"), "--");
 			str.replace(TQRegExp("\\*/"), "*");
 			return str;
 			
-		case TDevFile::BashStyle:
+		case KDevFile::BashStyle:
 			str.replace(TQRegExp("\\*|/"), "#");
 			str.replace(TQRegExp("\n ##"), "\n##");
 			str.replace(TQRegExp("\n #"), "\n# ");
 			return str;
 
-		case TDevFile::XMLStyle:
+		case KDevFile::XMLStyle:
 			str.replace(TQRegExp("/\\*"), "<!--");
 			str.replace(TQRegExp("\n \\*"), "\n<!--");
 			str.replace(TQRegExp("\\*/?\n"), "-->\n");
diff --git a/parts/appwizard/tdevlicense.h b/parts/appwizard/kdevlicense.h
index d61aebc3..2e81c9ec 100644
--- a/parts/appwizard/tdevlicense.h
+++ b/parts/appwizard/kdevlicense.h
@@ -16,30 +16,30 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEVLICENSE_H
-#define TDEVLICENSE_H
+#ifndef KDEVLICENSE_H
+#define KDEVLICENSE_H
 
 /**
-@file tdevfile.h
+@file kdevfile.h
 The interface to installed licenses.
 */
 
 #include <tqstringlist.h>
 
-#include "tdevfile.h"
+#include "kdevfile.h"
 
 /*The interface to installed licenses.*/
-class TDevLicense
+class KDevLicense
 {
 public:
-    /**Constructs a TDevLicense and loads the given license template file.
+    /**Constructs a KDevLicense and loads the given license template file.
     @param name The name of this license.
     @param fileName The file name where license template text is kept.*/
-    TDevLicense(const TQString& name, const TQString& fileName);
+    KDevLicense(const TQString& name, const TQString& fileName);
 
 public:
     /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/
-    TQString assemble(TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
+    TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces );
 
     /**
     * returns the name of this license.
diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp
index 3c5a5a35..ac5da870 100644
--- a/parts/appwizard/profilesupport.cpp
+++ b/parts/appwizard/profilesupport.cpp
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 
-#include <tdevplugincontroller.h>
+#include <kdevplugincontroller.h>
 
-ProfileSupport::ProfileSupport(TDevPlugin *parent)
+ProfileSupport::ProfileSupport(KDevPlugin *parent)
 {
     KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard");
     
diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h
index 11e9b201..b18a9620 100644
--- a/parts/appwizard/profilesupport.h
+++ b/parts/appwizard/profilesupport.h
@@ -20,11 +20,11 @@
 #ifndef PROFILESUPPORT_H
 #define PROFILESUPPORT_H
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class ProfileSupport{
 public:
-    ProfileSupport(TDevPlugin *parent);
+    ProfileSupport(KDevPlugin *parent);
     bool isInTemplateList(const TQString &templateUrl);
     
 private: