6 files changed, 51 insertions, 51 deletions
diff --git a/kate/interfaces/CMakeLists.txt b/kate/interfaces/CMakeLists.txt
index c747f184c..f62bcdb0f 100644
--- a/kate/interfaces/CMakeLists.txt
+++ b/kate/interfaces/CMakeLists.txt
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK ktexteditor-shared
+  LINK tdetexteditor-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kate/interfaces/Makefile.am b/kate/interfaces/Makefile.am
index 94065cb3c..d14e58f89 100644
--- a/kate/interfaces/Makefile.am
+++ b/kate/interfaces/Makefile.am
@@ -3,10 +3,10 @@ METASOURCES = document.moc view.moc
 lib_LTLIBRARIES = libkatepartinterfaces.la
 
 libkatepartinterfaces_la_SOURCES = interfaces.cpp katecmd.cpp
-libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/ktexteditor/libktexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
+libkatepartinterfaces_la_LIBADD   = $(top_builddir)/interfaces/tdetexteditor/libtdetexteditor.la $(LIB_QT) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDECORE)
 libkatepartinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 
 kateinclude_HEADERS = document.h view.h
 kateincludedir = $(includedir)/kate
 
-INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/kparts -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(top_srcdir)/interfaces -I$(top_srcdir)/tdeparts -I$(top_srcdir) $(all_includes)
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 023840335..381e32fa2 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -19,28 +19,28 @@
 #ifndef _KATE_DOCUMENT_INCLUDE_
 #define _KATE_DOCUMENT_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/editinterface.h>
-#include <ktexteditor/undointerface.h>
-#include <ktexteditor/cursorinterface.h>
-#include <ktexteditor/documentinfo.h>
-#include <ktexteditor/selectioninterface.h>
-#include <ktexteditor/selectioninterfaceext.h>
-#include <ktexteditor/blockselectioninterface.h>
-#include <ktexteditor/searchinterface.h>
-#include <ktexteditor/highlightinginterface.h>
-#include <ktexteditor/configinterface.h>
-#include <ktexteditor/configinterfaceextension.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/markinterfaceextension.h>
-#include <ktexteditor/wordwrapinterface.h>
-#include <ktexteditor/printinterface.h>
-#include <ktexteditor/variableinterface.h>
-
-#include <kaction.h>
-
-class KCompletion;
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/editinterface.h>
+#include <tdetexteditor/undointerface.h>
+#include <tdetexteditor/cursorinterface.h>
+#include <tdetexteditor/documentinfo.h>
+#include <tdetexteditor/selectioninterface.h>
+#include <tdetexteditor/selectioninterfaceext.h>
+#include <tdetexteditor/blockselectioninterface.h>
+#include <tdetexteditor/searchinterface.h>
+#include <tdetexteditor/highlightinginterface.h>
+#include <tdetexteditor/configinterface.h>
+#include <tdetexteditor/configinterfaceextension.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/markinterfaceextension.h>
+#include <tdetexteditor/wordwrapinterface.h>
+#include <tdetexteditor/printinterface.h>
+#include <tdetexteditor/variableinterface.h>
+
+#include <tdeaction.h>
+
+class TDECompletion;
 
 /**
  * Kate namespace
@@ -77,13 +77,13 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
     void slotChanged();
 };
 
-class KATEPARTINTERFACES_EXPORT ActionMenu : public KActionMenu
+class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
 {
   Q_OBJECT
 
   public:
     ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
-      : KActionMenu(text, parent, name) { ; };
+      : TDEActionMenu(text, parent, name) { ; };
     virtual ~ActionMenu () { ; };
 
   public:
@@ -146,7 +146,7 @@ class CommandExtension
     virtual void flagCompletions( TQStringList& /*list*/ ) {;}
 
     /**
-     * @return a KCompletion object that will substitute the command line default
+     * @return a TDECompletion object that will substitute the command line default
      * one while typing the first argument to the command. The text will be
      * added to the command seperated by one space character.
      *
@@ -154,7 +154,7 @@ class CommandExtension
      *
      * @param cmdname The command name associated with this request.
      */
-    virtual KCompletion *completionObject( const TQString & cmdname, Kate::View * /*view*/ ) { Q_UNUSED(cmdname); return 0L; }
+    virtual TDECompletion *completionObject( const TQString & cmdname, Kate::View * /*view*/ ) { Q_UNUSED(cmdname); return 0L; }
 
     /**
      * @return whether this command wants to process text interactively given the @p cmdname.
diff --git a/kate/interfaces/katecmd.cpp b/kate/interfaces/katecmd.cpp
index 69263b57c..ef356a6bb 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -118,12 +118,12 @@ const TQString KateCmd::fromHistory( uint index ) const
 //BEGIN KateCmdShellCompletion
 /*
    A lot of the code in the below class is copied from
-   tdelibs/kio/kio/kshellcompletion.cpp
+   tdelibs/tdeio/tdeio/kshellcompletion.cpp
    Copyright (C) 2000 David Smith <dsmith@algonet.se>
    Copyright (C) 2004 Anders Lund <anders@alweb.dk>
 */
 KateCmdShellCompletion::KateCmdShellCompletion()
-  : KCompletion()
+  : TDECompletion()
 {
   m_word_break_char = ' ';
   m_quote_char1 = '\"';
@@ -139,7 +139,7 @@ TQString KateCmdShellCompletion::makeCompletion( const TQString &text )
 
   // Make completion on the last part of text
   //
-  return KCompletion::makeCompletion( m_text_compl );
+  return TDECompletion::makeCompletion( m_text_compl );
 }
 
 void KateCmdShellCompletion::postProcessMatch( TQString *match ) const
@@ -158,9 +158,9 @@ void KateCmdShellCompletion::postProcessMatches( TQStringList *matches ) const
       (*it).prepend( m_text_start );
 }
 
-void KateCmdShellCompletion::postProcessMatches( KCompletionMatches *matches ) const
+void KateCmdShellCompletion::postProcessMatches( TDECompletionMatches *matches ) const
 {
-  for ( KCompletionMatches::Iterator it = matches->begin();
+  for ( TDECompletionMatches::Iterator it = matches->begin();
         it != matches->end(); it++ )
     if ( !(*it).value().isNull() )
       (*it).value().prepend( m_text_start );
diff --git a/kate/interfaces/katecmd.h b/kate/interfaces/katecmd.h
index b01f6dafb..262781aa3 100644
--- a/kate/interfaces/katecmd.h
+++ b/kate/interfaces/katecmd.h
@@ -53,12 +53,12 @@ class KATEPARTINTERFACES_EXPORT KateCmd
 };
 
 /**
- * A KCompletion object that completes last ?unquoted? word in the string
+ * A TDECompletion object that completes last ?unquoted? word in the string
  * passed. Dont mistake "shell" for anything related to quoting, this
  * simply mimics shell tab completion by completing the last word in the
  * provided text.
  */
-class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public KCompletion
+class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public TDECompletion
 {
   public:
     KateCmdShellCompletion();
@@ -72,10 +72,10 @@ class KATEPARTINTERFACES_EXPORT KateCmdShellCompletion : public KCompletion
     TQString makeCompletion(const TQString &text);
 
   protected:
-        // Called by KCompletion
+        // Called by TDECompletion
     void postProcessMatch( TQString *match ) const;
     void postProcessMatches( TQStringList *matches ) const;
-    void postProcessMatches( KCompletionMatches *matches ) const;
+    void postProcessMatches( TDECompletionMatches *matches ) const;
 
   private:
   /**
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 90c61d5ac..3b2b8a4e1 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -19,16 +19,16 @@
 #ifndef _KATE_VIEW_INCLUDE_
 #define _KATE_VIEW_INCLUDE_
 
-#include <ktexteditor/document.h>
-#include <ktexteditor/view.h>
-#include <ktexteditor/clipboardinterface.h>
-#include <ktexteditor/popupmenuinterface.h>
-#include <ktexteditor/markinterface.h>
-#include <ktexteditor/viewcursorinterface.h>
-#include <ktexteditor/codecompletioninterface.h>
-#include <ktexteditor/dynwordwrapinterface.h>
+#include <tdetexteditor/document.h>
+#include <tdetexteditor/view.h>
+#include <tdetexteditor/clipboardinterface.h>
+#include <tdetexteditor/popupmenuinterface.h>
+#include <tdetexteditor/markinterface.h>
+#include <tdetexteditor/viewcursorinterface.h>
+#include <tdetexteditor/codecompletioninterface.h>
+#include <tdetexteditor/dynwordwrapinterface.h>
 
-class KConfig;
+class TDEConfig;
 
 namespace Kate
 {
@@ -189,14 +189,14 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
 
   public:
     /**
-      Reads session config out of the KConfig object. This also includes
+      Reads session config out of the TDEConfig object. This also includes
       the actual cursor position and the bookmarks.
     */
-    virtual void readSessionConfig(KConfig *) { ; };
+    virtual void readSessionConfig(TDEConfig *) { ; };
     /**
-      Writes session config into the KConfig object.
+      Writes session config into the TDEConfig object.
     */
-    virtual void writeSessionConfig(KConfig *) { ; };
+    virtual void writeSessionConfig(TDEConfig *) { ; };
 
   public slots:
     /**