Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

18 files changed, 80 insertions, 80 deletions

diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt
index e33d897c..f7af5bc6 100644
--- a/buildtools/autotools/CMakeLists.txt
+++ b/buildtools/autotools/CMakeLists.txt
@@ -32,13 +32,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevautoproject.desktop tdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevautoproject )
+install( FILES kdevautoproject.desktop kdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevautoproject )
 
 
-##### libtdevautoproject (module) ###############
+##### libkdevautoproject (module) ###############
 
-tde_add_kpart( libtdevautoproject AUTOMOC
+tde_add_kpart( libkdevautoproject AUTOMOC
   SOURCES
     autoprojectpart.cpp autoprojectwidget.cpp
     configureoptionswidget.cpp configureoptionswidgetbase.ui
@@ -60,6 +60,6 @@ tde_add_kpart( libtdevautoproject AUTOMOC
     autolistviewitems.cpp managecustomcommandsbase.ui
     managecustomcommand.cpp autoprojectviewbase.ui
     autotoolsaction.cpp makefilehandler.cpp
-  LINK tdevautotoolsparser-static tdevbuildbase-shared tdevbuildtoolswidgets-shared
+  LINK kdevautotoolsparser-static kdevbuildbase-shared kdevbuildtoolswidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am
index a704eb29..98f3ad51 100644
--- a/buildtools/autotools/Makefile.am
+++ b/buildtools/autotools/Makefile.am
@@ -7,14 +7,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib -I$(top_srcdir)/buildtools/lib/base \
 	-I$(top_builddir)/buildtools/lib/widgets
 	
 
-kde_module_LTLIBRARIES = libtdevautoproject.la
-libtdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN)
-libtdevautoproject_la_LIBADD = \
-	$(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \
-	$(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \
-	$(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevautoproject.la
+libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN)
+libkdevautoproject_la_LIBADD = \
+	$(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \
+	$(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \
+	$(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la
 
-libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
+libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 			configureoptionswidget.cpp configureoptionswidgetbase.ui subprojectoptionsdlg.cpp \
 			subprojectoptionsdlgbase.ui targetoptionsdlg.cpp targetoptionsdlgbase.ui addservicedlg.cpp \
 			addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \
@@ -30,9 +30,9 @@ libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevautoproject.desktop tdevtdeautoproject.desktop
+service_DATA = kdevautoproject.desktop kdevtdeautoproject.desktop
 
-rcdir = $(kde_datadir)/tdevautoproject
-rc_DATA = tdevautoproject.rc
+rcdir = $(kde_datadir)/kdevautoproject
+rc_DATA = kdevautoproject.rc
 
 noinst_HEADERS = managecustomcommand.h autotoolsaction.h makefilehandler.h
diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp
index 18bf87a8..d3f71637 100644
--- a/buildtools/autotools/addfiledlg.cpp
+++ b/buildtools/autotools/addfiledlg.cpp
@@ -36,7 +36,7 @@
 #include "autoprojectpart.h"
 #include "autoprojectwidget.h"
 
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget,
 							SubprojectItem *spitem, TargetItem *item,
diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp
index fa64c506..59cebc53 100644
--- a/buildtools/autotools/addsubprojectdlg.cpp
+++ b/buildtools/autotools/addsubprojectdlg.cpp
@@ -25,7 +25,7 @@
 
 #include "autolistviewitems.h"
 
-#include "tdevmakefrontend.h"
+#include "kdevmakefrontend.h"
 #include "misc.h"
 #include "autoprojectpart.h"
 #include "autosubprojectview.h"
diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp
index 34060b61..91b6d75c 100644
--- a/buildtools/autotools/autodetailsview.cpp
+++ b/buildtools/autotools/autodetailsview.cpp
@@ -32,13 +32,13 @@
 #include <tdepopupmenu.h>
 
 /** KDevelop */
-#include "tdevappfrontend.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
-#include "tdevcreatefile.h"
-#include "tdevlanguagesupport.h"
-#include "tdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevcreatefile.h"
+#include "kdevlanguagesupport.h"
+#include "kdevmakefrontend.h"
 #include "urlutil.h"
 
 #include "domutil.h"
@@ -294,13 +294,13 @@ void AutoDetailsView::slotAddNewFile()
 	if ( !titem )
 		return;
 
-	TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>("TDevelop/CreateFile");
+	KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("TDevelop/CreateFile");
 	if (createFileSupport)
 	{
-		TDevCreateFile::CreatedFile crFile =
+		KDevCreateFile::CreatedFile crFile =
 			createFileSupport->createNewFile(TQString(),
 			                                 m_widget->selectedSubproject()->path);
-/*		if (crFile.status == TDevCreateFile::CreatedFile::STATUS_OK)
+/*		if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK)
         {
 			FileItem *fitem = m_widget->createFileItem(crFile.filename, m_widget->selectedSubproject());
 			titem->sources.append(fitem);
diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp
index ae5453bc..6b408bd0 100644
--- a/buildtools/autotools/autoprojectpart.cpp
+++ b/buildtools/autotools/autoprojectpart.cpp
@@ -45,34 +45,34 @@
 #include <kprocess.h>
 
 #include <domutil.h>
-#include <tdevcore.h>
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
 #include <makeoptionswidget.h>
 #include <runoptionswidget.h>
 #include <envvartools.h>
 
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 #include <urlutil.h>
 
 #define CONFIGURE_OPTIONS 1
 #define RUN_OPTIONS 2
 #define MAKE_OPTIONS 3
 
-static const TDevPluginInfo data("tdevautoproject");
+static const KDevPluginInfo data("kdevautoproject");
 
-K_EXPORT_COMPONENT_FACTORY( libtdevautoproject, AutoProjectFactory( data ) )
+K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) )
 
 AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args)
-    : TDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
+    : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart")
     , m_lastCompilationFailed(false)
 {
     setInstance(AutoProjectFactory::instance());
 
-    setXMLFile("tdevautoproject.rc");
+    setXMLFile("kdevautoproject.rc");
 
     m_executeAfterBuild = false;
     m_isKDE = (args[0] == "kde");
@@ -310,7 +310,7 @@ void AutoProjectPart::openProject(const TQString &dirName, const TQString &proje
                                    "Project -> Project Options -> Run Options"), i18n("No active target specified"),  "tdevelop_open_project_no_active_target");
     }
 
-    TDevProject::openProject( dirName, projectName );
+    KDevProject::openProject( dirName, projectName );
 }
 
 
@@ -358,7 +358,7 @@ TQString AutoProjectPart::runDirectory() const
     TQString cwd;
     if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() )
     {
-        cwd = defaultRunDirectory("tdevautoproject");
+        cwd = defaultRunDirectory("kdevautoproject");
     }else
     {
         cwd = DomUtil::readEntry( dom, "/kdevautoproject/run/cwd/"+m_widget->activeTarget()->name );
@@ -585,7 +585,7 @@ TQStringList AutoProjectPart::allBuildConfigs() const
     TQStringList allConfigs;
     allConfigs.append("default");
 
-    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations");
     TQDomElement childEl = node.firstChild().toElement();
     while (!childEl.isNull())
     {
@@ -1075,7 +1075,7 @@ TQString AutoProjectPart::updateAdminDirectoryCommand() const
 
     // Find the admin tarball
     TDEStandardDirs dirs;
-    dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/template-common/");
+    dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/template-common/");
     source = dirs.findResource("apptemplates", "admin.tar.gz");
     if (source != "") {
         TQString cmdline = "rm -rf admin && tar -xzvf ";
@@ -1453,7 +1453,7 @@ bool AutoProjectPart::isKDE() const
     return m_isKDE;
 }
 
-TDevProject::Options AutoProjectPart::options() const
+KDevProject::Options AutoProjectPart::options() const
 {
     return UsesAutotoolsBuildSystem;
 }
diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h
index 08d83719..83066c3c 100644
--- a/buildtools/autotools/autoprojectpart.h
+++ b/buildtools/autotools/autoprojectpart.h
@@ -20,8 +20,8 @@
 #include <tqmap.h>
 #include <tqdatetime.h>
 #include <tqdir.h>
-#include <tdevgenericfactory.h>
-#include "tdevbuildtool.h"
+#include <kdevgenericfactory.h>
+#include "kdevbuildtool.h"
 
 class TQDomElement;
 class TQStringList;
@@ -31,7 +31,7 @@ class TDESelectAction;
 class TargetItem;
 class ConfigWidgetProxy;
 
-class AutoProjectPart : public TDevBuildTool
+class AutoProjectPart : public KDevBuildTool
 {
 	Q_OBJECT
   
@@ -41,7 +41,7 @@ public:
 	virtual ~AutoProjectPart();
 
 	/**
-	 * Implementation of the TDevProject interface.
+	 * Implementation of the KDevProject interface.
 	 */
 	virtual TQString projectDirectory() const;
 	virtual TQString projectName() const;
@@ -61,7 +61,7 @@ public:
 	virtual Options options() const;
 
 	/**
-	 * Implementation of the TDevPlugin interface.
+	 * Implementation of the KDevPlugin interface.
 	 */
 	virtual void restorePartialProjectSession ( const TQDomElement* el );
 	virtual void savePartialProjectSession ( TQDomElement* el );
@@ -85,7 +85,7 @@ public:
 
 protected:
 	/**
-	 * Reimplemented from TDevProject. These methods are only
+	 * Reimplemented from KDevProject. These methods are only
 	 * for use by the application core.
 	 */
 	virtual void openProject( const TQString &dirName, const TQString &projectName );
@@ -151,7 +151,7 @@ private:
 	bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list );
 };
 
-typedef TDevGenericFactory<AutoProjectPart> AutoProjectFactory;
+typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory;
 
 #endif
 // kate: indent-mode csands; tab-width 4;
diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp
index c41a60dc..a558a593 100644
--- a/buildtools/autotools/autoprojectwidget.cpp
+++ b/buildtools/autotools/autoprojectwidget.cpp
@@ -42,7 +42,7 @@
 #include <kxmlguiclient.h>
 #include <tdeaction.h>
 
-#include "tdevcore.h"
+#include "kdevcore.h"
 #include "domutil.h"
 #include "misc.h"
 #include "choosetargetdialog.h"
diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp
index 0eecfe4b..8353e2ea 100644
--- a/buildtools/autotools/autosubprojectview.cpp
+++ b/buildtools/autotools/autosubprojectview.cpp
@@ -34,10 +34,10 @@
 #include <tdelistview.h>
 
 /** KDevelop */
-#include <tdevmainwindow.h>
-#include <tdevmakefrontend.h>
-#include <tdevappfrontend.h>
-#include <tdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevmakefrontend.h>
+#include <kdevappfrontend.h>
+#include <kdevcore.h>
 #include <urlutil.h>
 
 /** AutoProject */
diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp
index fad399f3..8b59545f 100644
--- a/buildtools/autotools/choosetargetdialog.cpp
+++ b/buildtools/autotools/choosetargetdialog.cpp
@@ -43,7 +43,7 @@
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
 
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 
 class ChooseTargetDialog::Private
 {
diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp
index c991d15d..cc39aa07 100644
--- a/buildtools/autotools/configureoptionswidget.cpp
+++ b/buildtools/autotools/configureoptionswidget.cpp
@@ -29,7 +29,7 @@
 #include <kservice.h>
 #include <ktrader.h>
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 #include "autoprojectpart.h"
 #include "environmentvariableswidget.h"
 
@@ -310,7 +310,7 @@ void ConfigureOptionsWidget::configRemoved()
     TQString config = config_combo->currentText();
 
     TQDomDocument dom = *m_part->projectDom();
-    TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations");
+    TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations");
     node.removeChild(node.namedItem(config));
     allConfigs.remove(config);
 
@@ -348,7 +348,7 @@ void ConfigureOptionsWidget::f77serviceChanged()
 void ConfigureOptionsWidget::cflagsClicked()
 {
     TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, cflags_edit->text());
@@ -361,7 +361,7 @@ void ConfigureOptionsWidget::cflagsClicked()
 void ConfigureOptionsWidget::cxxflagsClicked()
 {
     TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, cxxflags_edit->text());
@@ -374,7 +374,7 @@ void ConfigureOptionsWidget::cxxflagsClicked()
 void ConfigureOptionsWidget::f77flagsClicked()
 {
     TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names);
-    TDevCompilerOptions *plugin = createCompilerOptions(name);
+    KDevCompilerOptions *plugin = createCompilerOptions(name);
 
     if (plugin) {
         TQString flags = plugin->exec(this, f77flags_edit->text());
@@ -384,7 +384,7 @@ void ConfigureOptionsWidget::f77flagsClicked()
 }
 
 
-TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name)
 {
     KService::Ptr service = KService::serviceByDesktopName(name);
     if (!service) {
@@ -406,13 +406,13 @@ TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 }
diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h
index dfab95cc..e40874de 100644
--- a/buildtools/autotools/configureoptionswidget.h
+++ b/buildtools/autotools/configureoptionswidget.h
@@ -18,7 +18,7 @@
 #include "domutil.h"
 
 
-class TDevCompilerOptions;
+class KDevCompilerOptions;
 class AutoProjectPart;
 class EnvironmentVariablesWidget;
 
@@ -53,7 +53,7 @@ private:
 	void readSettings( const TQString &config );
 	void saveSettings( const TQString &config );
 
-	TDevCompilerOptions *createCompilerOptions( const TQString &lang );
+	KDevCompilerOptions *createCompilerOptions( const TQString &lang );
 	TDETrader::OfferList coffers, cxxoffers, f77offers;
 	TQStringList cservice_names, cservice_execs;
 	TQStringList cxxservice_names, cxxservice_execs;
diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp
index afd09d4b..c10db050 100644
--- a/buildtools/autotools/fileselectorwidget.cpp
+++ b/buildtools/autotools/fileselectorwidget.cpp
@@ -43,7 +43,7 @@
 
 #include "autoprojectwidget.h"
 #include "autoprojectpart.h"
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 
 #include "tdefilednddetailview.h"
 #include "tdefiledndiconview.h"
@@ -140,7 +140,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode,
 
     /* read the file patterns from the project DOM */
     TQDomElement docEl = m_part->projectDom()->documentElement();
-    TQDomElement fileviewEl = docEl.namedItem("tdevfileview").toElement();
+    TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement();
     TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement();
     TQDomElement groupEl = groupsEl.firstChild().toElement();
 
diff --git a/buildtools/autotools/tdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index ad164259..a149c870 100644
--- a/buildtools/autotools/tdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -92,6 +92,6 @@ GenericName[zh_CN]=Automake 工程
 GenericName[zh_TW]=Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libtdevautoproject
+X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=
diff --git a/buildtools/autotools/tdevautoproject.rc b/buildtools/autotools/kdevautoproject.rc
index 5d213e3e..5d213e3e 100644
--- a/buildtools/autotools/tdevautoproject.rc
+++ b/buildtools/autotools/kdevautoproject.rc
diff --git a/buildtools/autotools/tdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index 5ed348d1..b9b6abd8 100644
--- a/buildtools/autotools/tdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -87,6 +87,6 @@ GenericName[zh_CN]=TDE Automake 工程
 GenericName[zh_TW]=TDE Automake 專案
 ServiceTypes=TDevelop/Project
 Icon=make
-X-TDE-Library=libtdevautoproject
+X-TDE-Library=libkdevautoproject
 X-TDevelop-Version=5
 X-TDevelop-Args=kde
diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp
index f1174b21..ec58b54c 100644
--- a/buildtools/autotools/misc.cpp
+++ b/buildtools/autotools/misc.cpp
@@ -21,10 +21,10 @@
 
 #include "misc.h"
 
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.h"
 
 
-static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
+static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent )
 {
 	KService::Ptr service = KService::serviceByDesktopName( name );
 	if ( !service )
@@ -48,13 +48,13 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
         args = TQStringList::split(" ", prop.toString());
 
     TQObject *obj = factory->create(parent, service->name().latin1(),
-                                   "TDevCompilerOptions", args);
+                                   "KDevCompilerOptions", args);
 
-    if (!obj->inherits("TDevCompilerOptions")) {
-        kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl;
+    if (!obj->inherits("KDevCompilerOptions")) {
+        kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl;
         return 0;
     }
-    TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+    KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
 
     return dlg;
 
@@ -65,14 +65,14 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec
 		args = TQStringList::split( " ", prop.toString() );
 
 	return KParts::ComponentFactory
-	       ::createInstanceFromService<TDevCompilerOptions>( service, parent,
+	       ::createInstanceFromService<KDevCompilerOptions>( service, parent,
 	                                                         service->name().latin1(), args );*/
 }
 
 
 TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent )
 {
-	TDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
+	KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) );
 
 	if ( plugin )
 	{
diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp
index 6508d126..e265a969 100644
--- a/buildtools/autotools/removefiledlg.cpp
+++ b/buildtools/autotools/removefiledlg.cpp
@@ -155,7 +155,7 @@ void RemoveFileDialog::accept()
 	TQDomDocument &dom = *(m_part->projectDom());
 
 	TQDomElement el = dom.documentElement();
-	TQDomNode el2 = el.namedItem("tdevautoproject");
+	TQDomNode el2 = el.namedItem("kdevautoproject");
 	TQDomNode el3 = el2.namedItem("subclassing");
 
 	TQDomNode n = el3.firstChild();