6 files changed, 21 insertions, 21 deletions
diff --git a/parts/uimode/CMakeLists.txt b/parts/uimode/CMakeLists.txt
index 0eaa5ff6..478a4103 100644
--- a/parts/uimode/CMakeLists.txt
+++ b/parts/uimode/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevuichooser (module) #################
+##### libkdevuichooser (module) #################
 
-tde_add_kpart( libtdevuichooser AUTOMOC
+tde_add_kpart( libkdevuichooser AUTOMOC
   SOURCES
     uichooser_part.cpp uichooser.ui uichooser_widget.cpp
   LINK tdevelop-shared
diff --git a/parts/uimode/Makefile.am b/parts/uimode/Makefile.am
index df7ddba9..00792790 100644
--- a/parts/uimode/Makefile.am
+++ b/parts/uimode/Makefile.am
@@ -1,13 +1,13 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevuichooser.la
-libtdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevuichooser.la
+libkdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
+libkdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevuichooser.desktop
+service_DATA = kdevuichooser.desktop
 
diff --git a/parts/uimode/tdevuichooser.desktop b/parts/uimode/kdevuichooser.desktop
index 65faa5be..afb21a50 100644
--- a/parts/uimode/tdevuichooser.desktop
+++ b/parts/uimode/kdevuichooser.desktop
@@ -80,7 +80,7 @@ GenericName[zh_CN]=用户界面选择
 GenericName[zh_TW]=使用者介面選擇器
 Icon=view_choose
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevuichooser
+X-TDE-Library=libkdevuichooser
 X-TDevelop-Version=5
 X-TDevelop-Scope=Core
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp
index 5795d829..fdc9fa6a 100644
--- a/parts/uimode/uichooser_part.cpp
+++ b/parts/uimode/uichooser_part.cpp
@@ -3,23 +3,23 @@
 #include <tqvbox.h>
 
 #include <kdialogbase.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include "uichooser_widget.h"
 
 #define UICHOOSERSETTINGSPAGE 1
 
-typedef TDevGenericFactory<UIChooserPart> UIChooserFactory;
-static const TDevPluginInfo data("tdevuichooser");
-K_EXPORT_COMPONENT_FACTORY( libtdevuichooser, UIChooserFactory( data ) )
+typedef KDevGenericFactory<UIChooserPart> UIChooserFactory;
+static const KDevPluginInfo data("kdevuichooser");
+K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) )
 
 UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &)
-  : TDevPlugin( &data, parent, name ? name : "UIChooserPart")
+  : KDevPlugin( &data, parent, name ? name : "UIChooserPart")
 {
 	setInstance(UIChooserFactory::instance());
 
diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h
index e86f9211..ff822e1d 100644
--- a/parts/uimode/uichooser_part.h
+++ b/parts/uimode/uichooser_part.h
@@ -3,16 +3,16 @@
  */
  
 
-#ifndef __TDEVPART_UICHOOSER_H__
-#define __TDEVPART_UICHOOSER_H__
+#ifndef __KDEVPART_UICHOOSER_H__
+#define __KDEVPART_UICHOOSER_H__
 
 
 class KDialogBase;
 class ConfigWidgetProxy;
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
-class UIChooserPart : public TDevPlugin
+class UIChooserPart : public KDevPlugin
 {
   Q_OBJECT
   
diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp
index d70d648d..cb75ec02 100644
--- a/parts/uimode/uichooser_widget.cpp
+++ b/parts/uimode/uichooser_widget.cpp
@@ -24,7 +24,7 @@
 #include <tdeversion.h>
 
 #include "uichooser_part.h"
-#include "tdevmainwindow.h"
+#include "kdevmainwindow.h"
 #include "uichooser_widget.h"
 
 UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name)