Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

14 files changed, 82 insertions, 82 deletions

diff --git a/parts/classview/CMakeLists.txt b/parts/classview/CMakeLists.txt
index a5ec68dc..2d19388a 100644
--- a/parts/classview/CMakeLists.txt
+++ b/parts/classview/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevclassview )
+install( FILES kdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevclassview )
 
 
-##### libtdevclassview (module) #################
+##### libkdevclassview (module) #################
 
-tde_add_kpart( libtdevclassview AUTOMOC
+tde_add_kpart( libkdevclassview AUTOMOC
   SOURCES
     classviewpart.cpp classviewwidget.cpp digraphview.cpp
     hierarchydlg.cpp navigator.cpp viewcombos.cpp
   LINK
-    tdevextensions-static tdevelop-shared tdevwidgets-shared
+    kdevextensions-static tdevelop-shared kdevwidgets-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am
index ccc02078..3041259e 100644
--- a/parts/classview/Makefile.am
+++ b/parts/classview/Makefile.am
@@ -3,20 +3,20 @@
 INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \
 	-I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevclassview.la
-libtdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la
+kde_module_LTLIBRARIES = libkdevclassview.la
+libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la
 
-libtdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
+libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \
 	digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevclassview.desktop
+service_DATA = kdevclassview.desktop
 
-rcdir = $(kde_datadir)/tdevclassview
-rc_DATA = tdevclassview.rc
+rcdir = $(kde_datadir)/kdevclassview
+rc_DATA = kdevclassview.rc
 
 
 QTDIR = /home/bernd/kdesrc/qt-copy
diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp
index f0c49d46..c0cc21a2 100644
--- a/parts/classview/classtooldlg.cpp
+++ b/parts/classview/classtooldlg.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "classstore.h"
 #include "parsedclass.h"
 #include "classviewpart.h"
@@ -119,8 +119,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part )
     connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods()));
     connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes()));
 
-    connect( part, TQT_SIGNAL(setLanguageSupport(TDevLanguageSupport*)),
-             this, TQT_SLOT(setLanguageSupport(TDevLanguageSupport*)) );
+    connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)),
+             this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) );
 
     m_part->registerClassToolDialog(this);
 }
@@ -132,7 +132,7 @@ ClassToolDialog::~ClassToolDialog()
 }
 
 
-void ClassToolDialog::setLanguageSupport(TDevLanguageSupport *ls)
+void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls) {
         disconnect(ls, 0, this, 0);
diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h
index c4b2e79a..d143e66e 100644
--- a/parts/classview/classtooldlg.h
+++ b/parts/classview/classtooldlg.h
@@ -59,7 +59,7 @@ public slots:
     void viewAttributes();
 
 private slots:
-    void setLanguageSupport(TDevLanguageSupport *ls);
+    void setLanguageSupport(KDevLanguageSupport *ls);
     void refresh();
 
     void delayedClose();
@@ -85,7 +85,7 @@ private:
     
     /** Store that holds all classes in the system. */
     ClassStore *m_store;
-    TDevLanguageSupport *m_ls;
+    KDevLanguageSupport *m_ls;
     ClassViewPart *m_part;
     
     /** The class we are currently viewing. */
diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp
index 66e23173..9e052418 100644
--- a/parts/classview/classtreebase.cpp
+++ b/parts/classview/classtreebase.cpp
@@ -22,10 +22,10 @@
 #include <tdelocale.h>
 #include <kiconloader.h>
 
-#include "tdevcore.h"
-#include "tdevlanguagesupport.h"
-#include "tdevmainwindow.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevlanguagesupport.h"
+#include "kdevmainwindow.h"
+#include "kdevpartcontroller.h"
 #include "classstore.h"
 
 #include "classviewpart.h"
@@ -36,10 +36,10 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     if (!m_item || m_item->itemType() == PIT_SCOPE)
         return 0;
 
-    TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+    KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
 
     TDEPopupMenu *popup = new TDEPopupMenu();
-    if (features & TDevLanguageSupport::Declarations)
+    if (features & KDevLanguageSupport::Declarations)
         popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) );
     if (m_item->itemType() == PIT_METHOD)
         popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) );
@@ -49,8 +49,8 @@ TDEPopupMenu *ClassTreeItem::createPopup()
     case PIT_CLASS:
         {
             title = i18n("Class");
-            bool hasAddMethod = features & TDevLanguageSupport::AddMethod;
-            bool hasAddAttribute = features & TDevLanguageSupport::AddAttribute;
+            bool hasAddMethod = features & KDevLanguageSupport::AddMethod;
+            bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute;
             if (hasAddMethod)
                 popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod()));
             if (hasAddAttribute)
@@ -168,7 +168,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         ClassTreeItem *lastItem = 0;
 
         // Ok, this is a hack...
-        TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
+        KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features();
         
         // Add namespaces
         TQValueList<ParsedScopeContainer*> scopeList = pScope->getSortedScopeList();
@@ -176,7 +176,7 @@ void ClassTreeScopeItem::setOpen(bool o)
         for (it = scopeList.begin(); it != scopeList.end(); ++it)
             lastItem = new ClassTreeScopeItem(this, lastItem, *it);
 
-        if (features & TDevLanguageSupport::Classes) {
+        if (features & KDevLanguageSupport::Classes) {
             // Add classes
             TQValueList<ParsedClass*> classList = pScope->getSortedClassList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -184,7 +184,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it);
         }
             
-        if (features & TDevLanguageSupport::Structs) {
+        if (features & KDevLanguageSupport::Structs) {
             // Add structs
             TQValueList<ParsedClass*> structList = pScope->getSortedStructList();
             TQValueList<ParsedClass*>::ConstIterator it;
@@ -192,7 +192,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeClassItem(this, lastItem, *it, true);
         }
 
-        if (features & TDevLanguageSupport::Functions) {
+        if (features & KDevLanguageSupport::Functions) {
             // Add functions
             TQValueList<ParsedMethod*> methodList = pScope->getSortedMethodList();
             TQValueList<ParsedMethod*>::ConstIterator it;
@@ -200,7 +200,7 @@ void ClassTreeScopeItem::setOpen(bool o)
                 lastItem = new ClassTreeMethodItem(this, lastItem, *it);
         }
 
-        if (features & TDevLanguageSupport::Variables) {
+        if (features & KDevLanguageSupport::Variables) {
             // Add attributes
             TQValueList<ParsedAttribute*> attrList = pScope->getSortedAttributeList();
             TQValueList<ParsedAttribute*>::ConstIterator it;
diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp
index 7cdf8cbd..92e26bd0 100644
--- a/parts/classview/classviewpart.cpp
+++ b/parts/classview/classviewpart.cpp
@@ -26,19 +26,19 @@
 
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmimetype.h>
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevlanguagesupport.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevlanguagesupport.h>
 #include <kcomboview.h>
-#include <tdevpartcontroller.h>
-#include <tdevproject.h>
+#include <kdevpartcontroller.h>
+#include <kdevproject.h>
 #include <urlutil.h>
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
 
 #include <codemodel.h>
 #include <codemodel_utils.h>
@@ -138,17 +138,17 @@ class FunctionCompletion : public CustomCompleter {
 };
 
 
-typedef TDevGenericFactory<ClassViewPart> ClassViewFactory;
-static const TDevPluginInfo data("tdevclassview");
-K_EXPORT_COMPONENT_FACTORY( libtdevclassview, ClassViewFactory( data ) )
+typedef KDevGenericFactory<ClassViewPart> ClassViewFactory;
+static const KDevPluginInfo data("kdevclassview");
+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) )
 
 ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& )
-    :/// TDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
-    TDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
+    :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ),
+    KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ),
     m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0)
 {
     setInstance(ClassViewFactory::instance());
-    setXMLFile("tdevclassview.rc");
+    setXMLFile("kdevclassview.rc");
     
     navigator = new Navigator(this);
 
@@ -207,7 +207,7 @@ void ClassViewPart::setupActions( )
 
     new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" );
 
-    if (langHasFeature(TDevLanguageSupport::Classes))
+    if (langHasFeature(KDevLanguageSupport::Classes))
     {
         TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia");
         ac->setToolTip(i18n("Class inheritance diagram"));
@@ -216,7 +216,7 @@ void ClassViewPart::setupActions( )
     }
 }
 
-bool ClassViewPart::langHasFeature(TDevLanguageSupport::Features feature)
+bool ClassViewPart::langHasFeature(KDevLanguageSupport::Features feature)
 {
     bool result = false;
     if (languageSupport())
diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h
index 70d00cc9..16e18def 100644
--- a/parts/classview/classviewpart.h
+++ b/parts/classview/classviewpart.h
@@ -18,16 +18,16 @@
  *
  */
 
-#ifndef __TDEVPART_CLASSVIEW_H__
-#define __TDEVPART_CLASSVIEW_H__
+#ifndef __KDEVPART_CLASSVIEW_H__
+#define __KDEVPART_CLASSVIEW_H__
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "viewcombos.h"
 
 #include <tqguardedptr.h>
 #include <tqmap.h>
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <codemodel.h>
 #include <codebrowserfrontend.h>
@@ -52,7 +52,7 @@ class TDEToolBarPopupAction;
 class NamespaceItem;
 class Navigator;
 class HierarchyDialog;
-class ClassViewPart : public Extensions::TDevCodeBrowserFrontend
+class ClassViewPart : public Extensions::KDevCodeBrowserFrontend
 {
     Q_OBJECT
   
@@ -60,7 +60,7 @@ public:
     ClassViewPart(TQObject *parent, const char *name, const TQStringList &);
     virtual ~ClassViewPart();
 
-    bool langHasFeature(TDevLanguageSupport::Features feature);
+    bool langHasFeature(KDevLanguageSupport::Features feature);
     
     TDEListViewAction *m_functionsnav;
     Navigator *navigator;
diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp
index cede06f3..22b865ef 100644
--- a/parts/classview/classviewwidget.cpp
+++ b/parts/classview/classviewwidget.cpp
@@ -31,10 +31,10 @@
 #include <tdeconfig.h>
 
 #include <urlutil.h>
-#include <tdevcore.h>
-#include <tdevlanguagesupport.h>
-#include <tdevproject.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevlanguagesupport.h>
+#include <kdevproject.h>
+#include <kdevpartcontroller.h>
 #include <codemodel.h>
 #include <codemodel_utils.h>
 
@@ -252,7 +252,7 @@ void ClassViewWidget::insertFile( const TQString& fileName )
 	}
 	break;
 
-    case TDevelop2ViewMode:
+    case KDevelop2ViewMode:
 	{
 	}
 	break;
@@ -293,7 +293,7 @@ void ClassViewWidget::removeFile( const TQString& fileName )
 	}
 	break;
 
-    case TDevelop2ViewMode:
+    case KDevelop2ViewMode:
 	{
 	}
 	break;
@@ -332,19 +332,19 @@ void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev )
 
     bool sep = false;
     if( item && item->isClass() ){
-        if( m_part->langHasFeature(TDevLanguageSupport::AddMethod) ) {
+        if( m_part->langHasFeature(KDevLanguageSupport::AddMethod) ) {
             m_actionAddMethod->plug( &menu );
             sep = true;
         }
 	
-        if( m_part->langHasFeature(TDevLanguageSupport::AddAttribute) ) {
+        if( m_part->langHasFeature(KDevLanguageSupport::AddAttribute) ) {
 	    m_actionAddAttribute->plug( &menu );
             sep = true;
         }	
     }
 	
 	if (item && item->isVariable()){
-		if( m_part->langHasFeature(TDevLanguageSupport::CreateAccessMethods) ) 
+		if( m_part->langHasFeature(KDevLanguageSupport::CreateAccessMethods) ) 
 				m_actionCreateAccessMethods->plug( &menu );
 	}
 
@@ -1108,7 +1108,7 @@ TQString VariableDomBrowserItem::key( int , bool ) const
 
 void ClassViewWidget::slotNewClass( )
 {
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::NewClass )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::NewClass )
 	m_part->languageSupport()->addClass();
 }
 
@@ -1116,7 +1116,7 @@ void ClassViewWidget::slotAddMethod( )
 {
     if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddMethod )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddMethod )
         m_part->languageSupport()->addMethod( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1124,7 +1124,7 @@ void ClassViewWidget::slotAddAttribute( )
 {
     if ( !selectedItem() ) return;
     
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::AddAttribute )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::AddAttribute )
         m_part->languageSupport()->addAttribute( static_cast<ClassDomBrowserItem*>( selectedItem() )->dom() );
 }
 
@@ -1271,7 +1271,7 @@ void ClassViewWidget::slotCreateAccessMethods( )
 {
 	if ( !selectedItem() ) return;
 
-    if( m_part->languageSupport()->features() & TDevLanguageSupport::CreateAccessMethods )
+    if( m_part->languageSupport()->features() & KDevLanguageSupport::CreateAccessMethods )
 	{
         VariableDomBrowserItem* item = dynamic_cast<VariableDomBrowserItem*>( selectedItem() );
 		if (item == 0)
diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h
index 1d17efec..d74448f5 100644
--- a/parts/classview/classviewwidget.h
+++ b/parts/classview/classviewwidget.h
@@ -31,7 +31,7 @@
 #include <fancylistviewitem.h>
 #include <navigator.h>
 
-class TDevProject;
+class KDevProject;
 class ClassViewPart;
 class ClassViewItem;
 class FolderBrowserItem;
@@ -51,7 +51,7 @@ public:
     enum ViewMode
     {
 	KDevelop3ViewMode = 0,
-	TDevelop2ViewMode,
+	KDevelop2ViewMode,
 	JavaLikeViewMode
     };
 
diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp
index 6901926b..c8761861 100644
--- a/parts/classview/hierarchydlg.cpp
+++ b/parts/classview/hierarchydlg.cpp
@@ -28,7 +28,7 @@
 #include <tqapplication.h>
 #include <tqsplitter.h>
 
-#include "tdevlanguagesupport.h"
+#include "kdevlanguagesupport.h"
 #include "kcomboview.h"
 
 #include "classviewpart.h"
@@ -105,7 +105,7 @@ void HierarchyDialog::save()
     {
 	TQFileInfo fi(dlg.selectedURL().pathOrURL());
         TQApplication::setOverrideCursor( TQt::waitCursor );
-        TDevLanguageSupport *ls = m_part->languageSupport();
+        KDevLanguageSupport *ls = m_part->languageSupport();
         for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
         {
             kdDebug(9003) << "Adding class to graph: " << it.key() << endl;
@@ -134,7 +134,7 @@ void HierarchyDialog::refresh()
     ViewCombosOp::refreshNamespaces(m_part, namespace_combo);
     processNamespace("", m_part->codeModel()->globalNamespace());
 
-    TDevLanguageSupport *ls = m_part->languageSupport();
+    KDevLanguageSupport *ls = m_part->languageSupport();
 
     for (TQMap<TQString, ClassDom>::const_iterator it = classes.begin(); it != classes.end(); ++it)
     {
@@ -154,7 +154,7 @@ void HierarchyDialog::refresh()
     digraph->process();
 }
 
-void HierarchyDialog::setLanguageSupport(TDevLanguageSupport *ls)
+void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls)
 {
     if (ls)
         connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh()));
@@ -169,7 +169,7 @@ void HierarchyDialog::slotClassComboChoice(TQListViewItem * item)
     if (!ci)
         return;
 
-    TDevLanguageSupport *ls = m_part->languageSupport();
+    KDevLanguageSupport *ls = m_part->languageSupport();
 
     TQString className = ls->formatClassName(uclasses[item->text(0)]);
     digraph->setSelected(className);
@@ -188,7 +188,7 @@ void HierarchyDialog::slotClassComboChoice( const TQString& itemText )
             if (!ci)
                 return;
         
-            TDevLanguageSupport *ls = m_part->languageSupport();
+            KDevLanguageSupport *ls = m_part->languageSupport();
         
             TQString className = ls->formatClassName(uclasses[item->text(0)]);
             digraph->setSelected(className);
@@ -205,10 +205,10 @@ void HierarchyDialog::classSelected(const TQString &/*className*/)
 /*    ParsedClass *currentClass = m_part->classStore()->getClassByName(className);
     member_tree->clear();
     if (currentClass) {
-        TDevLanguageSupport::Features features = m_part->languageSupport()->features();
-        if (features & TDevLanguageSupport::Functions)
+        KDevLanguageSupport::Features features = m_part->languageSupport()->features();
+        if (features & KDevLanguageSupport::Functions)
             member_tree->insertAllClassMethods(currentClass, (PIAccess)-1);
-        if (features & TDevLanguageSupport::Variables)
+        if (features & KDevLanguageSupport::Variables)
             member_tree->insertAllClassAttributes(currentClass, (PIAccess)-1);
     }*/
 }
diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h
index 9d26ebd0..1c41a8f0 100644
--- a/parts/classview/hierarchydlg.h
+++ b/parts/classview/hierarchydlg.h
@@ -17,7 +17,7 @@
 #include "codemodel.h"
 
 class ClassViewPart;
-class TDevLanguageSupport;
+class KDevLanguageSupport;
 class DigraphView;
 class ClassToolWidget;
 class KComboView;
@@ -35,7 +35,7 @@ public slots:
     void refresh();
 
 private slots:
-    void setLanguageSupport(TDevLanguageSupport *ls);
+    void setLanguageSupport(KDevLanguageSupport *ls);
     void slotClassComboChoice(TQListViewItem *item);
     void slotNamespaceComboChoice(TQListViewItem *item);
     void slotClassComboChoice(const TQString&);
diff --git a/parts/classview/tdevclassview.desktop b/parts/classview/kdevclassview.desktop
index 10200b50..49bfa43c 100644
--- a/parts/classview/tdevclassview.desktop
+++ b/parts/classview/kdevclassview.desktop
@@ -76,7 +76,7 @@ GenericName[tr]=Sınıf Görünümü
 GenericName[zh_CN]=类查看器
 GenericName[zh_TW]=類別檢視
 ServiceTypes=TDevelop/CodeBrowserFrontend
-X-TDE-Library=libtdevclassview
+X-TDE-Library=libkdevclassview
 X-TDevelop-Version=5
 X-TDevelop-Scope=Project
 X-TDevelop-Properties=CodeNavigation
diff --git a/parts/classview/tdevclassview.rc b/parts/classview/kdevclassview.rc
index b5f7a9fb..b5f7a9fb 100644
--- a/parts/classview/tdevclassview.rc
+++ b/parts/classview/kdevclassview.rc
diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp
index a7e3ac85..694aa0d4 100644
--- a/parts/classview/navigator.cpp
+++ b/parts/classview/navigator.cpp
@@ -31,9 +31,9 @@
 
 #include <kcomboview.h>
 #include <tdelistviewaction.h>
-#include <tdevpartcontroller.h>
-#include <tdevlanguagesupport.h>
-#include <tdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevlanguagesupport.h>
+#include <kdevmainwindow.h>
 #include <codemodel_utils.h>
 #include "classviewpart.h"
 #include "classviewwidget.h"