diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js
index 4f7243c6..728856be 100755
--- a/kexi/doc/dev/CHANGELOG-Kexi-js
+++ b/kexi/doc/dev/CHANGELOG-Kexi-js
@@ -16,7 +16,7 @@ Legend:
    mentioning in the public changelog
 
 TODO: fix displaying default values in comboboxes (form and tableview)
-TODO: use KCompletionBox in (editable/noneditable) comboboxes
+TODO: use TDECompletionBox in (editable/noneditable) comboboxes
 
 2007-04-11
 Forms
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index a37201b2..08e24207 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -272,8 +272,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
              TQT_SLOT( pathComboChanged( const TQString& ) ));
     connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )),
              TQT_SLOT( dirCompletion( const TQString& )));
-    connect( d->pathCombo, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ),
-             d->pathCombo, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) ));
+    connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
+             d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
 
     TQString whatsThisText;
 
@@ -299,8 +299,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
             this,  TQT_SLOT( locationActivated( const TQString& ) ));
     connect( locationEdit, TQT_SIGNAL( completion( const TQString& )),
              TQT_SLOT( fileCompletion( const TQString& )));
-    connect( locationEdit, TQT_SIGNAL( textRotation(KCompletionBase::KeyBindingType) ),
-             locationEdit, TQT_SLOT( rotateText(KCompletionBase::KeyBindingType) ));
+    connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ),
+             locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) ));
 
     // the Filter label/edit
     whatsThisText = i18n("<qt>This is the filter to apply to the file list. "
diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp
index effafb38..4299017d 100644
--- a/kexi/widget/kexidatasourcecombobox.cpp
+++ b/kexi/widget/kexidatasourcecombobox.cpp
@@ -128,7 +128,7 @@ void KexiDataSourceComboBox::setProject(KexiProject *prj, bool showTables, bool
 	insertItem(i18n("Define Query..."));
 #endif
 
-	KCompletion *comp = completionObject();
+	TDECompletion *comp = completionObject();
 
 	if (d->showTables) {
 		//tables
diff --git a/kspread/dialogs/kspread_dlg_formula.h b/kspread/dialogs/kspread_dlg_formula.h
index 236ef9e9..1bf30db3 100644
--- a/kspread/dialogs/kspread_dlg_formula.h
+++ b/kspread/dialogs/kspread_dlg_formula.h
@@ -139,7 +139,7 @@ private:
     TQLineEdit *result;
 
     KLineEdit *searchFunct;
-    KCompletion listFunct;
+    TDECompletion listFunct;
 
     TQLabel* label1;
     TQLabel* label2;
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 6b11b6da..3afcfaf1 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -126,7 +126,7 @@ public:
   TQPtrList<Plugin> plugins;
 
   TQValueList<Reference> refs;
-  KCompletion listCompletion;
+  TDECompletion listCompletion;
 
   int numOperations;
 
@@ -500,7 +500,7 @@ const TQValueList<Reference>  &Doc::listArea()
   return d->refs;
 }
 
-KCompletion& Doc::completion()
+TDECompletion& Doc::completion()
 {
   return d->listCompletion;
 }
diff --git a/kspread/kspread_doc.h b/kspread/kspread_doc.h
index f734d6fb..7dbfb0a3 100644
--- a/kspread/kspread_doc.h
+++ b/kspread/kspread_doc.h
@@ -517,7 +517,7 @@ public:
   void addAreaName(const TQRect &_rect,const TQString & name,const TQString & sheetName);
   const TQValueList<Reference>  & listArea();
   void removeArea( const TQString &name);
-  KCompletion & completion();
+  TDECompletion & completion();
   void addStringCompletion(const TQString & stringCompletion);
 
   void changeAreaSheetName(const TQString & oldName,const TQString &sheetName);
diff --git a/kspread/kspread_editors.h b/kspread/kspread_editors.h
index b0dff610..6d4a77a5 100644
--- a/kspread/kspread_editors.h
+++ b/kspread/kspread_editors.h
@@ -279,7 +279,7 @@ protected:
     virtual void keyPressEvent( TQKeyEvent * _ev );
 private:
     View * m_pView;
-    KCompletion completionList;
+    TDECompletion completionList;
     bool activateItem();
 };
 
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index 164c5816..1e2a47d4 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -144,7 +144,7 @@ ComboBox::fillBox()
 	}
 
 	m_edit->insertStringList(property()->listData()->names);
-	KCompletion *comp = m_edit->completionObject();
+	TDECompletion *comp = m_edit->completionObject();
 	comp->insertItems(property()->listData()->names);
 	comp->setCompletionMode(TDEGlobalSettings::CompletionShell);
 }
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 1a3c5245..b6268a76 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -148,7 +148,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti
       m_typographicDoubleQuotes(),
       m_typographicDefaultDoubleQuotes(),
       m_typographicDefaultSimpleQuotes(),
-      m_listCompletion( new KCompletion ),
+      m_listCompletion( new TDECompletion ),
       m_entries(17,false),
       m_allLanguages(17,false),
       m_superScriptEntries(),
@@ -218,7 +218,7 @@ KoAutoFormat::KoAutoFormat( const KoAutoFormat& format )
       m_completionBox(0),
       m_keyCompletionAction( format.m_keyCompletionAction )
 {
-    //m_listCompletion=new KCompletion();
+    //m_listCompletion=new TDECompletion();
     //m_listCompletion->setItems( autoFormat.listCompletion() );
     //copyAutoFormatEntries( autoFormat );
 }
diff --git a/lib/kotext/KoAutoFormat.h b/lib/kotext/KoAutoFormat.h
index d122f7b7..b4e53f6c 100644
--- a/lib/kotext/KoAutoFormat.h
+++ b/lib/kotext/KoAutoFormat.h
@@ -37,7 +37,7 @@ class KoTextParag;
 class KoTextObject;
 class KoVariableCollection;
 class KoVariableFormatCollection;
-class KCompletion;
+class TDECompletion;
 class KoTextCursor;
 class KCommand;
 class KoSearchContext;
@@ -315,7 +315,7 @@ public:
 
     TQStringList listCompletion() const;
 
-    KCompletion *getCompletion() const { return m_listCompletion; }
+    TDECompletion *getCompletion() const { return m_listCompletion; }
 
     int nbSuperScriptEntry() const
         { return m_superScriptEntries.count(); }
@@ -399,7 +399,7 @@ private:
 
     TypographicQuotes m_typographicDefaultSimpleQuotes;
 
-    KCompletion *m_listCompletion;
+    TDECompletion *m_listCompletion;
 
     TQDict<KoAutoFormatEntry> m_entries;
     TQDict<KoAutoFormatEntry> m_allLanguages;