From 6131ac753137296a94d20f6b05f0728125bd1d37 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 17:53:51 -0600 Subject: Rename KComp to avoid conflicts with KDE4 --- ksysv/OldView.cpp | 2 +- ksysv/SpinBox.cpp | 4 ++-- ksysv/SpinBox.h | 2 +- ksysv/ksv_core.cpp | 8 ++++---- ksysv/ksv_core.h | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'ksysv') diff --git a/ksysv/OldView.cpp b/ksysv/OldView.cpp index 3d42700..6e96046 100644 --- a/ksysv/OldView.cpp +++ b/ksysv/OldView.cpp @@ -387,7 +387,7 @@ void KSVContent::initScripts() { // const TQFileInfoList *scriptList = scriptDir.entryInfoList(); TQFileInfoListIterator it (*scriptDir.entryInfoList()); - KCompletion* comp = ksv::serviceCompletion(); + TDECompletion* comp = ksv::serviceCompletion(); comp->clear (); // clear the listview diff --git a/ksysv/SpinBox.cpp b/ksysv/SpinBox.cpp index 72ca85e..cb56bbe 100644 --- a/ksysv/SpinBox.cpp +++ b/ksysv/SpinBox.cpp @@ -9,10 +9,10 @@ KSVSpinBox::KSVSpinBox (TQWidget* parent, const char* name) : TQSpinBox (0, 99, 1, parent, name), - KCompletionBase (), + TDECompletionBase (), mClearedSelection (false) { - KCompletion* comp = ksv::numberCompletion(); + TDECompletion* comp = ksv::numberCompletion(); setCompletionObject (comp, true); editor()->installEventFilter (this); diff --git a/ksysv/SpinBox.h b/ksysv/SpinBox.h index b153e72..00369d3 100644 --- a/ksysv/SpinBox.h +++ b/ksysv/SpinBox.h @@ -7,7 +7,7 @@ #include -class KSVSpinBox : public TQSpinBox, public KCompletionBase +class KSVSpinBox : public TQSpinBox, public TDECompletionBase { Q_OBJECT diff --git a/ksysv/ksv_core.cpp b/ksysv/ksv_core.cpp index e980f69..48eb9fd 100644 --- a/ksysv/ksv_core.cpp +++ b/ksysv/ksv_core.cpp @@ -121,16 +121,16 @@ TQStyleSheet* ksv::styleSheet () return &style; } -KCompletion* ksv::serviceCompletion () +TDECompletion* ksv::serviceCompletion () { - static KCompletion comp; + static TDECompletion comp; return ∁ } -KCompletion* ksv::numberCompletion () +TDECompletion* ksv::numberCompletion () { - static KCompletion comp; + static TDECompletion comp; static bool initialized = false; if (!initialized) diff --git a/ksysv/ksv_core.h b/ksysv/ksv_core.h index 8472fcc..9ffb02f 100644 --- a/ksysv/ksv_core.h +++ b/ksysv/ksv_core.h @@ -18,7 +18,7 @@ class TQPushButton; class TQStyleSheet; class TDEAboutData; -class KCompletion; +class TDECompletion; class KSVItem; namespace ksv @@ -40,8 +40,8 @@ namespace ksv const TQString& logFileExtension (); const TQString& nativeFileExtension (); - KCompletion* serviceCompletion (); - KCompletion* numberCompletion (); + TDECompletion* serviceCompletion (); + TDECompletion* numberCompletion (); extern const int runlevelNumber; extern TDEAboutData* about; -- cgit v1.2.1