Rename KComp to avoid conflicts with KDE4

7 files changed, 19 insertions, 19 deletions

diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 06c8c4133..381e32fa2 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -40,7 +40,7 @@
 
 #include <tdeaction.h>
 
-class KCompletion;
+class TDECompletion;
 
 /**
  * Kate namespace
@@ -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 2104ef157..ef356a6bb 100644
--- a/kate/interfaces/katecmd.cpp
+++ b/kate/interfaces/katecmd.cpp
@@ -123,7 +123,7 @@ const TQString KateCmd::fromHistory( uint index ) const
    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/part/katecmds.cpp b/kate/part/katecmds.cpp
index c5feb5071..ad8943328 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -279,7 +279,7 @@ bool KateCommands::CoreCommands::exec(Kate::View *view,
   KCC_ERR( i18n("Unknown command '%1'").arg(cmd) );
 }
 
-KCompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view )
+TDECompletion *KateCommands::CoreCommands::completionObject( const TQString &cmd, Kate::View *view )
 {
   if ( cmd == "set-highlight" )
   {
diff --git a/kate/part/katecmds.h b/kate/part/katecmds.h
index 55c8d807b..d313be91d 100644
--- a/kate/part/katecmds.h
+++ b/kate/part/katecmds.h
@@ -25,7 +25,7 @@
 #include "../interfaces/view.h"
 
 class KateDocument;
-class KCompletion;
+class TDECompletion;
 
 namespace KateCommands
 {
@@ -59,7 +59,7 @@ class CoreCommands : public Kate::Command, public Kate::CommandExtension
     /**
     * override completionObject from interfaces/document.h .
     */
-    KCompletion *completionObject( const TQString &cmd, Kate::View *view );
+    TDECompletion *completionObject( const TQString &cmd, Kate::View *view );
 };
 
 /**
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index 72b7be0f5..ef70e3449 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -272,7 +272,7 @@ class KateCmdLnWhatsThis : public TQWhatsThis
  * This class provide completion of flags. It shows a short description of
  * each flag, and flags are appended.
  */
-class KateCmdLineFlagCompletion : public KCompletion
+class KateCmdLineFlagCompletion : public TDECompletion
 {
   public:
     KateCmdLineFlagCompletion() {;}
@@ -365,7 +365,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text )
   // clean up
   if ( m_oldCompletionObject )
   {
-    KCompletion *c = completionObject();
+    TDECompletion *c = completionObject();
     setCompletionObject( m_oldCompletionObject );
     m_oldCompletionObject = 0;
     delete c;
@@ -465,7 +465,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev )
         // clean up if needed
         if ( m_oldCompletionObject )
         {
-          KCompletion *c = completionObject();
+          TDECompletion *c = completionObject();
           setCompletionObject( m_oldCompletionObject );
           m_oldCompletionObject = 0;
           delete c;
@@ -483,7 +483,7 @@ void KateCmdLine::keyPressEvent( TQKeyEvent *ev )
       Kate::CommandExtension *ce = dynamic_cast<Kate::CommandExtension*>(m_command);
       if ( ce )
       {
-        KCompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view );
+        TDECompletion *cmpl = ce->completionObject( text().left( m_cmdend ).stripWhiteSpace(), m_view );
         if ( cmpl )
         {
         // save the old completion object and use what the command provides
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index 0ff59352e..980d4d1cd 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -115,7 +115,7 @@ class KateCmdLine : public KLineEdit
     uint m_histpos; ///< position in the history
     uint m_cmdend; ///< the point where a command ends in the text, if we have a valid one.
     Kate::Command *m_command; ///< For completing flags/args and interactiveness
-    class KCompletion *m_oldCompletionObject; ///< save while completing command args.
+    class TDECompletion *m_oldCompletionObject; ///< save while completing command args.
     class KateCmdLnWhatsThis *m_help;
 };