Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

60 files changed, 250 insertions, 263 deletions

diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index 4b13b342..accc3401 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -33,13 +33,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation )
+install( FILES kdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation )
 
 
-##### libtdevdocumentation (module) #############
+##### libkdevdocumentation (module) #############
 
-tde_add_kpart( libtdevdocumentation AUTOMOC
+tde_add_kpart( libkdevdocumentation AUTOMOC
   SOURCES
     documentation_part.cpp documentation_widget.cpp
     contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui
@@ -50,8 +50,8 @@ tde_add_kpart( libtdevdocumentation AUTOMOC
     find_documentation.cpp find_documentation_optionsbase.ui
     find_documentation_options.cpp selecttopicbase.ui
     selecttopic.cpp docprojectconfigwidgetbase.ui
-    docprojectconfigwidget.cpp TDevDocumentationIface.cpp
-    TDevDocumentationIface.skel addcatalogdlgbase.ui
+    docprojectconfigwidget.cpp KDevDocumentationIface.cpp
+    KDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
   LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/parts/documentation/TDevDocumentationIface.cpp b/parts/documentation/KDevDocumentationIface.cpp
index 0441eb4a..329b8474 100644
--- a/parts/documentation/TDevDocumentationIface.cpp
+++ b/parts/documentation/KDevDocumentationIface.cpp
@@ -17,67 +17,67 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "TDevDocumentationIface.h"
+#include "KDevDocumentationIface.h"
 
 #include "documentation_part.h"
 
-TDevDocumentationIface::TDevDocumentationIface(DocumentationPart *part)
-    :TQObject(part), DCOPObject("TDevDocumentation"), m_part(part)
+KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part)
+    :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part)
 {
 }
 
-TDevDocumentationIface::~TDevDocumentationIface()
+KDevDocumentationIface::~KDevDocumentationIface()
 {
 }
 
-void TDevDocumentationIface::lookupInIndex(TQString term)
+void KDevDocumentationIface::lookupInIndex(TQString term)
 {
     m_part->lookInDocumentationIndex(term);
 }
 
-void TDevDocumentationIface::findInFinder(TQString term)
+void KDevDocumentationIface::findInFinder(TQString term)
 {
     m_part->findInDocumentation(term);
 }
 
-void TDevDocumentationIface::searchInDocumentation(TQString term)
+void KDevDocumentationIface::searchInDocumentation(TQString term)
 {
     m_part->searchInDocumentation(term);
 }
 
-void TDevDocumentationIface::lookupInIndex()
+void KDevDocumentationIface::lookupInIndex()
 {
     m_part->lookInDocumentationIndex();
 }
 
-void TDevDocumentationIface::searchInDocumentation()
+void KDevDocumentationIface::searchInDocumentation()
 {
     m_part->searchInDocumentation();
 }
 
-void TDevDocumentationIface::manPage(TQString term)
+void KDevDocumentationIface::manPage(TQString term)
 {
     m_part->manPage(term);
 }
 
-void TDevDocumentationIface::infoPage(TQString term)
+void KDevDocumentationIface::infoPage(TQString term)
 {
     m_part->infoPage(term);
 }
 
-void TDevDocumentationIface::manPage()
+void KDevDocumentationIface::manPage()
 {
     m_part->manPage();
 }
 
-void TDevDocumentationIface::infoPage()
+void KDevDocumentationIface::infoPage()
 {
     m_part->infoPage();
 }
 
-void TDevDocumentationIface::findInFinder( )
+void KDevDocumentationIface::findInFinder( )
 {
     m_part->findInDocumentation();
 }
 
-#include "TDevDocumentationIface.moc"
+#include "KDevDocumentationIface.moc"
diff --git a/parts/documentation/TDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h
index 565070f3..c55143e7 100644
--- a/parts/documentation/TDevDocumentationIface.h
+++ b/parts/documentation/KDevDocumentationIface.h
@@ -17,21 +17,21 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef TDEVDOCUMENTATIONIFACE_H
-#define TDEVDOCUMENTATIONIFACE_H
+#ifndef KDEVDOCUMENTATIONIFACE_H
+#define KDEVDOCUMENTATIONIFACE_H
 
 #include <tqobject.h>
 #include <dcopobject.h>
 
 class DocumentationPart;
 
-class TDevDocumentationIface : public TQObject, public DCOPObject {
+class KDevDocumentationIface : public TQObject, public DCOPObject {
     Q_OBJECT
 //    
     K_DCOP
 public:
-    TDevDocumentationIface(DocumentationPart *part);
-    ~TDevDocumentationIface();
+    KDevDocumentationIface(DocumentationPart *part);
+    ~KDevDocumentationIface();
 
 k_dcop:
     void lookupInIndex(TQString term);
diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am
index 118c8041..13c4db3f 100644
--- a/parts/documentation/Makefile.am
+++ b/parts/documentation/Makefile.am
@@ -1,31 +1,31 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
 	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevdocumentation.la
-libtdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+kde_module_LTLIBRARIES = libkdevdocumentation.la
+libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
 	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML)
 
-libtdevdocumentation_la_SOURCES = documentation_part.cpp \
+libkdevdocumentation_la_SOURCES = documentation_part.cpp \
 			documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \
 			docglobalconfigwidget.cpp docconfiglistview.cpp editcatalogdlgbase.ui editcatalogdlg.cpp \
 			docutils.cpp searchview.cpp bookmarkview.cpp editbookmarkdlg.ui \
 			find_documentationbase.ui find_documentation.cpp find_documentation_optionsbase.ui \
 			find_documentation_options.cpp selecttopicbase.ui selecttopic.cpp docprojectconfigwidgetbase.ui \
-			docprojectconfigwidget.cpp TDevDocumentationIface.cpp TDevDocumentationIface.skel \
+			docprojectconfigwidget.cpp KDevDocumentationIface.cpp KDevDocumentationIface.skel \
 	addcatalogdlgbase.ui addcatalogdlg.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevdocumentation.desktop
+service_DATA = kdevdocumentation.desktop
 
-rcdir = $(kde_datadir)/tdevdocumentation
-rc_DATA = tdevpart_documentation.rc
+rcdir = $(kde_datadir)/kdevdocumentation
+rc_DATA = kdevpart_documentation.rc
 
 noinst_HEADERS = contentsview.h indexview.h docglobalconfigwidget.h \
 					docconfiglistview.h editcatalogdlg.h docutils.h searchview.h bookmarkview.h selecttopic.h \
-			docprojectconfigwidget.h TDevDocumentationIface.h addcatalogdlg.h
+			docprojectconfigwidget.h KDevDocumentationIface.h addcatalogdlg.h
 SUBDIRS = interfaces plugins tools data protocols
 
 DOXYGEN_EMPTY = YES
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 51e6fe96..21913089 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 
 #include "docutils.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 AddCatalogDlg::AddCatalogDlg( TQValueList<DocumentationPlugin*> const & plugins, 
 	TQWidget* parent, const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 9e6f85df..f626e246 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -34,8 +34,8 @@
 #include <tdehtml_part.h>
 #include <dom/html_document.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -44,7 +44,7 @@
 
 DocBookmarkManager::DocBookmarkManager(DocumentationPart */*part*/)
     :KBookmarkManager(locateLocal("data",
-    "tdevdocumentation/bookmarks/bookmarks.xml"), false)
+    "kdevdocumentation/bookmarks/bookmarks.xml"), false)
 {
     setEditorOptions(i18n("Documentation"), false);
 }
diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp
index ff3c9a31..532feefd 100644
--- a/parts/documentation/contentsview.cpp
+++ b/parts/documentation/contentsview.cpp
@@ -26,8 +26,8 @@
 #include <tdelistview.h>
 #include <tdelocale.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/data/CMakeLists.txt b/parts/documentation/data/CMakeLists.txt
index 5bb6d766..77d380d4 100644
--- a/parts/documentation/data/CMakeLists.txt
+++ b/parts/documentation/data/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 install( FILES
     long.html nomatch.html short.html syntax.html wrapper.html
-  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/en )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/en )
 
 install( FILES
     checked.xpm htdig.png star.png star_blank.png unchecked.xpm
-  DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/pics )
+  DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/pics )
diff --git a/parts/documentation/data/Makefile.am b/parts/documentation/data/Makefile.am
index ae52bf11..920c492a 100644
--- a/parts/documentation/data/Makefile.am
+++ b/parts/documentation/data/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-htmldir = $(kde_datadir)/tdevdocumentation/en
-picsdir = $(kde_datadir)/tdevdocumentation/pics
+htmldir = $(kde_datadir)/kdevdocumentation/en
+picsdir = $(kde_datadir)/kdevdocumentation/pics
 html_DATA =  long.html nomatch.html short.html syntax.html wrapper.html
 pics_DATA =  checked.xpm htdig.png star.png star_blank.png unchecked.xpm
diff --git a/parts/documentation/data/nomatch.html b/parts/documentation/data/nomatch.html
index 5cbd5c49..8951a604 100644
--- a/parts/documentation/data/nomatch.html
+++ b/parts/documentation/data/nomatch.html
@@ -1,6 +1,6 @@
 <html><head><title>No match for '$&(LOGICAL_WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
 Search results</h1>
 <hr noshade size="4">
 <h2>No matches were found for '$&(LOGICAL_WORDS)'</h2>
@@ -17,5 +17,5 @@ word with "<b>All</b>," try using one or more of the same words
 with "<b>Any</b>."</p>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/data/syntax.html b/parts/documentation/data/syntax.html
index 21a2ab2a..9701c37f 100644
--- a/parts/documentation/data/syntax.html
+++ b/parts/documentation/data/syntax.html
@@ -1,6 +1,6 @@
 <html><head><title>Error in Boolean search for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h1><img src="$(PICDIR)tdevdocumentation/pics/htdig.png">
+<h1><img src="$(PICDIR)kdevdocumentation/pics/htdig.png">
 Error in Boolean search for '$&(LOGICAL_WORDS)'</h1>
 <hr noshade size="4">
 Boolean expressions need to be 'correct' in order for the search
@@ -14,6 +14,6 @@ $(SYNTAXERROR)
 </b></blockquote>
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src="$(PICDIR)tdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
+<img src="$(PICDIR)kdevdocumentation/pics/htdig.png" border="0">ht://Dig $(VERSION)</a>
 </body></html>
 
diff --git a/parts/documentation/data/wrapper.html b/parts/documentation/data/wrapper.html
index 187ffd61..20c1bbf2 100644
--- a/parts/documentation/data/wrapper.html
+++ b/parts/documentation/data/wrapper.html
@@ -1,10 +1,10 @@
 <html><head><title>Search results for '$&(WORDS)'</title></head>
 <body bgcolor="#ffffff" text="#000000" link="#aa0000">
-<h2><img src=$(PICDIR)tdevdocumentation/pics/htdig.png>
+<h2><img src=$(PICDIR)kdevdocumentation/pics/htdig.png>
 Search results for '$&(LOGICAL_WORDS)'</h2>
 <hr noshade size="4">
 <b>
-More <img src=$(PICDIR)tdevdocumentation/pics/star.png alt="*">'s indicate a better match.
+More <img src=$(PICDIR)kdevdocumentation/pics/star.png alt="*">'s indicate a better match.
 </b>
 <hr noshade size="1">
 $(HTSEARCH_RESULTS)
@@ -12,5 +12,5 @@ $(PAGEHEADER)
 $(PREVPAGE) $(PAGELIST) $(NEXTPAGE)
 <hr noshade size="4">
 <a href="http://www.htdig.org/">
-<img src=$(PICDIR)tdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
+<img src=$(PICDIR)kdevdocumentation/pics/htdig.png border="0">ht://Dig $(VERSION)</a>
 </body></html>
diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp
index ba6f30fb..d2753653 100644
--- a/parts/documentation/docconfiglistview.cpp
+++ b/parts/documentation/docconfiglistview.cpp
@@ -21,7 +21,7 @@
 
 #include <tdelocale.h>
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 DocConfigListView::DocConfigListView(TQWidget *parent, const char *name)
      :TDEListView(parent, name)
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 5f66ef4a..cb6c3776 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -38,8 +38,8 @@
 #include <tdehtml_part.h>
 #include <tdehtml_settings.h>
 
-#include "tdevdocumentationplugin.h"
-#include "tdevpartcontroller.h"
+#include "kdevdocumentationplugin.h"
+#include "kdevpartcontroller.h"
 
 #include "docconfiglistview.h"
 #include "documentation_part.h"
@@ -67,7 +67,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
     //read full text search settings
     config->setGroup("htdig");
     TQString databaseDir = kapp->dirs()->saveLocation("data",
-        "tdevdocumentation/search");
+        "kdevdocumentation/search");
     databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir));
     htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")));
     htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")));
@@ -99,8 +99,8 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part,
 
     useAssistant_box->setChecked(m_part->isAssistantUsed());
 
-    // Having app-specific settings isn't pretty, but this setting is nonsensical in tdevassistant
-    if ( kapp->instanceName().find("tdevassistant") != -1 )
+    // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant
+    if ( kapp->instanceName().find("kdevassistant") != -1 )
         useAssistant_box->hide();
 
     //font sizes and zoom levels
@@ -182,7 +182,7 @@ void DocGlobalConfigWidget::accept()
     config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit));
 
     //write full text search locations file
-    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
     TQFile f(ftsLocationsFile);
     TQStringList locs;
     if (f.open(IO_ReadWrite | IO_Truncate))
diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp
index 1d6678d7..a37ad5cb 100644
--- a/parts/documentation/docprojectconfigwidget.cpp
+++ b/parts/documentation/docprojectconfigwidget.cpp
@@ -27,8 +27,8 @@
 
 #include "domutil.h"
 #include "urlutil.h"
-#include "tdevproject.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevproject.h"
+#include "kdevdocumentationplugin.h"
 
 #include "documentation_part.h"
 #include "documentation_widget.h"
@@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
             m_plugins[(*it)->pluginName()] = *it;
         }
     }
-    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docsystem");
+    TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem");
     
     bool hasProjectDoc = false;
     for (int i = 0; i < docSystemCombo->count(); ++i)
@@ -64,7 +64,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget
         changeDocSystem(docSystemCombo->currentText());
     }
 
-    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/usermanualurl"));
+    manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"));
 }
 
 void DocProjectConfigWidget::changeDocSystem(const TQString &text)
@@ -79,7 +79,7 @@ void DocProjectConfigWidget::changeDocSystem(const TQString &text)
     catalogURL->setMode(plugin->catalogLocatorProps().first);
     catalogURL->setFilter(plugin->catalogLocatorProps().second);
     
-    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docurl");
+    TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL);
 
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 9515fad7..75bb7c13 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -48,17 +48,17 @@
 #include <twin.h>
 #include <tdetexteditor/document.h>
 
-#include "tdevplugininfo.h"
-#include "tdevcore.h"
-#include "tdevproject.h"
-#include "tdevmainwindow.h"
-#include "tdevgenericfactory.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevplugininfo.h"
+#include "kdevcore.h"
+#include "kdevproject.h"
+#include "kdevmainwindow.h"
+#include "kdevgenericfactory.h"
+#include "kdevdocumentationplugin.h"
 #include "configwidgetproxy.h"
-#include "tdevpartcontroller.h"
+#include "kdevpartcontroller.h"
 #include "domutil.h"
 #include "urlutil.h"
-#include "tdeveditorutil.h"
+#include "kdeveditorutil.h"
 
 #include "documentation_widget.h"
 #include "docglobalconfigwidget.h"
@@ -66,22 +66,22 @@
 #include "contentsview.h"
 #include "find_documentation.h"
 
-#include "TDevDocumentationIface.h"
+#include "KDevDocumentationIface.h"
 
 #define GLOBALDOC_OPTIONS 1
 #define PROJECTDOC_OPTIONS 2
 
-static const TDevPluginInfo data("tdevdocumentation");
+static const KDevPluginInfo data("kdevdocumentation");
 
-typedef TDevGenericFactory<DocumentationPart> DocumentationFactory;
-K_EXPORT_COMPONENT_FACTORY( libtdevdocumentation, DocumentationFactory( data ) )
+typedef KDevGenericFactory<DocumentationPart> DocumentationFactory;
+K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) )
 
 DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& )
-    :TDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
+    :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ),
     m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false)
 {
     setInstance(DocumentationFactory::instance());
-    setXMLFile("tdevpart_documentation.rc");
+    setXMLFile("kdevpart_documentation.rc");
 
     m_configProxy = new ConfigWidgetProxy(core());
 	m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() );
@@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T
     
     TQTimer::singleShot(0, this, TQT_SLOT(init()));
     
-    new TDevDocumentationIface(this);
+    new KDevDocumentationIface(this);
 }
 
 DocumentationPart::~DocumentationPart()
@@ -250,12 +250,6 @@ void DocumentationPart::setupActions()
                                     "all possible sources of documentation like "
                                     "table of contents, index, man and info databases, "
                                     "Google, etc."));
-    action = new TDEAction(i18n("TDevelop Programming Handbook"), 0,
-                         this, TQT_SLOT(programmingHandbook()),
-                         actionCollection(), "help_programming_handbook" );
-    action->setToolTip(i18n("Open the TDevelop Programming Handbook"));
-    action->setWhatsThis(i18n("<b>Open the TDevelop Programming Handbook</b><p>Opens Open the TDevelop Programming Handbook."));
-
 }
 
 void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url)
@@ -265,12 +259,12 @@ void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &
 
 void DocumentationPart::searchInDocumentation()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "searchInDocumentation()" );
+            callAssistant ( "KDevDocumentation", "searchInDocumentation()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -280,7 +274,7 @@ void DocumentationPart::searchInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "searchInDocumentation(TQString)", word );
+            callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -298,29 +292,24 @@ void DocumentationPart::searchInDocumentation(const TQString &term)
 void DocumentationPart::contextSearchInDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr);
     else
         searchInDocumentation(m_contextStr);
 }
 
-void DocumentationPart::programmingHandbook()
-{
-  kapp->invokeHelp (TQString::null, "tde_app_devel");
-}
-
 void DocumentationPart::manPage()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
 
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "TDevDocumentation", "manPage()" );
+            callAssistant ( "KDevDocumentation", "manPage()" );
         }
         else
         {
-            callAssistant ( "TDevDocumentation", "manPage(TQString)", word );
+            callAssistant ( "KDevDocumentation", "manPage(TQString)", word );
         }
     }
     else
@@ -334,17 +323,17 @@ void DocumentationPart::manPage()
 
 void DocumentationPart::infoPage()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
  
     if ( isAssistantUsed() )
     {
         if ( word.isEmpty() )
         {
-            callAssistant ( "TDevDocumentation", "infoPage()" );
+            callAssistant ( "KDevDocumentation", "infoPage()" );
         }
         else
         {
-            callAssistant ( "TDevDocumentation", "infoPage(TQString)", word );
+            callAssistant ( "KDevDocumentation", "infoPage(TQString)", word );
         }
     }
     else
@@ -371,7 +360,7 @@ void DocumentationPart::infoPage(const TQString &term)
 void DocumentationPart::contextManPage()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "manPage(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr);
     else
         manPage(m_contextStr);
 }
@@ -379,7 +368,7 @@ void DocumentationPart::contextManPage()
 void DocumentationPart::contextInfoPage()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "infoPage(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr);
     else
         infoPage(m_contextStr);
 }
@@ -387,19 +376,19 @@ void DocumentationPart::contextInfoPage()
 void DocumentationPart::contextFindDocumentation()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "findInFinder(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr);
     else
         findInDocumentation(m_contextStr);
 }
 
 void DocumentationPart::findInDocumentation()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "findInFinder()" );
+            callAssistant ( "KDevDocumentation", "findInFinder()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -409,7 +398,7 @@ void DocumentationPart::findInDocumentation()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "findInFinder(TQString)", word );
+            callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -426,12 +415,12 @@ void DocumentationPart::findInDocumentation(const TQString &term)
 
 void DocumentationPart::lookInDocumentationIndex()
 {
-     TQString word = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
+     TQString word = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) );
     
     if ( word.isEmpty() )
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "lookupInIndex()" );
+            callAssistant ( "KDevDocumentation", "lookupInIndex()" );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -441,7 +430,7 @@ void DocumentationPart::lookInDocumentationIndex()
     else
     {
         if ( isAssistantUsed() )
-            callAssistant ( "TDevDocumentation", "lookupInIndex(TQString)", word );
+            callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word );
         else
         {
             mainWindow()->raiseView ( m_widget );
@@ -459,7 +448,7 @@ void DocumentationPart::lookInDocumentationIndex(const TQString &term)
 void DocumentationPart::contextLookInDocumentationIndex()
 {
     if (isAssistantUsed())
-        callAssistant("TDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
+        callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr);
     else
         lookInDocumentationIndex(m_contextStr);
 }
@@ -575,11 +564,11 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b)
 
 void DocumentationPart::projectOpened()
 {
-    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem");
-    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl");
+    TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem");
+    TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl");
     if (!projectDocURL.isEmpty())
         projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL);
-    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl");
+    TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl");
     
     for (TQValueList<DocumentationPlugin*>::const_iterator it = m_plugins.constBegin();
         it != m_plugins.constEnd(); ++it)
@@ -613,21 +602,21 @@ void DocumentationPart::saveProjectDocumentationInfo()
 {
     if (m_projectDocumentationPlugin)
     {
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName());
 
         TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(),
             m_projectDocumentationPlugin->catalogURL());
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", relPath);
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath);
     }
     else
     {
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", "");
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", "");
     }
     if (m_userManualPlugin)
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL());
     else
-        DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", "");
+        DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", "");
 }
 
 TQCString DocumentationPart::startAssistant()
@@ -638,7 +627,7 @@ TQCString DocumentationPart::startAssistant()
         return lastAssistant;
     
     const char *function = 0;
-    TQString app = "tdevassistant";
+    TQString app = "kdevassistant";
     function = "start_service_by_desktop_name(TQString,TQStringList)";
     TQStringList URLs;
 
@@ -676,7 +665,7 @@ TQCString DocumentationPart::startAssistant()
             kdDebug() << dcopName.data() << endl;
             
             //@fixme: is there another way to wait for the remote object to be loaded
-            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("TDevDocumentation"))
+            while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation"))
                 usleep(500);
         }
     }
@@ -685,8 +674,8 @@ TQCString DocumentationPart::startAssistant()
 
 bool DocumentationPart::isAssistantUsed() const
 {
-	// hack to solve BR #90334 - don't call tdevassistant via DCOP if we ARE tdevassistant
-	if ( kapp->instanceName().find("tdevassistant") != -1 )
+	// hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant
+	if ( kapp->instanceName().find("kdevassistant") != -1 )
 	{
 		return false;
 	}
@@ -697,7 +686,7 @@ bool DocumentationPart::isAssistantUsed() const
 void DocumentationPart::setAssistantUsed(bool b)
 {
     m_assistantUsed = b;
-    //use global config to store different settings for tdevassistant and tdevelop
+    //use global config to store different settings for kdevassistant and tdevelop
     TDEConfig *config = kapp->config();
     config->setGroup("Documentation");
     config->writeEntry("UseAssistant", isAssistantUsed());
@@ -750,7 +739,7 @@ void DocumentationPart::loadSettings()
     config->setGroup("Documentation");
     m_assistantUsed = config->readBoolEntry("UseAssistant", false);
     
-    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "tdevassistant")
+    if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant")
     {
         int page = config->readNumEntry("LastPage", 0);
         switch (page)
diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h
index aafe1669..722ad4bd 100644
--- a/parts/documentation/documentation_part.h
+++ b/parts/documentation/documentation_part.h
@@ -17,11 +17,11 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef __TDEVPART_DOCUMENTATION_H__
-#define __TDEVPART_DOCUMENTATION_H__
+#ifndef __KDEVPART_DOCUMENTATION_H__
+#define __KDEVPART_DOCUMENTATION_H__
 
 #include <tqguardedptr.h>
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 
 class FindDocumentation;
@@ -39,7 +39,7 @@ class TQPopupMenu;
 /*
  Please read the README.dox file for more info about this part
  */
-class DocumentationPart : public TDevPlugin
+class DocumentationPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -69,7 +69,6 @@ public slots:
     void searchInDocumentation();
     void searchInDocumentation(const TQString &term);
     void contextSearchInDocumentation();
-    void programmingHandbook();
     void manPage();
     void manPage(const TQString &term);
     void contextManPage();
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index b69e80a5..b1ab69ca 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -31,8 +31,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
-#include <tdevcore.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevcore.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "contentsview.h"
diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h
index fccd03b9..a813b393 100644
--- a/parts/documentation/documentation_widget.h
+++ b/parts/documentation/documentation_widget.h
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 
 class FindDocumentation;
-class TDevProject;
+class KDevProject;
 class DocumentationPart;
 class ContentsView;
 class IndexView;
diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp
index ba00ea83..5360a73f 100644
--- a/parts/documentation/docutils.cpp
+++ b/parts/documentation/docutils.cpp
@@ -27,9 +27,9 @@
 #include <tdelocale.h>
 #include <kstringhandler.h>
 
-#include <tdevpartcontroller.h>
+#include <kdevpartcontroller.h>
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 #include "documentation_part.h"
 
 TQString DocUtils::noEnvURL(const TQString &url)
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 2fb81fec..8bdc19d5 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -26,7 +26,7 @@
 #include <kurlcompletion.h>
 
 #include "docutils.h"
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
     const char* name, bool modal, WFlags fl)
diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp
index 2f730b81..ebddcd4c 100644
--- a/parts/documentation/find_documentation.cpp
+++ b/parts/documentation/find_documentation.cpp
@@ -29,8 +29,8 @@
 #include <kprocess.h>
 #include <tdelistbox.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_widget.h"
 #include "documentation_part.h"
diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp
index 25762451..cae33db5 100644
--- a/parts/documentation/indexview.cpp
+++ b/parts/documentation/indexview.cpp
@@ -30,8 +30,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "docutils.h"
 #include "selecttopic.h"
diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt
index 2e1f0ae3..f4a2ff08 100644
--- a/parts/documentation/interfaces/CMakeLists.txt
+++ b/parts/documentation/interfaces/CMakeLists.txt
@@ -23,7 +23,7 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    tdevdocumentationplugin.h
+    kdevdocumentationplugin.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/parts/documentation )
 
 
@@ -37,7 +37,7 @@ install( FILES
 ##### documentation_interfaces (shared) #########
 
 tde_add_library( documentation_interfaces SHARED AUTOMOC
-  SOURCES tdevdocumentationplugin.cpp
+  SOURCES kdevdocumentationplugin.cpp
   VERSION 0.0.0
   LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index b0feb598..f128dabc 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -5,12 +5,12 @@ partincludedirdir = $(includedir)/tdevelop/parts/documentation
 lib_LTLIBRARIES = libdocumentation_interfaces.la
 libdocumentation_interfaces_la_LDFLAGS = $(all_libraries)
 libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO)
-libdocumentation_interfaces_la_SOURCES = tdevdocumentationplugin.cpp
-partincludedir_HEADERS = tdevdocumentationplugin.h
+libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp
+partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces
-DOXYGEN_PROJECTNAME = TDevelop Documentation Part Interfaces Library
-DOXYGEN_DOCDIRPREFIX = tdevdoc
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces
+DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
+DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
index f3c20841..afc9abad 100644
--- a/parts/documentation/interfaces/tdevdocumentationplugin.cpp
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp
@@ -16,7 +16,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 #include <tqfile.h>
 #include <tqpainter.h>
@@ -334,7 +334,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 {
     kdDebug() << "Creating index cache for " << item->text(0) << endl;
     
-    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_WriteOnly))
         return;
@@ -357,7 +357,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item)
 
 bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item)
 {
-    TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
+    TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0));
     TQFile cacheFile(cacheName);
     if (!cacheFile.open(IO_ReadOnly))
         return false;
@@ -718,4 +718,4 @@ TQString ProjectDocumentationPlugin::catalogURL() const
     return m_url;
 }
 
-#include "tdevdocumentationplugin.moc"
+#include "kdevdocumentationplugin.moc"
diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index ed18a86a..a5dbe458 100644
--- a/parts/documentation/interfaces/tdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -16,8 +16,8 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#ifndef TDEV_DOC_PLUGIN_H
-#define TDEV_DOC_PLUGIN_H
+#ifndef KDEV_DOC_PLUGIN_H
+#define KDEV_DOC_PLUGIN_H
 
 #include <tqmap.h>
 #include <tqvaluelist.h>
diff --git a/parts/documentation/tdevdocumentation.desktop b/parts/documentation/kdevdocumentation.desktop
index 721970e7..674812f4 100644
--- a/parts/documentation/tdevdocumentation.desktop
+++ b/parts/documentation/kdevdocumentation.desktop
@@ -29,10 +29,10 @@ Comment[sv]=Dokumentationsinsticksprogrammet erbjuder bläddring och sökning i
 Comment[tr]=Belgelendirme eklentisi, çoklu belgelendirme sistemlerine destek ile, yerel ve çevrimiçi belgelere gözatma ve bu belgelerde arama yapılmasına izin verir.
 Comment[zh_CN]=文档插件提供了本地和在线文档中提供浏览和搜索功能，支持多种文档系统
 Comment[zh_TW]=文件外掛程式提供對本地與線上文件的瀏覽與搜尋功能，並支援多重文件系統。
-Name=TDevDocumentation
+Name=KDevDocumentation
 Name[da]=TDevelop dokumentation
 Name[nds]=TDevelop-Dokmentatschoon
-Name[pt_BR]=TDevDocumentação
+Name[pt_BR]=KDevDocumentação
 Name[sk]=KDev dokumentácia
 Name[sv]=TDevelop dokumentation
 Name[ta]=KDev ஆவணமாக்கல்
@@ -76,7 +76,7 @@ GenericName[zh_TW]=文件
 Icon=khelpcenter
 ServiceTypes=TDevelop/Plugin
 X-TDevelop-Scope=Global
-X-TDE-Library=libtdevdocumentation
+X-TDE-Library=libkdevdocumentation
 X-TDevelop-Version=5
 X-TDevelop-Mode=AssistantMode
 X-TDevelop-Properties=Documentation
diff --git a/parts/documentation/tdevpart_documentation.rc b/parts/documentation/kdevpart_documentation.rc
index 6fd8b488..f8dac85a 100644
--- a/parts/documentation/tdevpart_documentation.rc
+++ b/parts/documentation/kdevpart_documentation.rc
@@ -6,7 +6,6 @@
   <Action name="plugin_action"/>
  </Menu> -->
  <Menu name="help">
-  <Action name="help_programming_handbook"/>
   <Action name="help_look_in_index"/>
   <Action name="help_search_in_doc"/>
   <Action name="help_manpage"/>
diff --git a/parts/documentation/plugins/CMakeLists.txt b/parts/documentation/plugins/CMakeLists.txt
index 116e7674..281c40f8 100644
--- a/parts/documentation/plugins/CMakeLists.txt
+++ b/parts/documentation/plugins/CMakeLists.txt
@@ -12,6 +12,6 @@
 add_subdirectory( qt )
 add_subdirectory( doxygen )
 add_subdirectory( devhelp )
-add_subdirectory( tdevtoc )
+add_subdirectory( kdevtoc )
 add_subdirectory( chm )
 add_subdirectory( custom )
diff --git a/parts/documentation/plugins/Makefile.am b/parts/documentation/plugins/Makefile.am
index 253a0193..c2002f78 100644
--- a/parts/documentation/plugins/Makefile.am
+++ b/parts/documentation/plugins/Makefile.am
@@ -1,3 +1,3 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
-SUBDIRS = qt doxygen devhelp tdevtoc chm custom
+SUBDIRS = qt doxygen devhelp kdevtoc chm custom
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index f3287540..5acecce3 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -28,14 +28,14 @@
 #include <iostream>
 #include <fstream>
 #include <tqvaluevector.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 #include <tqregexp.h>
 
 #include "../../../../config.h"
 
-static const TDevPluginInfo data("docchmplugin");
-typedef TDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
+static const KDevPluginInfo data("docchmplugin");
+typedef KDevGenericFactory<DocCHMPlugin> DocCHMPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) )
 
 DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args
diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h
index e814248f..452e1c09 100644
--- a/parts/documentation/plugins/chm/docchmplugin.h
+++ b/parts/documentation/plugins/chm/docchmplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCHMPLUGIN_H
 #define DOCCHMPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocCHMPlugin :public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index 55d6c9c6..dd141eba 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -25,11 +25,11 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
-static const TDevPluginInfo data("doccustomplugin");
-typedef TDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
+static const KDevPluginInfo data("doccustomplugin");
+typedef KDevGenericFactory<DocCustomPlugin> DocCustomPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) )
 
 DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args
diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h
index 315e0864..f83daf1a 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.h
+++ b/parts/documentation/plugins/custom/doccustomplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCCUSTOMPLUGIN_H
 #define DOCCUSTOMPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocCustomPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
index d644df4f..4f2d50d6 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -69,8 +69,8 @@ private:
 };
 
 
-static const TDevPluginInfo data("docdevhelpplugin");
-typedef TDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
+static const KDevPluginInfo data("docdevhelpplugin");
+typedef KDevGenericFactory<DocDevHelpPlugin> DocDevHelpPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) )
 
 DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name,
diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
index 11339098..6436a1d8 100644
--- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h
+++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h
@@ -23,7 +23,7 @@
 #include <tqvaluestack.h>
 #include <tqdom.h>
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocDevHelpPlugin: public DocumentationPlugin
 {
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index dafdfa1f..7851a516 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
+typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
 
 DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h
index 15415c65..6bff409c 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.h
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDJVUPLUGIN_H
 #define DOCDVJUPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocDjvuPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index e5a7da93..9a5a6912 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -35,8 +35,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -60,8 +60,8 @@ private:
 };
 
 
-static const TDevPluginInfo data("docdoxygenplugin");
-typedef TDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
+static const KDevPluginInfo data("docdoxygenplugin");
+typedef KDevGenericFactory<DocDoxygenPlugin> DocDoxygenPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
 
 DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
index 8382f98e..ebd4a540 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCDOXYGENPLUGIN_H
 #define DOCDOXYGENPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class TQDomDocument;
 class TQDomElement;
diff --git a/parts/documentation/plugins/tdevtoc/CMakeLists.txt b/parts/documentation/plugins/kdevtoc/CMakeLists.txt
index f3d1efc2..c12c26e3 100644
--- a/parts/documentation/plugins/tdevtoc/CMakeLists.txt
+++ b/parts/documentation/plugins/kdevtoc/CMakeLists.txt
@@ -27,13 +27,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES doctdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES dockdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libdoctdevtocplugin (module) ##############
+##### libdockdevtocplugin (module) ##############
 
-tde_add_kpart( libdoctdevtocplugin AUTOMOC
-  SOURCES doctdevtocplugin.cpp
+tde_add_kpart( libdockdevtocplugin AUTOMOC
+  SOURCES dockdevtocplugin.cpp
   LINK documentation_interfaces-shared tdevelop-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/plugins/kdevtoc/Makefile.am b/parts/documentation/plugins/kdevtoc/Makefile.am
new file mode 100644
index 00000000..22dab380
--- /dev/null
+++ b/parts/documentation/plugins/kdevtoc/Makefile.am
@@ -0,0 +1,10 @@
+INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
+	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
+METASOURCES = AUTO
+kde_module_LTLIBRARIES =  libdockdevtocplugin.la
+libdockdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
+kde_services_DATA =  dockdevtocplugin.desktop
+noinst_HEADERS =  dockdevtocplugin.h
+libdockdevtocplugin_la_SOURCES =  dockdevtocplugin.cpp
+libdockdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
+	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
index aa603fbd..fa17549b 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#include "doctdevtocplugin.h"
+#include "dockdevtocplugin.h"
 
 #include <unistd.h>
 
@@ -34,8 +34,8 @@
 #include <kstandarddirs.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -59,38 +59,38 @@ private:
 };
 
 
-static const TDevPluginInfo data("doctdevtocplugin");
-typedef TDevGenericFactory<DocTDevTOCPlugin> DocTDevTOCPluginFactory;
-K_EXPORT_COMPONENT_FACTORY( libdoctdevtocplugin, DocTDevTOCPluginFactory(data) )
+static const KDevPluginInfo data("dockdevtocplugin");
+typedef KDevGenericFactory<DocKDevTOCPlugin> DocKDevTOCPluginFactory;
+K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) )
 
-DocTDevTOCPlugin::DocTDevTOCPlugin(TQObject* parent, const char* name,
+DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name,
     const TQStringList /*args*/)
-    :DocumentationPlugin(DocTDevTOCPluginFactory::instance()->config(), parent, name)
+    :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name)
 {
     setCapabilities(Index);
     autoSetup();
 }
 
-DocTDevTOCPlugin::~DocTDevTOCPlugin()
+DocKDevTOCPlugin::~DocKDevTOCPlugin()
 {
 }
 
-TQString DocTDevTOCPlugin::pluginName() const
+TQString DocKDevTOCPlugin::pluginName() const
 {
     return i18n("TDevelopTOC Documentation Collection");
 }
 
-DocumentationCatalogItem* DocTDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
+DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url)
 {
     return new TOCDocumentationCatalogItem(url, this, contents, title);
 }
 
-TQPair<KFile::Mode, TQString> DocTDevTOCPlugin::catalogLocatorProps()
+TQPair<KFile::Mode, TQString> DocKDevTOCPlugin::catalogLocatorProps()
 {
     return TQPair<KFile::Mode, TQString>(KFile::File, "*.toc");
 }
 
-TQString DocTDevTOCPlugin::catalogTitle(const TQString& url)
+TQString DocKDevTOCPlugin::catalogTitle(const TQString& url)
 {
     TQFileInfo fi(url);
     if (!fi.exists())
@@ -111,19 +111,19 @@ TQString DocTDevTOCPlugin::catalogTitle(const TQString& url)
 }
 
 
-TQStringList DocTDevTOCPlugin::fullTextSearchLocations()
+TQStringList DocKDevTOCPlugin::fullTextSearchLocations()
 {
     return TQStringList();
 }
 
-bool DocTDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
+bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/)
 {
     return false;
 }
 
-void DocTDevTOCPlugin::autoSetupPlugin()
+void DocKDevTOCPlugin::autoSetupPlugin()
 {
-    TQStringList tocsDir = DocTDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "tdevdocumentation/tocs/*.toc");
+    TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc");
     
     for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it)
     {
@@ -132,7 +132,7 @@ void DocTDevTOCPlugin::autoSetupPlugin()
     }
 }
 
-void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -177,7 +177,7 @@ void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it
     }
 }
 
-void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -210,7 +210,7 @@ void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item)
     addTocSect(tocItem, childEl, base, 1);
 }
 
-void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
+void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level)
 {
     while (!childEl.isNull())
     {
@@ -229,7 +229,7 @@ void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE
     }
 }
 
-void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
+void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
 {
     TOCDocumentationCatalogItem *tocItem = dynamic_cast<TOCDocumentationCatalogItem *>(item);
     if (!tocItem)
@@ -264,7 +264,7 @@ void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item)
     }
 }
 
-TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
+TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url)
 {
     if (base.isEmpty() && !url.isEmpty())
         return url;
@@ -274,4 +274,4 @@ TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &ur
         return base;
 }
 
-#include "doctdevtocplugin.moc"
+#include "dockdevtocplugin.moc"
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
index 5f89e8d7..1cae3582 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Type=Service
-Name=DocTDevTOCPlugin
-Name[da]=DocTDevTOC-plugin
-Name[sk]=Doc TDevTOC modul
+Name=DocKDevTOCPlugin
+Name[da]=DocKDevTOC-plugin
+Name[sk]=Doc KDevTOC modul
 Name[sv]=TDevelop innehållsförteckning-dokumentationsinsticksmodul
-Name[ta]=DocTDevTOC  சொருகு
+Name[ta]=DocKDevTOC  சொருகு
 Name[zh_TW]=TDevelop 目錄文件外掛程式
 Exec=blubb
 Comment=Documentation plugin for TDevelopTOC documentation
@@ -40,4 +40,4 @@ Comment[zh_CN]=TDevelopTOC 文档的文档插件
 Comment[zh_TW]=TDevelop 目錄文件外掛程式
 ServiceTypes=TDevelop/DocumentationPlugins
 X-TDevelop-Version=5
-X-TDE-Library=libdoctdevtocplugin
+X-TDE-Library=libdockdevtocplugin
diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
index 266efb94..7205cc4c 100644
--- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h
+++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h
@@ -17,20 +17,20 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef DOCTDEVTOCPLUGIN_H
-#define DOCTDEVTOCPLUGIN_H
+#ifndef DOCKDEVTOCPLUGIN_H
+#define DOCKDEVTOCPLUGIN_H
 
 #include <tqdom.h>
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
-class DocTDevTOCPlugin : public DocumentationPlugin
+class DocKDevTOCPlugin : public DocumentationPlugin
 {
     Q_OBJECT
   
 public:
-    DocTDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
-    ~DocTDevTOCPlugin();
+    DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList());
+    ~DocKDevTOCPlugin();
 
     virtual TQString pluginName() const;
     
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index b0ebd29d..fc647d34 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
+typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
 
 DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h
index d1319012..40dd3a15 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.h
+++ b/parts/documentation/plugins/pdb/docpdbplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDBPLUGIN_H
 #define DOCPDBPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocPDBPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 322a33d3..65bddd1b 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -25,10 +25,10 @@
 #include <tdelocale.h>
 #include <tdelistview.h>
 
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 
 static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0");
-typedef TDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
+typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
 
 DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args)
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h
index a5410196..d5ecc7eb 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.h
+++ b/parts/documentation/plugins/pdf/docpdfplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCPDFPLUGIN_H
 #define DOCPDFPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 
 class DocPDFPlugin : public DocumentationPlugin {
 public:
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 301859ca..10271524 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -32,8 +32,8 @@
 #include <tdelistview.h>
 
 #include <urlutil.h>
-#include <tdevgenericfactory.h>
-#include <tdevplugininfo.h>
+#include <kdevgenericfactory.h>
+#include <kdevplugininfo.h>
 
 #include "../../../../config.h"
 
@@ -56,8 +56,8 @@ private:
     TQString m_dcfFile;
 };
 
-static const TDevPluginInfo data("docqtplugin");
-typedef TDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
+static const KDevPluginInfo data("docqtplugin");
+typedef KDevGenericFactory<DocQtPlugin> DocQtPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
 
 DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h
index 964ef844..8eac8456 100644
--- a/parts/documentation/plugins/qt/docqtplugin.h
+++ b/parts/documentation/plugins/qt/docqtplugin.h
@@ -20,7 +20,7 @@
 #ifndef DOCTQTPLUGIN_H
 #define DOCTQTPLUGIN_H
 
-#include <tdevdocumentationplugin.h>
+#include <kdevdocumentationplugin.h>
 #include <tqdom.h>
 
 class TDEConfig;
diff --git a/parts/documentation/plugins/tdevtoc/Makefile.am b/parts/documentation/plugins/tdevtoc/Makefile.am
deleted file mode 100644
index 4baaaa86..00000000
--- a/parts/documentation/plugins/tdevtoc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \
-	-I$(top_srcdir)/parts/documentation/interfaces $(all_includes)
-METASOURCES = AUTO
-kde_module_LTLIBRARIES =  libdoctdevtocplugin.la
-libdoctdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-kde_services_DATA =  doctdevtocplugin.desktop
-noinst_HEADERS =  doctdevtocplugin.h
-libdoctdevtocplugin_la_SOURCES =  doctdevtocplugin.cpp
-libdoctdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \
-	$(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la
diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt
index 8d97053e..c444c226 100644
--- a/parts/documentation/protocols/chm/CMakeLists.txt
+++ b/parts/documentation/protocols/chm/CMakeLists.txt
@@ -43,6 +43,6 @@ tde_add_kpart( tdeio_chm
 
 tde_add_kpart( libkchmpart AUTOMOC
   SOURCES kchmpart.cpp
-  LINK tdevwidgets-shared
+  LINK kdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index de7e0929..5a1092a2 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ tdeio_chm_la_LIBADD = $(LIB_TDEIO)
 tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libtdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index ab688ff7..952228c4 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -67,7 +67,7 @@ TDEInstance* KChmPartFactory::instance()
 
 
 KChmPart::KChmPart( TQWidget * parent, const char * name )
-	: TDevHTMLPart(  ), m_job(0)
+	: KDevHTMLPart(  ), m_job(0)
 {
    TDEInstance * instance = new TDEInstance( "kchmpart" );
    setInstance( instance );
@@ -80,7 +80,7 @@ bool KChmPart::openURL( const KURL &url )
    KURL chmURL = url;
    chmURL.setProtocol("ms-its");
    chmURL.addPath("/");
-   return TDevHTMLPart::openURL(chmURL);
+   return KDevHTMLPart::openURL(chmURL);
 }
 
 void KChmPart::slotDuplicate()
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index a3c8d9ec..9d1812b1 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -23,7 +23,7 @@
 #include <tdehtml_part.h>
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
-#include <tdevhtmlpart.h>
+#include <kdevhtmlpart.h>
 
 #include <tqcstring.h>
 
@@ -52,7 +52,7 @@ class KChmPartFactory: public KParts::Factory
 };
 
 
-class KChmPart : public TDevHTMLPart
+class KChmPart : public KDevHTMLPart
 {
    Q_OBJECT
   
diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp
index 2893d574..67dca0ed 100644
--- a/parts/documentation/searchview.cpp
+++ b/parts/documentation/searchview.cpp
@@ -43,8 +43,8 @@
 #include <tdemessagebox.h>
 #include <kdebug.h>
 
-#include <tdevpartcontroller.h>
-#include <tdevdocumentationplugin.h>
+#include <kdevpartcontroller.h>
+#include <kdevdocumentationplugin.h>
 
 #include "documentation_part.h"
 #include "docutils.h"
@@ -160,7 +160,7 @@ void SearchView::search()
         return;
     }
 
-    TQString indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     TQDir d;
     if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf"))
     {
@@ -177,7 +177,7 @@ void SearchView::search()
         }
     }
 
-    TQString savedir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     if (!d.exists(savedir))
         d.mkdir(savedir);
 
@@ -191,7 +191,7 @@ void SearchView::search()
     kdDebug(9002) << "starting kprocess" << endl;
     kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query <<  endl;
     TDEProcess *proc = new TDEProcess;
-    TQString picdir = kapp->dirs()->findResourceDir("data", "tdevdocumentation/pics/htdig.png");
+    TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png");
     proc->setEnvironment("PICDIR", picdir);
     *proc << exe << "-c" << (indexdir + "/htdig.conf") << query;
 
diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h
index e7e850bf..6ca5ad8b 100644
--- a/parts/documentation/selecttopic.h
+++ b/parts/documentation/selecttopic.h
@@ -22,7 +22,7 @@
 
 #include "selecttopicbase.h"
 
-#include "tdevdocumentationplugin.h"
+#include "kdevdocumentationplugin.h"
 
 class SelectTopic: public SelectTopicBase{
 Q_OBJECT
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index d422826c..c99c4a2c 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -45,10 +45,10 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name)
 {
     proc = 0;
 
-    indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search");
+    indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search");
     TQDir d; d.mkdir(indexdir);
 
-    TDEConfig config("tdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     databaseDir = config.readPathEntry("databaseDir", indexdir);
 
@@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n)
 
 void ProgressDialog::setState(int n)
 {
-    TQPixmap unchecked = TQPixmap(locate("data", "tdevdocumentation/pics/unchecked.xpm"));
-    TQPixmap checked = TQPixmap(locate("data", "tdevdocumentation/pics/checked.xpm"));
+    TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm"));
+    TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm"));
 
     check1->setPixmap( n > 0 ? checked : unchecked);
     check2->setPixmap( n > 1 ? checked : unchecked);
@@ -182,7 +182,7 @@ void ProgressDialog::addDir(const TQString &dir)
 
 void ProgressDialog::scanDirectories()
 {
-    TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt");
+    TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt");
 
     TQFile f(ftsLocationsFile);
     if (!f.open(IO_ReadOnly))
@@ -214,15 +214,15 @@ bool ProgressDialog::createConfig()
     if (language == "C")
         language = "en";
 
-    TQString wrapper = locate("data", TQString("tdevdocumentation/%1/wrapper.html").arg(language));
+    TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language));
     if (wrapper.isEmpty())
-        wrapper = locate("data", TQString("tdevdocumentation/en/wrapper.html"));
+        wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html"));
     if (wrapper.isEmpty())
         return false;
     wrapper = wrapper.left(wrapper.length()-12);
 
     // locate the image dir
-    TQString images = locate("data", "tdevdocumentation/pics/star.png");
+    TQString images = locate("data", "kdevdocumentation/pics/star.png");
     if (images.isEmpty())
         return false;
     images = images.left(images.length()-8);
@@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex()
     setState(1);
     procdone = false;
     // run htdig
-    TDEConfig config("tdevdocumentation", true);
+    TDEConfig config("kdevdocumentation", true);
     config.setGroup("htdig");
     exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"));
     if (exe.isEmpty())
@@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc)
         setFilesDigged(filesToDig);
         setState(2);
 
-        TDEConfig config("tdevdocumentation", true);
+        TDEConfig config("kdevdocumentation", true);
         config.setGroup("htdig");
         // run htmerge -----------------------------------------------------
         exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"));