6 files changed, 25 insertions, 25 deletions
diff --git a/parts/bookmarks/CMakeLists.txt b/parts/bookmarks/CMakeLists.txt
index 98022378..0422965c 100644
--- a/parts/bookmarks/CMakeLists.txt
+++ b/parts/bookmarks/CMakeLists.txt
@@ -26,12 +26,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevbookmarks (module) #################
+##### libkdevbookmarks (module) #################
 
-tde_add_kpart( libtdevbookmarks AUTOMOC
+tde_add_kpart( libkdevbookmarks AUTOMOC
   SOURCES
     bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui
     bookmarks_settings.cpp bookmarks_config.cpp
diff --git a/parts/bookmarks/Makefile.am b/parts/bookmarks/Makefile.am
index 6f2e6b8d..2ac7b233 100644
--- a/parts/bookmarks/Makefile.am
+++ b/parts/bookmarks/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevbookmarks.la
-libtdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevbookmarks.la
+libkdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
+libkdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevbookmarks.desktop
+service_DATA = kdevbookmarks.desktop
 
 noinst_HEADERS =  bookmarks_settings.h bookmarks_config.h
diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp
index 50672642..f7ac78cb 100644
--- a/parts/bookmarks/bookmarks_part.cpp
+++ b/parts/bookmarks/bookmarks_part.cpp
@@ -18,16 +18,16 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdetexteditor/markinterface.h>
 #include <tdetexteditor/editinterface.h>
 #include <tdetexteditor/document.h>
 #include <tdeaction.h>
 #include <kdialogbase.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
 #include "domutil.h"
 
 #include "bookmarks_widget.h"
@@ -36,16 +36,16 @@
 #include "bookmarks_config.h"
 
 #include <configwidgetproxy.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #define BOOKMARKSETTINGSPAGE 1
 
-typedef TDevGenericFactory<BookmarksPart> BookmarksFactory;
-static const TDevPluginInfo data("tdevbookmarks");
-K_EXPORT_COMPONENT_FACTORY( libtdevbookmarks, BookmarksFactory( data ) )
+typedef KDevGenericFactory<BookmarksPart> BookmarksFactory;
+static const KDevPluginInfo data("kdevbookmarks");
+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) )
 
 BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& )
-	: TDevPlugin(&data, parent, name ? name : "BookmarksPart" )
+	: KDevPlugin(&data, parent, name ? name : "BookmarksPart" )
 {
 	setInstance(BookmarksFactory::instance());
 
diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h
index b8015f54..f51603d7 100644
--- a/parts/bookmarks/bookmarks_part.h
+++ b/parts/bookmarks/bookmarks_part.h
@@ -10,8 +10,8 @@
  ***************************************************************************/
 
 
-#ifndef __TDEVPART_BOOKMARKS_H__
-#define __TDEVPART_BOOKMARKS_H__
+#ifndef __KDEVPART_BOOKMARKS_H__
+#define __KDEVPART_BOOKMARKS_H__
 
 
 #include <tqguardedptr.h>
@@ -22,7 +22,7 @@
 #include <tdeparts/part.h>
 #include <kurl.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 class TQTimer;
 class KDialogBase;
@@ -38,7 +38,7 @@ struct EditorData
 class BookmarksWidget;
 class TQDomElement;
 
-class BookmarksPart : public TDevPlugin
+class BookmarksPart : public KDevPlugin
 {
 	Q_OBJECT
   
@@ -48,7 +48,7 @@ public:
 	BookmarksPart(TQObject *parent, const char *name, const TQStringList &);
 	~BookmarksPart();
 
-	// reimplemented from TDevPlugin
+	// reimplemented from KDevPlugin
 	void restorePartialProjectSession( const TQDomElement * el );
 	void savePartialProjectSession( TQDomElement * el );
 	
diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp
index dbf892fe..cc7316c8 100644
--- a/parts/bookmarks/bookmarks_widget.cpp
+++ b/parts/bookmarks/bookmarks_widget.cpp
@@ -23,8 +23,8 @@
 #include <tdepopupmenu.h>
 #include <tdelocale.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevcore.h>
+#include <kdevpartcontroller.h>
+#include <kdevcore.h>
 
 
 #include "bookmarks_part.h"
diff --git a/parts/bookmarks/tdevbookmarks.desktop b/parts/bookmarks/kdevbookmarks.desktop
index 0ec9ae11..3cbdb233 100644
--- a/parts/bookmarks/tdevbookmarks.desktop
+++ b/parts/bookmarks/kdevbookmarks.desktop
@@ -80,6 +80,6 @@ GenericName[zh_TW]=書籤
 Icon=bookmark
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Project
-X-TDE-Library=libtdevbookmarks
+X-TDE-Library=libkdevbookmarks
 X-TDevelop-Version=5
 X-TDevelop-Properties=CodeEditing