From ae5df0a1d380cca4fb0d6e87d5857fbc77d30fe0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 17:50:57 -0600 Subject: [PATCH] Rename KComp to avoid conflicts with KDE4 --- src/fieldcompletion.cpp | 14 +++++++------- src/fieldcompletion.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fieldcompletion.cpp b/src/fieldcompletion.cpp index e05f539..6238298 100644 --- a/src/fieldcompletion.cpp +++ b/src/fieldcompletion.cpp @@ -16,7 +16,7 @@ using Tellico::FieldCompletion; -FieldCompletion::FieldCompletion(bool multiple_) : KCompletion(), m_multiple(multiple_) { +FieldCompletion::FieldCompletion(bool multiple_) : TDECompletion(), m_multiple(multiple_) { } TQString FieldCompletion::makeCompletion(const TQString& string_) { @@ -26,25 +26,25 @@ TQString FieldCompletion::makeCompletion(const TQString& string_) { } if(!m_multiple) { - return KCompletion::makeCompletion(string_); + return TDECompletion::makeCompletion(string_); } static TQRegExp rx = Data::Field::delimiter(); int pos = rx.searchRev(string_); if(pos == -1) { m_beginText.truncate(0); - return KCompletion::makeCompletion(string_); + return TDECompletion::makeCompletion(string_); } pos += rx.matchedLength(); TQString final = string_.mid(pos); m_beginText = string_.mid(0, pos); - return m_beginText + KCompletion::makeCompletion(final); + return m_beginText + TDECompletion::makeCompletion(final); } void FieldCompletion::clear() { m_beginText.truncate(0); - KCompletion::clear(); + TDECompletion::clear(); } void FieldCompletion::postProcessMatch(TQString* match_) const { @@ -61,9 +61,9 @@ void FieldCompletion::postProcessMatches(TQStringList* matches_) const { } } -void FieldCompletion::postProcessMatches(KCompletionMatches* matches_) const { +void FieldCompletion::postProcessMatches(TDECompletionMatches* matches_) const { if(m_multiple) { - for(KCompletionMatches::Iterator it = matches_->begin(); it != matches_->end(); ++it) { + for(TDECompletionMatches::Iterator it = matches_->begin(); it != matches_->end(); ++it) { (*it).value().prepend(m_beginText); } } diff --git a/src/fieldcompletion.h b/src/fieldcompletion.h index df9b53d..402af46 100644 --- a/src/fieldcompletion.h +++ b/src/fieldcompletion.h @@ -21,7 +21,7 @@ namespace Tellico { /** * @author Robby Stephenson */ -class FieldCompletion : public KCompletion { +class FieldCompletion : public TDECompletion { Q_OBJECT @@ -35,7 +35,7 @@ public: protected: virtual void postProcessMatch(TQString* match) const; virtual void postProcessMatches(TQStringList* matches) const; - virtual void postProcessMatches(KCompletionMatches* matches) const; + virtual void postProcessMatches(TDECompletionMatches* matches) const; private: bool m_multiple;