Revert "Finish renaming tdevelop components"

This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.

10 files changed, 114 insertions, 114 deletions

diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt
index b310f791..8f18792e 100644
--- a/parts/fileselector/CMakeLists.txt
+++ b/parts/fileselector/CMakeLists.txt
@@ -27,12 +27,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES tdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### libtdevfileselector (module) ##############
+##### libkdevfileselector (module) ##############
 
-tde_add_kpart( libtdevfileselector AUTOMOC
+tde_add_kpart( libkdevfileselector AUTOMOC
   SOURCES
     fileselector_part.cpp fileselector_widget.cpp
     tdeactionselector.cpp kbookmarkhandler.cpp
diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am
index 43ee404b..f0c2fc35 100644
--- a/parts/fileselector/Makefile.am
+++ b/parts/fileselector/Makefile.am
@@ -2,17 +2,17 @@
 
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/sourceinfo $(all_includes)
 
-kde_module_LTLIBRARIES = libtdevfileselector.la
-libtdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libtdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
+kde_module_LTLIBRARIES = libkdevfileselector.la
+libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la
 
-libtdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
+libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp
 
 METASOURCES = AUTO
 
 servicedir = $(kde_servicesdir)
-service_DATA = tdevfileselector.desktop
+service_DATA = kdevfileselector.desktop
 
 # not used currently
-#rcdir = $(kde_datadir)/tdevfileselector
-#rc_DATA = tdevfileselector.rc
+#rcdir = $(kde_datadir)/kdevfileselector
+#rc_DATA = kdevfileselector.rc
diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp
index 331bb639..a6b4a6bb 100644
--- a/parts/fileselector/fileselector_part.cpp
+++ b/parts/fileselector/fileselector_part.cpp
@@ -13,33 +13,33 @@
 #include <ktextbrowser.h>
 #include <tdeconfig.h>
 #include <tdefileitem.h>
-#include <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
 #include <tdediroperator.h>
 #include <kdialogbase.h>
 #include <tdemessagebox.h>
 
-#include <tdevapi.h>
-#include <tdevcore.h>
-#include <tdevproject.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
-#include <tdevplugininfo.h>
-#include <tdevcreatefile.h>
+#include <kdevapi.h>
+#include <kdevcore.h>
+#include <kdevproject.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
+#include <kdevplugininfo.h>
+#include <kdevcreatefile.h>
 
 #include <ktip.h>
 
 #include "fileselector_widget.h"
 
-typedef TDevGenericFactory<FileSelectorPart> FileSelectorFactory;
-static const TDevPluginInfo data("tdevfileselector");
-K_EXPORT_COMPONENT_FACTORY( libtdevfileselector, FileSelectorFactory( data ) )
+typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory;
+static const KDevPluginInfo data("kdevfileselector");
+K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) )
 
 FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &)
-    : TDevPlugin(&data, parent, name ? name : "FileSelectorPart")
+    : KDevPlugin(&data, parent, name ? name : "FileSelectorPart")
 {
     setInstance(FileSelectorFactory::instance());
 
-    m_filetree = new TDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
+    m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" );
 
     connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)),
 	     this, TQT_SLOT(fileSelected(const KFileItem*)));
@@ -63,7 +63,7 @@ FileSelectorPart::~FileSelectorPart()
 	mainWindow()->removeView( m_filetree );
     }
 
-    delete (TDevFileSelector*) m_filetree;
+    delete (KDevFileSelector*) m_filetree;
 }
 
 void FileSelectorPart::fileSelected( const KFileItem * file )
@@ -90,14 +90,14 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg )
 
 void FileSelectorPart::newFile()
 {
-    TDevCreateFile *creator = extension<TDevCreateFile>("TDevelop/CreateFile");
+    KDevCreateFile *creator = extension<KDevCreateFile>("TDevelop/CreateFile");
     if (creator)
     {
-        TDevCreateFile::CreatedFile file = creator->createNewFile("",
+        KDevCreateFile::CreatedFile file = creator->createNewFile("",
             m_filetree->dirOperator()->url().path());
-        if (file.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED)
+        if (file.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED)
             KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid."));
-        else if (file.status != TDevCreateFile::CreatedFile::STATUS_CANCELED)
+        else if (file.status != KDevCreateFile::CreatedFile::STATUS_CANCELED)
         {
             partController()->editDocument(KURL::fromPathOrURL(
                 file.dir + "/" + file.filename));
diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h
index 80841deb..f415444d 100644
--- a/parts/fileselector/fileselector_part.h
+++ b/parts/fileselector/fileselector_part.h
@@ -1,17 +1,17 @@
-#ifndef __TDEVPART_FILESELECTOR_H__
-#define __TDEVPART_FILESELECTOR_H__
+#ifndef __KDEVPART_FILESELECTOR_H__
+#define __KDEVPART_FILESELECTOR_H__
 
-#include <tdevplugin.h>
+#include <kdevplugin.h>
 
 #include <kdialogbase.h>
 #include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 
-class TDevFileSelector;
+class KDevFileSelector;
 class KDialogBase;
 
-class FileSelectorPart : public TDevPlugin
+class FileSelectorPart : public KDevPlugin
 {
     Q_OBJECT
   
@@ -33,7 +33,7 @@ private slots:
     void slotConfigWidget( KDialogBase * );
 
 private:
-    TQGuardedPtr<TDevFileSelector> m_filetree;
+    TQGuardedPtr<KDevFileSelector> m_filetree;
     TDEAction *m_newFileAction;
 };
 
diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp
index 1d6fb154..894bf185 100644
--- a/parts/fileselector/fileselector_widget.cpp
+++ b/parts/fileselector/fileselector_widget.cpp
@@ -26,9 +26,9 @@
 #include "tdeactionselector.h"
 #include "kbookmarkhandler.h"
 
-#include <tdevcore.h>
-#include <tdevmainwindow.h>
-#include <tdevpartcontroller.h>
+#include <kdevcore.h>
+#include <kdevmainwindow.h>
+#include <kdevpartcontroller.h>
 
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -76,32 +76,32 @@ static void silenceTQToolBar(TQtMsgType, const char *)
 {}
 
 
-TDevFileSelectorToolBar::TDevFileSelectorToolBar(TQWidget *parent)
+KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent)
         : TDEToolBar( parent, "KDev FileSelector Toolbar", true )
 {
     setMinimumWidth(10);
 }
 
-TDevFileSelectorToolBar::~TDevFileSelectorToolBar()
+KDevFileSelectorToolBar::~KDevFileSelectorToolBar()
 {}
 
-void TDevFileSelectorToolBar::setMovingEnabled( bool)
+void KDevFileSelectorToolBar::setMovingEnabled( bool)
 {
     TDEToolBar::setMovingEnabled(false);
 }
 
 
-TDevFileSelectorToolBarParent::TDevFileSelectorToolBarParent(TQWidget *parent)
+KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent)
         :TQFrame(parent),m_tb(0)
 {}
-TDevFileSelectorToolBarParent::~TDevFileSelectorToolBarParent()
+KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent()
 {}
-void TDevFileSelectorToolBarParent::setToolBar(TDevFileSelectorToolBar *tb)
+void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb)
 {
     m_tb=tb;
 }
 
-void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
+void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
     if (m_tb)
     {
@@ -113,8 +113,8 @@ void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 
 //BEGIN Constructor/destructor
 
-TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow,
-                                    TDevPartController *partController,
+KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow,
+                                    KDevPartController *partController,
                                     TQWidget * parent, const char * name )
         : TQWidget(parent, name),
         m_part(part),
@@ -127,8 +127,8 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
 
     TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
 
-    TDevFileSelectorToolBarParent *tbp=new TDevFileSelectorToolBarParent(this);
-    toolbar = new TDevFileSelectorToolBar(tbp);
+    KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this);
+    toolbar = new KDevFileSelectorToolBar(tbp);
     tbp->setToolBar(toolbar);
     lo->addWidget(tbp);
     toolbar->setMovingEnabled(false);
@@ -142,7 +142,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
     lo->addWidget(cmbPath);
     cmbPath->listBox()->installEventFilter( this );
 
-    dir = new TDevDirOperator(m_part, KURL(), this, "operator");
+    dir = new KDevDirOperator(m_part, KURL(), this, "operator");
     dir->setView(KFile::/*Simple*/Detail);
 
     TDEActionCollection *coll = dir->actionCollection();
@@ -229,7 +229,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main
                      "reapplies the last filter used when toggled on.") );
 }
 
-TDevFileSelector::~TDevFileSelector()
+KDevFileSelector::~KDevFileSelector()
 {
 	writeConfig( m_part->instance()->config(), "fileselector" );
 }
@@ -237,7 +237,7 @@ TDevFileSelector::~TDevFileSelector()
 
 //BEGIN Public Methods
 
-void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
+void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 {
     dir->readConfig(config, name + ":dir");
     dir->setView( KFile::Default );
@@ -283,12 +283,12 @@ void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name)
 
 }
 
-void TDevFileSelector::initialDirChangeHack()
+void KDevFileSelector::initialDirChangeHack()
 {
     setDir( waitingDir );
 }
 
-void TDevFileSelector::setupToolbar( TDEConfig *config )
+void KDevFileSelector::setupToolbar( TDEConfig *config )
 {
     toolbar->clear();
     TQStringList tbactions = config->readListEntry( "toolbar actions", ',' );
@@ -311,7 +311,7 @@ void TDevFileSelector::setupToolbar( TDEConfig *config )
     }
 }
 
-void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
+void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
 {
     dir->writeConfig(config,name + ":dir");
 
@@ -332,7 +332,7 @@ void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name)
     config->writeEntry( "AutoSyncEvents", autoSyncEvents );
 }
 
-void TDevFileSelector::setView(KFile::FileView view)
+void KDevFileSelector::setView(KFile::FileView view)
 {
     dir->setView(view);
 }
@@ -341,7 +341,7 @@ void TDevFileSelector::setView(KFile::FileView view)
 
 //BEGIN Public Slots
 
-void TDevFileSelector::slotFilterChange( const TQString & nf )
+void KDevFileSelector::slotFilterChange( const TQString & nf )
 {
     TQToolTip::remove( btnFilter );
     TQString f = nf.stripWhiteSpace();
@@ -371,7 +371,7 @@ void TDevFileSelector::slotFilterChange( const TQString & nf )
     btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) );
 
 }
-void TDevFileSelector::setDir( KURL u )
+void KDevFileSelector::setDir( KURL u )
 {
     dir->setURL(u, true);
 }
@@ -380,12 +380,12 @@ void TDevFileSelector::setDir( KURL u )
 
 //BEGIN Private Slots
 
-void TDevFileSelector::cmbPathActivated( const KURL& u )
+void KDevFileSelector::cmbPathActivated( const KURL& u )
 {
     cmbPathReturnPressed( u.url() );
 }
 
-void TDevFileSelector::cmbPathReturnPressed( const TQString& u )
+void KDevFileSelector::cmbPathReturnPressed( const TQString& u )
 {
     TQStringList urls = cmbPath->urls();
     urls.remove( u );
@@ -395,12 +395,12 @@ void TDevFileSelector::cmbPathReturnPressed( const TQString& u )
     dir->setURL( KURL(u), true );
 }
 
-void TDevFileSelector::dirUrlEntered( const KURL& u )
+void KDevFileSelector::dirUrlEntered( const KURL& u )
 {
     cmbPath->setURL( u );
 }
 
-void TDevFileSelector::dirFinishedLoading()
+void KDevFileSelector::dirFinishedLoading()
 {}
 
 
@@ -411,7 +411,7 @@ void TDevFileSelector::dirFinishedLoading()
    If on:
    Set last filter.
 */
-void TDevFileSelector::btnFilterClick()
+void KDevFileSelector::btnFilterClick()
 {
     if ( !btnFilter->isOn() )
     {
@@ -425,9 +425,9 @@ void TDevFileSelector::btnFilterClick()
 }
 
 
-void TDevFileSelector::autoSync()
+void KDevFileSelector::autoSync()
 {
-    kdDebug()<<"TDevFileSelector::autoSync()"<<endl;
+    kdDebug()<<"KDevFileSelector::autoSync()"<<endl;
     // if visible, sync
     if ( isVisible() )
     {
@@ -443,14 +443,14 @@ void TDevFileSelector::autoSync()
     }
 }
 
-void TDevFileSelector::autoSync( KParts::Part *part )
+void KDevFileSelector::autoSync( KParts::Part *part )
 {
     KTextEditor::Document* doc = dynamic_cast<KTextEditor::Document*>( part );
     if( !doc )
 	return;
 
     // as above, but using document url.
-    kdDebug()<<"TDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
+    kdDebug()<<"KDevFileSelector::autoSync( KTextEditor::Document )"<<endl;
     KURL u ( doc->url() );
     if ( u.isEmpty() )
     {
@@ -468,15 +468,15 @@ void TDevFileSelector::autoSync( KParts::Part *part )
     }
 }
 /// \FIXME crash on shutdown
-void TDevFileSelector::setActiveDocumentDir()
+void KDevFileSelector::setActiveDocumentDir()
 {
-    //kdDebug()<<"TDevFileSelector::setActiveDocumentDir()"<<endl;
+    //kdDebug()<<"KDevFileSelector::setActiveDocumentDir()"<<endl;
     KURL u = activeDocumentUrl();
     if (!u.isEmpty())
         setDir( u.upURL() );
 }
 
-void TDevFileSelector::viewChanged()
+void KDevFileSelector::viewChanged()
 {
     /// @todo make sure the button is disabled if the directory is unreadable, eg
     ///       the document URL has protocol http
@@ -487,12 +487,12 @@ void TDevFileSelector::viewChanged()
 
 //BEGIN Protected
 
-void TDevFileSelector::focusInEvent( TQFocusEvent * )
+void KDevFileSelector::focusInEvent( TQFocusEvent * )
 {
     dir->setFocus();
 }
 
-void TDevFileSelector::showEvent( TQShowEvent * )
+void KDevFileSelector::showEvent( TQShowEvent * )
 {
     // sync if we should
     if ( autoSyncEvents & GotVisible )
@@ -509,7 +509,7 @@ void TDevFileSelector::showEvent( TQShowEvent * )
     }
 }
 
-bool TDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
+bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e )
 {
     /*
         This is rather unfortunate, but:
@@ -559,7 +559,7 @@ private:
     TQString _str;
 };
 
-KURL TDevFileSelector::activeDocumentUrl( )
+KURL KDevFileSelector::activeDocumentUrl( )
 {
 	KParts::ReadOnlyPart * part = dynamic_cast<KParts::ReadOnlyPart*>( partController->activePart() );
 	if ( part )
@@ -575,7 +575,7 @@ KURL TDevFileSelector::activeDocumentUrl( )
 ////////////////////////////////////////////////////////////////////////////////
 // KFSConfigPage implementation
 ////////////////////////////////////////////////////////////////////////////////
-KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, TDevFileSelector *kfs )
+KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs )
         : TQWidget( parent, name ),
         fileSelector( kfs ),
         bDirty( false )
@@ -706,20 +706,20 @@ void KFSConfigPage::apply()
     // sync
     int s = 0;
     if ( cbSyncActive->isChecked() )
-        s |= TDevFileSelector::DocumentChanged;
+        s |= KDevFileSelector::DocumentChanged;
     if ( cbSyncOpen->isChecked() )
-        s |= TDevFileSelector::DocumentOpened;
+        s |= KDevFileSelector::DocumentOpened;
     if ( cbSyncShow->isChecked() )
-        s |= TDevFileSelector::GotVisible;
+        s |= KDevFileSelector::GotVisible;
     fileSelector->autoSyncEvents = s;
     // reset connections
     disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) );
     disconnect( fileSelector->partController, 0,
                 fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) );
-    if ( s & TDevFileSelector::DocumentChanged )
+    if ( s & KDevFileSelector::DocumentChanged )
         connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ),
                  fileSelector, TQT_SLOT( autoSync() ) );
-    if ( s & TDevFileSelector::DocumentOpened )
+    if ( s & KDevFileSelector::DocumentOpened )
         connect( fileSelector->partController,
                  TQT_SIGNAL( partAdded(KParts::Part *) ),
                  fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) );
@@ -773,9 +773,9 @@ void KFSConfigPage::init()
 
     // sync
     int s = fileSelector->autoSyncEvents;
-    cbSyncActive->setChecked( s & TDevFileSelector::DocumentChanged );
-    cbSyncOpen->setChecked( s & TDevFileSelector::DocumentOpened );
-    cbSyncShow->setChecked( s & TDevFileSelector::GotVisible );
+    cbSyncActive->setChecked( s & KDevFileSelector::DocumentChanged );
+    cbSyncOpen->setChecked( s & KDevFileSelector::DocumentOpened );
+    cbSyncShow->setChecked( s & KDevFileSelector::GotVisible );
     // histories
     sbPathHistLength->setValue( fileSelector->cmbPath->maxItems() );
     sbFilterHistLength->setValue( fileSelector->filter->maxCount() );
@@ -791,9 +791,9 @@ void KFSConfigPage::slotChanged()
 //END KFSConfigPage
 
 
-//BEGIN TDevDirOperator
+//BEGIN KDevDirOperator
 
-void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
+void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
 {
     setupMenu();
     updateSelectionDependentActions();
@@ -816,6 +816,6 @@ void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos )
     popup->popup(pos);
 }
 
-//END TDevDirOperator
+//END KDevDirOperator
 
 #include "fileselector_widget.moc"
diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h
index 1c30eadd..ef64f88c 100644
--- a/parts/fileselector/fileselector_widget.h
+++ b/parts/fileselector/fileselector_widget.h
@@ -29,8 +29,8 @@
 #include <tqframe.h>
 #include <tdediroperator.h>
 
-class TDevMainWindow;
-class TDevPartController;
+class KDevMainWindow;
+class KDevPartController;
 class FileSelectorPart;
 class TDEActionCollection;
 class TDEActionSelector;
@@ -57,39 +57,39 @@ namespace KTextEditor
 */
 
 /* I think this fix for not moving toolbars is better */
-class TDevFileSelectorToolBar: public TDEToolBar
+class KDevFileSelectorToolBar: public TDEToolBar
 {
     Q_OBJECT
   
 public:
-    TDevFileSelectorToolBar(TQWidget *parent);
-    virtual ~TDevFileSelectorToolBar();
+    KDevFileSelectorToolBar(TQWidget *parent);
+    virtual ~KDevFileSelectorToolBar();
 
     virtual void setMovingEnabled( bool b );
 };
 
-class TDevFileSelectorToolBarParent: public TQFrame
+class KDevFileSelectorToolBarParent: public TQFrame
 {
     Q_OBJECT
   
 public:
-    TDevFileSelectorToolBarParent(TQWidget *parent);
-    ~TDevFileSelectorToolBarParent();
-    void setToolBar(TDevFileSelectorToolBar *tb);
+    KDevFileSelectorToolBarParent(TQWidget *parent);
+    ~KDevFileSelectorToolBarParent();
+    void setToolBar(KDevFileSelectorToolBar *tb);
 
 private:
-    TDevFileSelectorToolBar *m_tb;
+    KDevFileSelectorToolBar *m_tb;
 
 protected:
     virtual void resizeEvent ( TQResizeEvent * );
 };
 
-class TDevDirOperator: public KDirOperator
+class KDevDirOperator: public KDirOperator
 {
     Q_OBJECT
   
 public:
-    TDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
+    KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0)
         :KDirOperator(urlName, parent, name), m_part(part)
     {
     }
@@ -101,7 +101,7 @@ private:
     FileSelectorPart *m_part;
 };
 
-class TDevFileSelector : public TQWidget
+class KDevFileSelector : public TQWidget
 {
     Q_OBJECT
   
@@ -112,15 +112,15 @@ public:
     /* When to sync to current document directory */
     enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 };
 
-    TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow=0, TDevPartController *partController=0,
+    KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0,
                       TQWidget * parent = 0, const char * name = 0 );
-    ~TDevFileSelector();
+    ~KDevFileSelector();
 
     void readConfig( TDEConfig *, const TQString & );
     void writeConfig( TDEConfig *, const TQString & );
     void setupToolbar( TDEConfig * );
     void setView( KFile::FileView );
-    TDevDirOperator *dirOperator(){ return dir; }
+    KDevDirOperator *dirOperator(){ return dir; }
     TDEActionCollection *actionCollection() { return mActionCollection; };
 
 public slots:
@@ -146,18 +146,18 @@ protected:
     KURL activeDocumentUrl();
 
 private:
-    class TDevFileSelectorToolBar *toolbar;
+    class KDevFileSelectorToolBar *toolbar;
     TDEActionCollection *mActionCollection;
     class KBookmarkHandler *bookmarkHandler;
     KURLComboBox *cmbPath;
-    TDevDirOperator * dir;
+    KDevDirOperator * dir;
     class TDEAction *acSyncDir;
     KHistoryCombo * filter;
     class TQToolButton *btnFilter;
 
     FileSelectorPart *m_part;
-    TDevMainWindow *mainwin;
-    TDevPartController *partController;
+    KDevMainWindow *mainwin;
+    KDevPartController *partController;
 
     TQString lastFilter;
     int autoSyncEvents; // enabled autosync events
@@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget
     Q_OBJECT
   
 public:
-    KFSConfigPage( TQWidget* parent=0, const char *name=0, TDevFileSelector *kfs=0);
+    KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0);
     virtual ~KFSConfigPage() {};
 
 public slots:
@@ -194,7 +194,7 @@ public slots:
 private:
     void init();
 
-    TDevFileSelector *fileSelector;
+    KDevFileSelector *fileSelector;
     bool bDirty;
     //class TQListBox *lbAvailableActions, *lbUsedActions;
     TDEActionSelector *acSel;
diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp
index 059f0d78..935b9d86 100644
--- a/parts/fileselector/kbookmarkhandler.cpp
+++ b/parts/fileselector/kbookmarkhandler.cpp
@@ -35,7 +35,7 @@
 #include "kbookmarkhandler.moc"
 
 
-KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
+KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu )
     : TQObject( parent, "KBookmarkHandler" ),
       KBookmarkOwner(),
       mParent( parent ),
@@ -45,9 +45,9 @@ KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdep
     if (!m_menu)
       m_menu = new TDEPopupMenu( parent, "bookmark menu" );
 
-    TQString file = locate( "data", "tdevfileselector/fsbookmarks.xml" );
+    TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" );
     if ( file.isEmpty() )
-        file = locateLocal( "data", "tdevfileselector/fsbookmarks.xml" );
+        file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" );
 
     KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false);
     manager->setUpdate( true );
diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h
index 7d232107..4ec065aa 100644
--- a/parts/fileselector/kbookmarkhandler.h
+++ b/parts/fileselector/kbookmarkhandler.h
@@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner
   
 
 public:
-    KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
+    KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 );
     ~KBookmarkHandler();
 
     // KBookmarkOwner interface:
@@ -58,7 +58,7 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    TDevFileSelector *mParent;
+    KDevFileSelector *mParent;
     TDEPopupMenu *m_menu;
     KBookmarkMenu *m_bookmarkMenu;
 
diff --git a/parts/fileselector/tdevfileselector.desktop b/parts/fileselector/kdevfileselector.desktop
index a1d13627..785db621 100644
--- a/parts/fileselector/tdevfileselector.desktop
+++ b/parts/fileselector/kdevfileselector.desktop
@@ -33,7 +33,7 @@ Comment[tg]=Воситаи намоиши файлҳо бо тарафдории
 Comment[tr]=Güçlü, ağdan saydam, dosya gözatma yardımcı programı
 Comment[zh_CN]=强有力的网络文件浏览工具。
 Comment[zh_TW]=強大的網路檔案瀏覽工具。
-Name=TDevFileSelector
+Name=KDevFileSelector
 Name[da]=TDevelop filvælger
 Name[de]=Datei-Selektor (TDevelop)
 Name[hi]=के-डेव-फ़ाइल-चयनक
@@ -82,7 +82,7 @@ GenericName[zh_CN]=文件选择器
 GenericName[zh_TW]=檔案選擇器
 Icon=fileopen
 ServiceTypes=TDevelop/Plugin
-X-TDE-Library=libtdevfileselector
+X-TDE-Library=libkdevfileselector
 X-TDevelop-Version=5
 X-TDevelop-Scope=Global
 X-TDevelop-Mode=AssistantMode
diff --git a/parts/fileselector/tdevpart_fileselector.rc b/parts/fileselector/kdevpart_fileselector.rc
index 940e2ab2..940e2ab2 100644
--- a/parts/fileselector/tdevpart_fileselector.rc
+++ b/parts/fileselector/kdevpart_fileselector.rc