7 files changed, 29 insertions, 29 deletions
diff --git a/parts/diff/CMakeLists.txt b/parts/diff/CMakeLists.txt
index a4135dc6..09987fd7 100644
--- a/parts/diff/CMakeLists.txt
+++ b/parts/diff/CMakeLists.txt
@@ -26,13 +26,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdiff )
+install( FILES kdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdiff )
 
 
-##### libtdevdiff (module) ######################
+##### libkdevdiff (module) ######################
 
-tde_add_kpart( libtdevdiff AUTOMOC
+tde_add_kpart( libkdevdiff AUTOMOC
   SOURCES diffpart.cpp diffwidget.cpp
   LINK tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/diff/Makefile.am b/parts/diff/Makefile.am
index 3d9396eb..ea521442 100644
--- a/parts/diff/Makefile.am
+++ b/parts/diff/Makefile.am
@@ -3,16 +3,16 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces \
 	-I$(top_srcdir)/lib/interfaces/extensions $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdiff.la
-libtdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevdiff.la
+libkdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
+libkdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdiff.desktop
+service_DATA = kdevdiff.desktop
 
-rcdir = $(kde_datadir)/tdevdiff
-rc_DATA = tdevdiff.rc
+rcdir = $(kde_datadir)/kdevdiff
+rc_DATA = kdevdiff.rc
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index b48e8136..a0dbafdd 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -16,7 +16,7 @@
 #include <tqpopupmenu.h>
 
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
@@ -28,24 +28,24 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
-#include "tdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
+#include "kdevplugininfo.h"
 
 #include "diffdlg.h"
 #include "diffwidget.h"
 
-static const TDevPluginInfo data("tdevdiff");
+static const KDevPluginInfo data("kdevdiff");
 
-typedef TDevGenericFactory<DiffPart> DiffFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevdiff, DiffFactory( data ) )
+typedef KDevGenericFactory<DiffPart> DiffFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) )
 
 DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
+    : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0)
 {
   setInstance(DiffFactory::instance());
-  setXMLFile("tdevdiff.rc");
+  setXMLFile("kdevdiff.rc");
 
   diffWidget = new DiffWidget(this, 0, "diffWidget");
   diffWidget->setIcon( SmallIcon("editcopy") );
@@ -83,7 +83,7 @@ static bool urlIsEqual(const KURL &a, const KURL &b)
   return a == b;
 }
 
-static KParts::ReadWritePart* partForURL(const KURL &url, TDevPartController* pc)
+static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc)
 {
   if ( !pc )
     return 0;
diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h
index 984c2c06..6fe89efe 100644
--- a/parts/diff/diffpart.h
+++ b/parts/diff/diffpart.h
@@ -15,8 +15,8 @@
 #include <tqguardedptr.h>
 #include <tqcstring.h>
 
-#include "tdevplugin.h"
-#include "tdevdifffrontend.h"
+#include "kdevplugin.h"
+#include "kdevdifffrontend.h"
 
 class TQPopupMenu;
 class Context;
@@ -24,7 +24,7 @@ class TDEProcess;
 class DiffWidget;
 class TQCString;
 
-class DiffPart : public TDevDiffFrontend
+class DiffPart : public KDevDiffFrontend
 {
     Q_OBJECT
   
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 24435611..51dabcaf 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -31,7 +31,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/job.h>
 
-#include <tdevmainwindow.h>
+#include <kdevmainwindow.h>
 
 #include "diffpart.h"
 #include "diffwidget.h"
diff --git a/parts/diff/tdevdiff.desktop b/parts/diff/kdevdiff.desktop
index db2d0428..13b22e9f 100644
--- a/parts/diff/tdevdiff.desktop
+++ b/parts/diff/kdevdiff.desktop
@@ -35,7 +35,7 @@ Comment[tg]=Намоишгари фарқкунанда
 Comment[tr]=Fark Görüntüleyicisi
 Comment[zh_CN]=差别查看器
 Comment[zh_TW]=比較檢視器
-Name=TDevDiff
+Name=KDevDiff
 Name[da]=TDevelop diff-fremviser
 Name[de]=Abweichungsansicht (TDevelop)
 Name[hi]=के-डेव-डिफ़
@@ -78,7 +78,7 @@ GenericName[tr]=Fark Görüntüleyicisi
 GenericName[zh_CN]=差别查看器
 GenericName[zh_TW]=比較檢視器
 ServiceTypes=TDevelop/DiffFrontend
-X-TDE-Library=libtdevdiff
+X-TDE-Library=libkdevdiff
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing
 X-TDevelop-Scope=Core
diff --git a/parts/diff/tdevdiff.rc b/parts/diff/kdevdiff.rc
index ca944508..37059573 100644
--- a/parts/diff/tdevdiff.rc
+++ b/parts/diff/kdevdiff.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevDiff" version="1">
+<kpartgui name="KDevDiff" version="1">
 <MenuBar>
   <Menu name="tools" >
     <Action name="tools_diff" group="tools_file_operations"/>