From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/articlefilter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'akregator/src/articlefilter.cpp') diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 065a421aa..e8e36f076 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -17,7 +17,7 @@ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT @@ -50,8 +50,8 @@ TQString Criterion::subjectToString(Subject subj) return TQString::tqfromLatin1("Author"); case Description: return TQString::tqfromLatin1("Description"); - case Status: - return TQString::tqfromLatin1("Status"); + case tqStatus: + return TQString::tqfromLatin1("tqStatus"); case KeepFlag: return TQString::tqfromLatin1("KeepFlag"); default: // should never happen (TM) @@ -69,8 +69,8 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr) return Description; else if (subjStr == TQString::tqfromLatin1("Author")) return Author; - else if (subjStr == TQString::tqfromLatin1("Status")) - return Status; + else if (subjStr == TQString::tqfromLatin1("tqStatus")) + return tqStatus; else if (subjStr == TQString::tqfromLatin1("KeepFlag")) return KeepFlag; @@ -163,7 +163,7 @@ bool Criterion::satisfiedBy( const Article &article ) const // ### Maybe use prettyURL here? concreteSubject = TQVariant(article.link().url()); break; - case Status: + case tqStatus: concreteSubject = TQVariant(article.status()); break; case KeepFlag: @@ -179,7 +179,7 @@ bool Criterion::satisfiedBy( const Article &article ) const switch ( predicateType ) { case Contains: - satisfied = concreteSubject.toString().find( m_object.toString(), 0, false ) != -1; + satisfied = concreteSubject.toString().tqfind( m_object.toString(), 0, false ) != -1; break; case Equals: if (subjectType=="int") @@ -449,7 +449,7 @@ SeStatusAction::SeStatusAction(int status) : m_status(status) void SeStatusAction::exec(Article& article) { if (!article.isNull()) - article.seStatus(m_status); + article.setqStatus(m_status); } int SeStatusAction::status() const @@ -457,7 +457,7 @@ int SeStatusAction::status() const return m_status; } -void SeStatusAction::seStatus(int status) +void SeStatusAction::setqStatus(int status) { m_status = status; } -- cgit v1.2.1