8 files changed, 28 insertions, 28 deletions
diff --git a/parts/regexptest/CMakeLists.txt b/parts/regexptest/CMakeLists.txt
index 608f053c..3bc96414 100644
--- a/parts/regexptest/CMakeLists.txt
+++ b/parts/regexptest/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/kdevregexptest )
+install( FILES tdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/tdevregexptest )
 
 
-##### libkdevregexptest (module) ################
+##### libtdevregexptest (module) ################
 
-tde_add_kpart( libkdevregexptest AUTOMOC
+tde_add_kpart( libtdevregexptest AUTOMOC
   SOURCES
     regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
   LINK tdevelop-shared
diff --git a/parts/regexptest/Makefile.am b/parts/regexptest/Makefile.am
index df99989f..8e87ac79 100644
--- a/parts/regexptest/Makefile.am
+++ b/parts/regexptest/Makefile.am
@@ -2,16 +2,16 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libkdevregexptest.la
-libkdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libtdevregexptest.la
+libtdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libtdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libkdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
+libtdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = kdevregexptest.desktop
+service_DATA = tdevregexptest.desktop
 
-rcdir = $(kde_datadir)/kdevregexptest
-rc_DATA = kdevregexptest.rc
+rcdir = $(kde_datadir)/tdevregexptest
+rc_DATA = tdevregexptest.rc
diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp
index bd426411..200bee12 100644
--- a/parts/regexptest/regexptestdlg.cpp
+++ b/parts/regexptest/regexptestdlg.cpp
@@ -32,11 +32,11 @@
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 
-#include "kdevplugin.h"
-#include "kdevpartcontroller.h"
+#include "tdevplugin.h"
+#include "tdevpartcontroller.h"
 
 
-RegexpTestDialog::RegexpTestDialog(KDevPlugin *part)
+RegexpTestDialog::RegexpTestDialog(TDevPlugin *part)
     : RegexpTestDialogBase(0, "regexp test dialog", false), _regexp_dialog(0)
 {
     pattern_edit->setFocus();
diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h
index 4c7094a6..09e656d2 100644
--- a/parts/regexptest/regexptestdlg.h
+++ b/parts/regexptest/regexptestdlg.h
@@ -14,7 +14,7 @@
 
 #include "regexptestdlgbase.h"
 
-class KDevPlugin;
+class TDevPlugin;
 
 
 class RegexpTestDialog : public RegexpTestDialogBase
@@ -23,7 +23,7 @@ class RegexpTestDialog : public RegexpTestDialogBase
   
     
 public:
-    RegexpTestDialog( KDevPlugin *part );
+    RegexpTestDialog( TDevPlugin *part );
     ~RegexpTestDialog();
 
 protected:
@@ -39,7 +39,7 @@ private:
     virtual void checkKRegExp();
     virtual void insertQuoted();
 
-    KDevPlugin *m_part;
+    TDevPlugin *m_part;
 
     TQDialog * _regexp_dialog;
 };
diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp
index 6c45a492..0ca0b083 100644
--- a/parts/regexptest/regexptestpart.cpp
+++ b/parts/regexptest/regexptestpart.cpp
@@ -12,23 +12,23 @@
 #include "regexptestpart.h"
 
 #include <tdelocale.h>
-#include <kdevgenericfactory.h>
-#include <kdevplugininfo.h>
+#include <tdevgenericfactory.h>
+#include <tdevplugininfo.h>
 #include <tdeaction.h>
 
-#include "kdevcore.h"
+#include "tdevcore.h"
 #include "regexptestdlg.h"
 
-static const KDevPluginInfo data("kdevregexptest");
+static const TDevPluginInfo data("tdevregexptest");
 
-typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory;
-K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) )
+typedef TDevGenericFactory<RegexpTestPart> RegexpTestFactory;
+K_EXPORT_COMPONENT_FACTORY( libtdevregexptest, RegexpTestFactory( data ) )
 
 RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &)
-    : KDevPlugin(&data, parent, name ? name : "RegexpTestPart")
+    : TDevPlugin(&data, parent, name ? name : "RegexpTestPart")
 {
     setInstance(RegexpTestFactory::instance());
-    setXMLFile("kdevregexptest.rc");
+    setXMLFile("tdevregexptest.rc");
 
     TDEAction *action;
 
diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h
index ec153d90..3488e910 100644
--- a/parts/regexptest/regexptestpart.h
+++ b/parts/regexptest/regexptestpart.h
@@ -14,12 +14,12 @@
 
 #include <tqguardedptr.h>
 #include <kdialogbase.h>
-#include "kdevplugin.h"
+#include "tdevplugin.h"
 
 class RegexpTestDialog;
 
 
-class RegexpTestPart : public KDevPlugin
+class RegexpTestPart : public TDevPlugin
 {
     Q_OBJECT
   
diff --git a/parts/regexptest/kdevregexptest.desktop b/parts/regexptest/tdevregexptest.desktop
index 57f93f73..e0978750 100644
--- a/parts/regexptest/kdevregexptest.desktop
+++ b/parts/regexptest/tdevregexptest.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Düzenli İfade Test Edicisi
 GenericName[zh_CN]=正则表达式测试
 GenericName[zh_TW]=正規表示式測試器
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libkdevregexptest
+X-TDE-Library=libtdevregexptest
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Properties=ScriptDevelopment,CDevelopment,CPPDevelopment
diff --git a/parts/regexptest/kdevregexptest.rc b/parts/regexptest/tdevregexptest.rc
index 99893d7f..99893d7f 100644
--- a/parts/regexptest/kdevregexptest.rc
+++ b/parts/regexptest/tdevregexptest.rc