From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: Enable kdepim compilation under Qt4 This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/librss/feeddetector.cpp | 2 +- akregator/src/librss/tools_p.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'akregator/src/librss') diff --git a/akregator/src/librss/feeddetector.cpp b/akregator/src/librss/feeddetector.cpp index 099cc2a79..b12164f0e 100644 --- a/akregator/src/librss/feeddetector.cpp +++ b/akregator/src/librss/feeddetector.cpp @@ -72,7 +72,7 @@ FeedDetectorEntryList FeedDetector::extractFromLinkTags(const TQString& s) TQString type; int pos = reType.search(*it, 0); if (pos != -1) - type = reType.cap(1).lower(); + type = TQString(reType.cap(1)).lower(); // we accept only type attributes indicating a feed if ( type != "application/rss+xml" && type != "application/rdf+xml" diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp index 48b4a52a0..9c18fcaeb 100644 --- a/akregator/src/librss/tools_p.cpp +++ b/akregator/src/librss/tools_p.cpp @@ -69,8 +69,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type return HTML; if (type == TQString::fromUtf8("text") - || (type.startsWith(TQString::fromUtf8("text/"), false) - && !type.startsWith(TQString::fromUtf8("text/xml"), false)) + || (type.tqstartsWith(TQString::fromUtf8("text/"), false) + && !type.tqstartsWith(TQString::fromUtf8("text/xml"), false)) ) return Text; @@ -85,8 +85,8 @@ static ContentFormat mapTypeToFormat(const TQString& modep, const TQString& type if (xmltypes.tqcontains(type) - || type.endsWith(TQString::fromUtf8("+xml"), false) - || type.endsWith(TQString::fromUtf8("/xml"), false)) + || type.tqendsWith(TQString::fromUtf8("+xml"), false) + || type.tqendsWith(TQString::fromUtf8("/xml"), false)) return XML; return Binary; @@ -239,7 +239,7 @@ TQString parseItemAuthor(const TQDomElement& element, Format format, Version ver name = email; if (!email.isNull()) - return TQString("%2").arg(email).arg(name); + return TQString("%2").tqarg(email).tqarg(name); else return name; } -- cgit v1.2.1