Rename KComp to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent e47549c5bf
commit ae5df0a1d3

@ -16,7 +16,7 @@
using Tellico::FieldCompletion; 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_) { TQString FieldCompletion::makeCompletion(const TQString& string_) {
@ -26,25 +26,25 @@ TQString FieldCompletion::makeCompletion(const TQString& string_) {
} }
if(!m_multiple) { if(!m_multiple) {
return KCompletion::makeCompletion(string_); return TDECompletion::makeCompletion(string_);
} }
static TQRegExp rx = Data::Field::delimiter(); static TQRegExp rx = Data::Field::delimiter();
int pos = rx.searchRev(string_); int pos = rx.searchRev(string_);
if(pos == -1) { if(pos == -1) {
m_beginText.truncate(0); m_beginText.truncate(0);
return KCompletion::makeCompletion(string_); return TDECompletion::makeCompletion(string_);
} }
pos += rx.matchedLength(); pos += rx.matchedLength();
TQString final = string_.mid(pos); TQString final = string_.mid(pos);
m_beginText = string_.mid(0, pos); m_beginText = string_.mid(0, pos);
return m_beginText + KCompletion::makeCompletion(final); return m_beginText + TDECompletion::makeCompletion(final);
} }
void FieldCompletion::clear() { void FieldCompletion::clear() {
m_beginText.truncate(0); m_beginText.truncate(0);
KCompletion::clear(); TDECompletion::clear();
} }
void FieldCompletion::postProcessMatch(TQString* match_) const { 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) { 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); (*it).value().prepend(m_beginText);
} }
} }

@ -21,7 +21,7 @@ namespace Tellico {
/** /**
* @author Robby Stephenson * @author Robby Stephenson
*/ */
class FieldCompletion : public KCompletion { class FieldCompletion : public TDECompletion {
Q_OBJECT Q_OBJECT
@ -35,7 +35,7 @@ public:
protected: protected:
virtual void postProcessMatch(TQString* match) const; virtual void postProcessMatch(TQString* match) const;
virtual void postProcessMatches(TQStringList* matches) const; virtual void postProcessMatches(TQStringList* matches) const;
virtual void postProcessMatches(KCompletionMatches* matches) const; virtual void postProcessMatches(TDECompletionMatches* matches) const;
private: private:
bool m_multiple; bool m_multiple;

Loading…
Cancel
Save