diff options
| author | Timothy Pearson <[email protected]> | 2013-02-07 17:56:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-07 17:56:01 -0600 |
| commit | a5ef67db99ee9b616837623bccd6183a0cc93f64 (patch) | |
| tree | d77c2ba192999d0d8796c406f52a6af9b4d8e0a2 | |
| parent | 3a3518bb002cace6891cdf58a7ee83b3fb15ce8a (diff) | |
| download | tdeedu-a5ef67db99ee9b616837623bccd6183a0cc93f64.tar.gz tdeedu-a5ef67db99ee9b616837623bccd6183a0cc93f64.zip | |
Rename KComp to avoid conflicts with KDE4
| -rw-r--r-- | kmplot/kmplot/editfunctionpage.ui | 4 | ||||
| -rw-r--r-- | kwordquiz/src/dlglanguage.cpp | 4 | ||||
| -rw-r--r-- | 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</string> <signal>returnPressed(const TQString&)</signal> <signal>completion(const TQString&)</signal> <signal>substringCompletion(const TQString&)</signal> - <signal>textRotation(KCompletionBase::KeyBindingType)</signal> + <signal>textRotation(TDECompletionBase::KeyBindingType)</signal> <signal>completionModeChanged(TDEGlobalSettings::Completion)</signal> <signal>aboutToShowContextMenu(TQPopupMenu*)</signal> <slot access="public" specifier="">deleteLater()</slot> @@ -473,7 +473,7 @@ Example: f(x)=x^2</string> <slot access="public" specifier="">setDragEnabled(bool)</slot> <slot access="private" specifier="">clipboardChanged()</slot> <slot access="public" specifier="">setReadOnly(bool)</slot> - <slot access="public" specifier="">rotateText(KCompletionBase::KeyBindingType)</slot> + <slot access="public" specifier="">rotateText(TDECompletionBase::KeyBindingType)</slot> <slot access="public" specifier="">setCompletedText(const TQString&)</slot> <slot access="public" specifier="">setCompletedItems(const TQStringList&)</slot> <slot access="public" specifier="">setCompletedItems(const TQStringList&,bool)</slot> 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; }; |