From a5ef67db99ee9b616837623bccd6183a0cc93f64 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 17:56:01 -0600 Subject: Rename KComp to avoid conflicts with KDE4 --- kmplot/kmplot/editfunctionpage.ui | 4 ++-- kwordquiz/src/dlglanguage.cpp | 4 ++-- kwordquiz/src/dlglanguage.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index 2b6da892..11210098 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -401,7 +401,7 @@ Example: f(x)=x^2 returnPressed(const TQString&) completion(const TQString&) substringCompletion(const TQString&) - textRotation(KCompletionBase::KeyBindingType) + textRotation(TDECompletionBase::KeyBindingType) completionModeChanged(TDEGlobalSettings::Completion) aboutToShowContextMenu(TQPopupMenu*) deleteLater() @@ -473,7 +473,7 @@ Example: f(x)=x^2 setDragEnabled(bool) clipboardChanged() setReadOnly(bool) - rotateText(KCompletionBase::KeyBindingType) + rotateText(TDECompletionBase::KeyBindingType) setCompletedText(const TQString&) setCompletedItems(const TQStringList&) setCompletedItems(const TQStringList&,bool) diff --git a/kwordquiz/src/dlglanguage.cpp b/kwordquiz/src/dlglanguage.cpp index 3433c6f1..bfc033ad 100644 --- a/kwordquiz/src/dlglanguage.cpp +++ b/kwordquiz/src/dlglanguage.cpp @@ -30,11 +30,11 @@ DlgLanguage::DlgLanguage(TQWidget *parent, const char *name, bool modal): KDialo dlgBase -> picLanguage1 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("question", TDEIcon::Panel)); dlgBase -> picLanguage2 -> setPixmap(TDEGlobal::iconLoader()->loadIcon("answer", TDEIcon::Panel)); - completion1 = new KCompletion(); + completion1 = new TDECompletion(); completion1->setItems(Prefs::columnTitles1()); dlgBase -> txtLanguage1->setCompletionObject(completion1); - completion2 = new KCompletion(); + completion2 = new TDECompletion(); completion2->setItems(Prefs::columnTitles2()); dlgBase -> txtLanguage2->setCompletionObject(completion2); diff --git a/kwordquiz/src/dlglanguage.h b/kwordquiz/src/dlglanguage.h index 15bed38c..4f9431ce 100644 --- a/kwordquiz/src/dlglanguage.h +++ b/kwordquiz/src/dlglanguage.h @@ -21,7 +21,7 @@ #include "dlglanguagebase.h" -class KCompletion; +class TDECompletion; /** @author Peter Hedlund @@ -38,8 +38,8 @@ class DlgLanguage : public KDialogBase { private: DlgLanguageBase *dlgBase; - KCompletion * completion1; - KCompletion * completion2; + TDECompletion * completion1; + TDECompletion * completion2; }; -- cgit v1.2.1