Rename KComp to avoid conflicts with KDE4

8 files changed, 106 insertions, 106 deletions

diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index e5b8c3043..c79284717 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -169,7 +169,7 @@ void KComboBox::makeCompletion( const TQString& text )
     }
 }
 
-void KComboBox::rotateText( KCompletionBase::KeyBindingType type )
+void KComboBox::rotateText( TDECompletionBase::KeyBindingType type )
 {
     if ( d->klineEdit )
         d->klineEdit->rotateText( type );
@@ -226,7 +226,7 @@ void KComboBox::setCompletedItems( const TQStringList& items )
         d->klineEdit->setCompletedItems( items );
 }
 
-KCompletionBox * KComboBox::completionBox( bool create )
+TDECompletionBox * KComboBox::completionBox( bool create )
 {
     if ( d->klineEdit )
         return d->klineEdit->completionBox( create );
@@ -271,7 +271,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
     if ( d->klineEdit )
     {
         // someone calling KComboBox::setEditable( false ) destroys our
-        // lineedit without us noticing. And KCompletionBase::delegate would
+        // lineedit without us noticing. And TDECompletionBase::delegate would
         // be a dangling pointer then, so prevent that. Note: only do this
         // when it is a KLineEdit!
         connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() ));
@@ -286,8 +286,8 @@ void KComboBox::setLineEdit( TQLineEdit *edit )
                  TQT_SIGNAL( substringCompletion( const TQString& )) );
 
         connect( d->klineEdit,
-                 TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )),
-                 TQT_SIGNAL( textRotation( KCompletionBase::KeyBindingType )) );
+                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )),
+                 TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) );
 
         connect( d->klineEdit,
                  TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )),
@@ -333,7 +333,7 @@ void KComboBox::lineEditDeleted()
     // yes, we need those ugly casts due to the multiple inheritance
     // sender() is guaranteed to be a KLineEdit (see the connect() to the
     // destroyed() signal
-    const KCompletionBase *base = static_cast<const KCompletionBase*>( static_cast<const KLineEdit*>( sender() ));
+    const TDECompletionBase *base = static_cast<const TDECompletionBase*>( static_cast<const KLineEdit*>( sender() ));
 
     // is it our delegate, that is destroyed?
     if ( base == delegate() )
@@ -378,7 +378,7 @@ void KHistoryCombo::init( bool useCompletion )
     setMaxCount( 50 );
 
     if ( useCompletion )
-        completionObject()->setOrder( KCompletion::Weighted );
+        completionObject()->setOrder( TDECompletion::Weighted );
 
     setInsertionPolicy( NoInsertion );
     myIterateIndex = -1;
@@ -421,10 +421,10 @@ void KHistoryCombo::setHistoryItems( TQStringList items,
 
     if ( setCompletionList && useCompletion() ) {
         // we don't have any weighting information here ;(
-        KCompletion *comp = completionObject();
-        comp->setOrder( KCompletion::Insertion );
+        TDECompletion *comp = completionObject();
+        comp->setOrder( TDECompletion::Insertion );
         comp->setItems( items );
-        comp->setOrder( KCompletion::Weighted );
+        comp->setOrder( TDECompletion::Weighted );
     }
 
     clearEdit();
@@ -718,7 +718,7 @@ bool KHistoryCombo::isHistoryEditorEnabled() const
 }
 
 void KComboBox::virtual_hook( int id, void* data )
-{ KCompletionBase::virtual_hook( id, data ); }
+{ TDECompletionBase::virtual_hook( id, data ); }
 
 void KHistoryCombo::virtual_hook( int id, void* data )
 { KComboBox::virtual_hook( id, data ); }
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index 5d849b190..e0c2e2704 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -38,7 +38,7 @@ class TQListBoxItem;
 class TQPopupMenu;
 class TQLineEdit;
 
-class KCompletionBox;
+class TDECompletionBox;
 class KURL;
 
 /**
@@ -64,7 +64,7 @@ class KURL;
  *
  * KCombobox by default creates a completion object when you invoke the
  * completionObject( bool ) member function for the first time or
- * explicitly use setCompletionObject( KCompletion*, bool ) to assign your
+ * explicitly use setCompletionObject( TDECompletion*, bool ) to assign your
  * own completion object.  Additionally, to make this widget more functional,
  * KComboBox will by default handle text rotation and completion events
  * internally whenever a completion object is created through either one of the
@@ -74,11 +74,11 @@ class KURL;
  *
  * Beware: The completion object can be deleted on you, especially if a call
  * such as setEditable(false) is made.  Store the pointer at your own risk,
- * and consider using TQGuardedPtr<KCompletion>.
+ * and consider using TQGuardedPtr<TDECompletion>.
  *
  * The default key-bindings for completion and rotation is determined from the
  * global settings in TDEStdAccel. These values, however, can be overridden
- * locally by invoking KCompletionBase::setKeyBinding(). The values can
+ * locally by invoking TDECompletionBase::setKeyBinding(). The values can
  * easily be reverted back to the default setting, by simply calling
  * useGlobalSettings(). An alternate method would be to default individual
  * key-bindings by usning setKeyBinding() with the default second argument.
@@ -93,8 +93,8 @@ class KURL;
  * words do not do the following:
  *
  * \code
- * KComboBox* combo = new KCompletionBox(true, this, "mywidget");
- * KCompletion* comp = combo->completionObject();
+ * KComboBox* combo = new TDECompletionBox(true, this, "mywidget");
+ * TDECompletion* comp = combo->completionObject();
  * combo->setEditable( false );
  * comp->clear(); // CRASH: completion object does not exist anymore.
  * \endcode
@@ -112,7 +112,7 @@ class KURL;
  *
  * \code
  * KComboBox *combo = new KComboBox( true, this, "mywidget" );
- * KCompletion *comp = combo->completionObject();
+ * TDECompletion *comp = combo->completionObject();
  * // Connect to the return pressed signal - optional
  * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
  *
@@ -141,14 +141,14 @@ class KURL;
  * // Tell the widget not to handle completion and rotation
  * combo->setHandleSignals( false );
  * // Set your own completion key for manual completions.
- * combo->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
+ * combo->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
  * // Hide the context (popup) menu
  * combo->setContextMenuEnabled( false );
  * \endcode
  *
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class TDEUI_EXPORT KComboBox : public TQComboBox, public KCompletionBase
+class TDEUI_EXPORT KComboBox : public TQComboBox, public TDECompletionBase
 {
   Q_OBJECT
   TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
@@ -338,7 +338,7 @@ public:
      * @param create Set this to false if you don't want the box to be created
      *               i.e. to test if it is available.
      */
-    KCompletionBox * completionBox( bool create = true );
+    TDECompletionBox * completionBox( bool create = true );
 
     /**
      * Re-implemented for internal reasons.  API remains unaffected.
@@ -393,7 +393,7 @@ signals:
     * Note that this signal is @em NOT emitted if the completion
     * mode is set to CompletionNone.
     */
-    void textRotation( KCompletionBase::KeyBindingType );
+    void textRotation( TDECompletionBase::KeyBindingType );
 
     /**
      * Emitted whenever the completion mode is changed by the user
@@ -431,7 +431,7 @@ public slots:
     *
     * @param type The key-binding invoked.
     */
-    void rotateText( KCompletionBase::KeyBindingType type );
+    void rotateText( TDECompletionBase::KeyBindingType type );
 
     /**
      * Sets the completed text in the line-edit appropriately.
@@ -622,13 +622,13 @@ public:
      * than one KHistoryCombo.
      *
      * Note: When @p setCompletionList is true, the items are inserted into the
-     * KCompletion object with mode KCompletion::Insertion and the mode is set
-     * to KCompletion::Weighted afterwards.
+     * TDECompletion object with mode TDECompletion::Insertion and the mode is set
+     * to TDECompletion::Weighted afterwards.
      *
      * @see historyItems
      * @see KComboBox::completionObject
-     * @see KCompletion::setItems
-     * @see KCompletion::items
+     * @see TDECompletion::setItems
+     * @see TDECompletion::items
      */
     void setHistoryItems( TQStringList items, bool setCompletionList );
 
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/kcompletionbox.cpp
index 086df247c..2dd4e9ccf 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/kcompletionbox.cpp
@@ -33,7 +33,7 @@
 
 #include "kcompletionbox.h"
 
-class KCompletionBox::KCompletionBoxPrivate
+class TDECompletionBox::TDECompletionBoxPrivate
 {
 public:
     TQWidget *m_parent; // necessary to set the focus back
@@ -44,8 +44,8 @@ public:
     bool emitSelected;
 };
 
-KCompletionBox::KCompletionBox( TQWidget *parent, const char *name )
- :TDEListBox( parent, name, (WFlags)WType_Popup ), d(new KCompletionBoxPrivate)
+TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name )
+ :TDEListBox( parent, name, (WFlags)WType_Popup ), d(new TDECompletionBoxPrivate)
 {
 
     d->m_parent        = parent;
@@ -76,13 +76,13 @@ KCompletionBox::KCompletionBox( TQWidget *parent, const char *name )
              TQT_SLOT( slotItemClicked( TQListBoxItem * )) );
 }
 
-KCompletionBox::~KCompletionBox()
+TDECompletionBox::~TDECompletionBox()
 {
     d->m_parent = 0L;
     delete d;
 }
 
-TQStringList KCompletionBox::items() const
+TQStringList TDECompletionBox::items() const
 {
     TQStringList list;
 
@@ -96,7 +96,7 @@ TQStringList KCompletionBox::items() const
     return list;
 }
 
-void KCompletionBox::slotActivated( TQListBoxItem *item )
+void TDECompletionBox::slotActivated( TQListBoxItem *item )
 {
     if ( !item )
         return;
@@ -105,7 +105,7 @@ void KCompletionBox::slotActivated( TQListBoxItem *item )
     emit activated( item->text() );
 }
 
-bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
+bool TDECompletionBox::eventFilter( TQObject *o, TQEvent *e )
 {
     int type = e->type();
 
@@ -247,7 +247,7 @@ bool KCompletionBox::eventFilter( TQObject *o, TQEvent *e )
 }
 
 
-void KCompletionBox::popup()
+void TDECompletionBox::popup()
 {
     if ( count() == 0 )
         hide();
@@ -265,7 +265,7 @@ void KCompletionBox::popup()
     }
 }
 
-void KCompletionBox::sizeAndPosition()
+void TDECompletionBox::sizeAndPosition()
 {
     int currentGeom = height();
     TQPoint currentPos = pos();
@@ -297,7 +297,7 @@ void KCompletionBox::sizeAndPosition()
     }
 }
 
-void KCompletionBox::show()
+void TDECompletionBox::show()
 {
     d->upwardBox = false;
     if ( d->m_parent ) {
@@ -309,19 +309,19 @@ void KCompletionBox::show()
     // are pretty b0rked.
     //triggerUpdate( true );
 
-    // Workaround for I'm not sure whose bug - if this KCompletionBox' parent
+    // Workaround for I'm not sure whose bug - if this TDECompletionBox' parent
     // is in a layout, that layout will detect inserting new child (posted
     // ChildInserted event), and will trigger relayout (post LayoutHint event).
     // TQWidget::show() sends also posted ChildInserted events for the parent,
     // and later all LayoutHint events, which causes layout updating.
-    // The problem is, KCompletionBox::eventFilter() detects resizing
+    // The problem is, TDECompletionBox::eventFilter() detects resizing
     // of the parent, and calls hide() - and this hide() happen in the middle
     // of show(), causing inconsistent state. I'll try to submit a Qt patch too.
     tqApp->sendPostedEvents();
     TDEListBox::show();
 }
 
-void KCompletionBox::hide()
+void TDECompletionBox::hide()
 {
     if ( d->m_parent )
         tqApp->removeEventFilter( this );
@@ -329,7 +329,7 @@ void KCompletionBox::hide()
     TDEListBox::hide();
 }
 
-TQRect KCompletionBox::calculateGeometry() const
+TQRect TDECompletionBox::calculateGeometry() const
 {
     int x = 0, y = 0;
     int ih = itemHeight();
@@ -373,12 +373,12 @@ TQRect KCompletionBox::calculateGeometry() const
     return TQRect(x, y, w, h);
 }
 
-TQSize KCompletionBox::sizeHint() const
+TQSize TDECompletionBox::sizeHint() const
 {
     return calculateGeometry().size();
 }
 
-void KCompletionBox::down()
+void TDECompletionBox::down()
 {
     int i = currentItem();
 
@@ -393,57 +393,57 @@ void KCompletionBox::down()
         setCurrentItem( i + 1 );
 }
 
-void KCompletionBox::up()
+void TDECompletionBox::up()
 {
     if ( currentItem() > 0 )
         setCurrentItem( currentItem() - 1 );
 }
 
-void KCompletionBox::pageDown()
+void TDECompletionBox::pageDown()
 {
     int i = currentItem() + numItemsVisible();
     i = i > (int)count() - 1 ? (int)count() - 1 : i;
     setCurrentItem( i );
 }
 
-void KCompletionBox::pageUp()
+void TDECompletionBox::pageUp()
 {
     int i = currentItem() - numItemsVisible();
     i = i < 0 ? 0 : i;
     setCurrentItem( i );
 }
 
-void KCompletionBox::home()
+void TDECompletionBox::home()
 {
     setCurrentItem( 0 );
 }
 
-void KCompletionBox::end()
+void TDECompletionBox::end()
 {
     setCurrentItem( count() -1 );
 }
 
-void KCompletionBox::setTabHandling( bool enable )
+void TDECompletionBox::setTabHandling( bool enable )
 {
     d->tabHandling = enable;
 }
 
-bool KCompletionBox::isTabHandling() const
+bool TDECompletionBox::isTabHandling() const
 {
     return d->tabHandling;
 }
 
-void KCompletionBox::setCancelledText( const TQString& text )
+void TDECompletionBox::setCancelledText( const TQString& text )
 {
     d->cancelText = text;
 }
 
-TQString KCompletionBox::cancelledText() const
+TQString TDECompletionBox::cancelledText() const
 {
     return d->cancelText;
 }
 
-void KCompletionBox::canceled()
+void TDECompletionBox::canceled()
 {
     if ( !d->cancelText.isNull() )
         emit userCancelled( d->cancelText );
@@ -451,7 +451,7 @@ void KCompletionBox::canceled()
         hide();
 }
 
-class KCompletionBoxItem : public TQListBoxItem
+class TDECompletionBoxItem : public TQListBoxItem
 {
 public:
     //Returns true if dirty.
@@ -465,7 +465,7 @@ public:
 };
 
 
-void KCompletionBox::insertItems( const TQStringList& items, int index )
+void TDECompletionBox::insertItems( const TQStringList& items, int index )
 {
     bool block = signalsBlocked();
     blockSignals( true );
@@ -474,7 +474,7 @@ void KCompletionBox::insertItems( const TQStringList& items, int index )
     d->down_workaround = true;
 }
 
-void KCompletionBox::setItems( const TQStringList& items )
+void TDECompletionBox::setItems( const TQStringList& items )
 {
     bool block = signalsBlocked();
     blockSignals( true );
@@ -494,7 +494,7 @@ void KCompletionBox::setItems( const TQStringList& items )
 
         for ( ; it != itEnd; ++it) {
             if ( item ) {
-                const bool changed = ((KCompletionBoxItem*)item)->reuse( *it );
+                const bool changed = ((TDECompletionBoxItem*)item)->reuse( *it );
                 dirty = dirty || changed;
                 item = item->next();
             }
@@ -527,12 +527,12 @@ void KCompletionBox::setItems( const TQStringList& items )
     d->down_workaround = true;
 }
 
-void KCompletionBox::slotCurrentChanged()
+void TDECompletionBox::slotCurrentChanged()
 {
     d->down_workaround = false;
 }
 
-void KCompletionBox::slotItemClicked( TQListBoxItem *item )
+void TDECompletionBox::slotItemClicked( TQListBoxItem *item )
 {
     if ( item )
     {
@@ -546,17 +546,17 @@ void KCompletionBox::slotItemClicked( TQListBoxItem *item )
     }
 }
 
-void KCompletionBox::setActivateOnSelect(bool state)
+void TDECompletionBox::setActivateOnSelect(bool state)
 {
     d->emitSelected = state;
 }
 
-bool KCompletionBox::activateOnSelect() const
+bool TDECompletionBox::activateOnSelect() const
 {
     return d->emitSelected;
 }
 
-void KCompletionBox::virtual_hook( int id, void* data )
+void TDECompletionBox::virtual_hook( int id, void* data )
 { TDEListBox::virtual_hook( id, data ); }
 
 #include "kcompletionbox.moc"
diff --git a/tdeui/kcompletionbox.h b/tdeui/kcompletionbox.h
index 76f868dea..b874fec99 100644
--- a/tdeui/kcompletionbox.h
+++ b/tdeui/kcompletionbox.h
@@ -31,7 +31,7 @@ class TQEvent;
  * @short A helper widget for "completion-widgets" (KLineEdit, KComboBox))
  *
  * A little utility class for "completion-widgets", like KLineEdit or
- * KComboBox. KCompletionBox is a listbox, displayed as a rectangle without
+ * KComboBox. TDECompletionBox is a listbox, displayed as a rectangle without
  * any window decoration, usually directly under the lineedit or combobox.
  * It is filled with all possible matches for a completion, so the user
  * can select the one he wants.
@@ -40,7 +40,7 @@ class TQEvent;
  *
  * @author Carsten Pfeiffer <pfeiffer@kde.org>
  */
-class TDEUI_EXPORT KCompletionBox : public TDEListBox
+class TDEUI_EXPORT TDECompletionBox : public TDEListBox
 {
     Q_OBJECT
     TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
@@ -49,17 +49,17 @@ class TDEUI_EXPORT KCompletionBox : public TDEListBox
 
 public:
     /**
-     * Constructs a KCompletionBox.
+     * Constructs a TDECompletionBox.
      *
      * The parent widget is used to give the focus back when pressing the
      * up-button on the very first item.
      */
-    KCompletionBox( TQWidget *parent, const char *name = 0 );
+    TDECompletionBox( TQWidget *parent, const char *name = 0 );
 
     /**
      * Destroys the box
      */
-    ~KCompletionBox();
+    ~TDECompletionBox();
 
     virtual TQSize sizeHint() const;
 
@@ -238,8 +238,8 @@ protected:
     virtual void virtual_hook( int id, void* data );
 
 private:
-    class KCompletionBoxPrivate;
-    KCompletionBoxPrivate* const d;
+    class TDECompletionBoxPrivate;
+    TDECompletionBoxPrivate* const d;
 };
 
 
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index fa7648dfc..66230b4a9 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -93,7 +93,7 @@ public:
     int squeezedStart;
     BackgroundMode bgMode;
     TQString squeezedText;
-    KCompletionBox *completionBox;
+    TDECompletionBox *completionBox;
 
     TQString clickMessage;
     bool drawClickMsg:1;
@@ -171,7 +171,7 @@ void KLineEdit::setCompletionMode( TDEGlobalSettings::Completion mode )
     else
         d->autoSuggest = false;
 
-    KCompletionBase::setCompletionMode( mode );
+    TDECompletionBase::setCompletionMode( mode );
 }
 
 void KLineEdit::setCompletedText( const TQString& t, bool marked )
@@ -202,16 +202,16 @@ void KLineEdit::setCompletedText( const TQString& text )
     setCompletedText( text, marked );
 }
 
-void KLineEdit::rotateText( KCompletionBase::KeyBindingType type )
+void KLineEdit::rotateText( TDECompletionBase::KeyBindingType type )
 {
-    KCompletion* comp = compObj();
+    TDECompletion* comp = compObj();
     if ( comp &&
-       (type == KCompletionBase::PrevCompletionMatch ||
-        type == KCompletionBase::NextCompletionMatch ) )
+       (type == TDECompletionBase::PrevCompletionMatch ||
+        type == TDECompletionBase::NextCompletionMatch ) )
     {
        TQString input;
 
-       if (type == KCompletionBase::PrevCompletionMatch)
+       if (type == TDECompletionBase::PrevCompletionMatch)
           comp->previousMatch();
        else
           comp->nextMatch();
@@ -225,7 +225,7 @@ void KLineEdit::rotateText( KCompletionBase::KeyBindingType type )
 
 void KLineEdit::makeCompletion( const TQString& text )
 {
-    KCompletion *comp = compObj();
+    TDECompletion *comp = compObj();
     TDEGlobalSettings::Completion mode = completionMode();
 
     if ( !comp || mode == TDEGlobalSettings::CompletionNone )
@@ -761,9 +761,9 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
-                    emit textRotation( KCompletionBase::PrevCompletionMatch );
+                    emit textRotation( TDECompletionBase::PrevCompletionMatch );
                 if ( handleSignals() )
-                    rotateText( KCompletionBase::PrevCompletionMatch );
+                    rotateText( TDECompletionBase::PrevCompletionMatch );
                 return;
             }
 
@@ -776,9 +776,9 @@ void KLineEdit::keyPressEvent( TQKeyEvent *e )
             if ( cut.contains( key ) )
             {
                 if ( emitSignals() )
-                    emit textRotation( KCompletionBase::NextCompletionMatch );
+                    emit textRotation( TDECompletionBase::NextCompletionMatch );
                 if ( handleSignals() )
-                    rotateText( KCompletionBase::NextCompletionMatch );
+                    rotateText( TDECompletionBase::NextCompletionMatch );
                 return;
             }
         }
@@ -1080,7 +1080,7 @@ void KLineEdit::setURL( const KURL& url )
     setText( url.prettyURL() );
 }
 
-void KLineEdit::setCompletionBox( KCompletionBox *box )
+void KLineEdit::setCompletionBox( TDECompletionBox *box )
 {
     if ( d->completionBox )
         return;
@@ -1259,19 +1259,19 @@ void KLineEdit::setCompletedItems( const TQStringList& items, bool autoSuggest )
     }
 }
 
-KCompletionBox * KLineEdit::completionBox( bool create )
+TDECompletionBox * KLineEdit::completionBox( bool create )
 {
     if ( create && !d->completionBox ) {
-        setCompletionBox( new KCompletionBox( this, "completion box" ) );
+        setCompletionBox( new TDECompletionBox( this, "completion box" ) );
         d->completionBox->setFont(font());
     }
 
     return d->completionBox;
 }
 
-void KLineEdit::setCompletionObject( KCompletion* comp, bool hsig )
+void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig )
 {
-    KCompletion *oldComp = compObj();
+    TDECompletion *oldComp = compObj();
     if ( oldComp && handleSignals() )
         disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )),
                     this, TQT_SLOT( setCompletedItems( const TQStringList& )));
@@ -1280,7 +1280,7 @@ void KLineEdit::setCompletionObject( KCompletion* comp, bool hsig )
       connect( comp, TQT_SIGNAL( matches( const TQStringList& )),
                this, TQT_SLOT( setCompletedItems( const TQStringList& )));
 
-    KCompletionBase::setCompletionObject( comp, hsig );
+    TDECompletionBase::setCompletionObject( comp, hsig );
 }
 
 // TQWidget::create() turns off mouse-Tracking which would break auto-hiding
@@ -1379,4 +1379,4 @@ TQString KLineEdit::clickMessage() const
 
 
 void KLineEdit::virtual_hook( int id, void* data )
-{ KCompletionBase::virtual_hook( id, data ); }
+{ TDECompletionBase::virtual_hook( id, data ); }
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index be25a35d9..82179fa05 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -35,7 +35,7 @@
 
 class TQPopupMenu;
 
-class KCompletionBox;
+class TDECompletionBox;
 class KURL;
 
 /**
@@ -63,7 +63,7 @@ class KURL;
  *
  * This widget by default creates a completion object when you invoke
  * the completionObject( bool ) member function for the first time or
- * use setCompletionObject( KCompletion*, bool ) to assign your own
+ * use setCompletionObject( TDECompletion*, bool ) to assign your own
  * completion object.  Additionally, to make this widget more functional,
  * KLineEdit will by default handle the text rotation and completion
  * events internally when a completion object is created through either one
@@ -82,7 +82,7 @@ class KURL;
  * If @p EchoMode for this widget is set to something other than @p TQLineEdit::Normal,
  * the completion mode will always be defaulted to TDEGlobalSettings::CompletionNone.
  * This is done purposefully to guard against protected entries such as passwords being
- * cached in KCompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the
+ * cached in TDECompletion's list. Hence, if the @p EchoMode is not TQLineEdit::Normal, the
  * completion mode is automatically disabled.
  *
  * A read-only KLineEdit will have the same background color as a
@@ -97,7 +97,7 @@ class KURL;
  *
  * \code
  * KLineEdit *edit = new KLineEdit( this, "mywidget" );
- * KCompletion *comp = edit->completionObject();
+ * TDECompletion *comp = edit->completionObject();
  * // Connect to the return pressed signal - optional
  * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&)));
  * \endcode
@@ -127,7 +127,7 @@ class KURL;
  * edit->setHandleSignals( false );
  *
  * // Set your own key-bindings for a text completion mode.
- * edit->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
+ * edit->setKeyBinding( TDECompletionBase::TextCompletion, Qt::End );
  *
  * // Hide the context (popup) menu
  * edit->setContextMenuEnabled( false );
@@ -142,7 +142,7 @@ class KURL;
  * @author Dawit Alemayehu <adawit@kde.org>
  */
 
-class TDEUI_EXPORT KLineEdit : public TQLineEdit, public KCompletionBase
+class TDEUI_EXPORT KLineEdit : public TQLineEdit, public TDECompletionBase
 {
     friend class KComboBox;
 
@@ -197,12 +197,12 @@ public:
     void cursorAtEnd() { end( false ); }
 
     /**
-     * Re-implemented from KCompletionBase for internal reasons.
+     * Re-implemented from TDECompletionBase for internal reasons.
      *
      * This function is re-implemented in order to make sure that
      * the EchoMode is acceptable before we set the completion mode.
      *
-     * See KCompletionBase::setCompletionMode
+     * See TDECompletionBase::setCompletionMode
      */
     virtual void setCompletionMode( TDEGlobalSettings::Completion mode );
 
@@ -275,12 +275,12 @@ public:
      * @param create Set this to false if you don't want the box to be created
      *               i.e. to test if it is available.
      */
-    KCompletionBox * completionBox( bool create = true );
+    TDECompletionBox * completionBox( bool create = true );
 
     /**
      * Reimplemented for internal reasons, the API is not affected.
      */
-    virtual void setCompletionObject( KCompletion *, bool hsig = true );
+    virtual void setCompletionObject( TDECompletion *, bool hsig = true );
 
     /**
      * Reimplemented for internal reasons, the API is not affected.
@@ -323,10 +323,10 @@ public:
      * TDEGlobalSettings::CompletionPopup.
      * This will do nothing if a completion-box already exists.
      *
-     * @param box The KCompletionBox to set
+     * @param box The TDECompletionBox to set
      * @since 3.4
     */
-    void setCompletionBox( KCompletionBox *box );
+    void setCompletionBox( TDECompletionBox *box );
 
     /**
      * This makes the line edit display a grayed-out hinting text as long as
@@ -385,7 +385,7 @@ signals:
      * mode is set to @p TDEGlobalSettings::CompletionNone or
      * @p echoMode() is @em not  normal.
      */
-    void textRotation( KCompletionBase::KeyBindingType );
+    void textRotation( TDECompletionBase::KeyBindingType );
 
     /**
      * Emitted when the user changed the completion mode by using the
@@ -424,10 +424,10 @@ public slots:
      *
      * @param type The key-binding invoked.
      */
-    void rotateText( KCompletionBase::KeyBindingType type );
+    void rotateText( TDECompletionBase::KeyBindingType type );
 
     /**
-     * See KCompletionBase::setCompletedText.
+     * See TDECompletionBase::setCompletedText.
      */
     virtual void setCompletedText( const TQString& );
 
diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h
index 7c01b6c29..995e2b678 100644
--- a/tdeui/tdelistview.h
+++ b/tdeui/tdelistview.h
@@ -194,7 +194,7 @@ public:
 
   /**
    * @return the lineedit used for inline renaming.
-   * Use that to setup a KCompletion or TQValidator for the lineedit
+   * Use that to setup a TDECompletion or TQValidator for the lineedit
    *
    * @since 3.2
    */
diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp
index 94314ffbc..701710891 100644
--- a/tdeui/tests/kcomboboxtest.cpp
+++ b/tdeui/tests/kcomboboxtest.cpp
@@ -139,8 +139,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name )
   // Setup konq's combobox
   KSimpleConfig historyConfig( "konq_history" );
   historyConfig.setGroup( "Location Bar" );
-  KCompletion * s_pCompletion = new KCompletion;
-  s_pCompletion->setOrder( KCompletion::Weighted );
+  TDECompletion * s_pCompletion = new TDECompletion;
+  s_pCompletion->setOrder( TDECompletion::Weighted );
   s_pCompletion->setItems( historyConfig.readListEntry( "ComboContents" ) );
   s_pCompletion->setCompletionMode( TDEGlobalSettings::completionMode() );
   m_konqc->setCompletionObject( s_pCompletion );