[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bkdepimlibs=5D_syndication=3A_Build_with_NO=5FCAST?=
From: Frank Osterfeld <frank.osterfeld () kdab ! com>
Date: 2011-03-23 19:41:25
Message-ID: 20110323194125.5FD4DA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit ef25e71eeea710628a5766f01d5a53a03bfaa594 by Frank Osterfeld.
Committed on 23/03/2011 at 20:10.
Pushed by osterfeld into branch 'master'.
Build with NO_CAST_ASCII
Patch by Kalle Dalheimer <kalle@kde.org>
M +5 -0 syndication/CMakeLists.txt
M +5 -5 syndication/atom/category.cpp
M +6 -6 syndication/atom/content.cpp
M +13 -13 syndication/atom/document.cpp
M +10 -10 syndication/atom/entry.cpp
M +5 -5 syndication/atom/generator.cpp
M +8 -8 syndication/atom/link.cpp
M +5 -5 syndication/atom/person.cpp
M +11 -11 syndication/atom/source.cpp
M +5 -5 syndication/category.cpp
M +1 -0 syndication/category.h
M +5 -5 syndication/dataretriever.cpp
M +1 -1 syndication/documentsource.cpp
M +1 -0 syndication/documentsource.h
M +7 -7 syndication/enclosure.cpp
M +2 -0 syndication/enclosure.h
M +7 -7 syndication/feed.cpp
M +8 -8 syndication/image.cpp
M +1 -0 syndication/image.h
M +14 -14 syndication/item.cpp
M +1 -0 syndication/item.h
M +5 -5 syndication/loader.cpp
M +1 -0 syndication/mapper/imagerdfimpl.h
M +1 -1 syndication/mapper/itematomimpl.cpp
M +1 -1 syndication/mapper/itemrdfimpl.cpp
M +1 -1 syndication/mapper/itemrss2impl.cpp
M +5 -5 syndication/person.cpp
M +1 -0 syndication/person.h
M +5 -5 syndication/rdf/document.cpp
M +15 -15 syndication/rdf/dublincore.cpp
M +5 -5 syndication/rdf/image.cpp
M +1 -0 syndication/rdf/image.h
M +6 -6 syndication/rdf/item.cpp
M +1 -0 syndication/rdf/literal.h
M +5 -5 syndication/rdf/model.cpp
M +1 -0 syndication/rdf/node.h
M +3 -3 syndication/rdf/syndicationinfo.cpp
M +6 -6 syndication/rdf/textinput.cpp
M +1 -0 syndication/rdf/textinput.h
M +4 -4 syndication/rss2/category.cpp
M +7 -7 syndication/rss2/cloud.cpp
M +11 -11 syndication/rss2/document.cpp
M +5 -5 syndication/rss2/enclosure.cpp
M +8 -8 syndication/rss2/image.cpp
M +11 -11 syndication/rss2/item.cpp
M +4 -4 syndication/rss2/source.cpp
M +6 -6 syndication/rss2/textinput.cpp
M +2 -2 syndication/tests/testlibsyndication.cpp
M +24 -24 syndication/tools.cpp
http://commits.kde.org/kdepimlibs/ef25e71eeea710628a5766f01d5a53a03bfaa594
diff --git a/syndication/CMakeLists.txt b/syndication/CMakeLists.txt
index c611651..19fd577 100644
--- a/syndication/CMakeLists.txt
+++ b/syndication/CMakeLists.txt
@@ -9,6 +9,11 @@ add_subdirectory( rss2 )
include_directories( ${Boost_INCLUDE_DIR} )
+add_definitions( -DQT_STRICT_ITERATORS )
+add_definitions( -DQT_NO_CAST_FROM_ASCII )
+add_definitions( -DQT_NO_CAST_TO_ASCII )
+add_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
+
########### next target ###############
set(librss2local_SRCS
diff --git a/syndication/atom/category.cpp b/syndication/atom/category.cpp
index b2a2aac..4b551d1 100644
--- a/syndication/atom/category.cpp
+++ b/syndication/atom/category.cpp
@@ -58,13 +58,13 @@ QString Category::label() const
QString Category::debugInfo() const
{
QString info;
- info += "### Category: ###################\n";
- info += "term: #" + term() + "#\n";
+ info += QLatin1String("### Category: ###################\n");
+ info += QLatin1String("term: #") + term() + QLatin1String("#\n");
if (!scheme().isEmpty())
- info += "scheme: #" + scheme() + "#\n";
+ info += QLatin1String("scheme: #") + scheme() + QLatin1String("#\n");
if (!label().isEmpty())
- info += "label: #" + label() + "#\n";
- info += "### Category end ################\n";
+ info += QLatin1String("label: #") + label() + QLatin1String("#\n");
+ info += QLatin1String("### Category end ################\n");
return info;
}
diff --git a/syndication/atom/content.cpp b/syndication/atom/content.cpp
index a8c8365..4f95edb 100644
--- a/syndication/atom/content.cpp
+++ b/syndication/atom/content.cpp
@@ -185,17 +185,17 @@ QString Content::asString() const
QString Content::debugInfo() const
{
QString info;
- info += "### Content: ###################\n";
- info += "type: #" + type() + "#\n";
+ info += QLatin1String("### Content: ###################\n");
+ info += QLatin1String("type: #") + type() + QLatin1String("#\n");
if (!src().isNull())
- info += "src: #" + src() + "#\n";
+ info += QLatin1String("src: #") + src() + QLatin1String("#\n");
if (!isBinary())
- info += "content: #" + asString() + "#\n";
+ info += QLatin1String("content: #") + asString() + QLatin1String("#\n");
else
{
- info += "binary length: #" + QString::number(asByteArray().size()) + "#\n";
+ info += QLatin1String("binary length: #") + \
QString::number(asByteArray().size()) + QLatin1String("#\n"); }
- info += "### Content end ################\n";
+ info += QLatin1String("### Content end ################\n");
return info;
}
diff --git a/syndication/atom/document.cpp b/syndication/atom/document.cpp
index 12279c1..c1bf40b 100644
--- a/syndication/atom/document.cpp
+++ b/syndication/atom/document.cpp
@@ -237,27 +237,27 @@ bool FeedDocument::isValid() const
QString FeedDocument::debugInfo() const
{
QString info;
- info += "### FeedDocument: ###################\n";
+ info += QLatin1String("### FeedDocument: ###################\n");
if (!title().isEmpty())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!subtitle().isEmpty())
- info += "subtitle: #" + subtitle() + "#\n";
+ info += QLatin1String("subtitle: #") + subtitle() + QLatin1String("#\n");
if (!id().isEmpty())
- info += "id: #" + id() + "#\n";
+ info += QLatin1String("id: #") + id() + QLatin1String("#\n");
if (!rights().isEmpty())
- info += "rights: #" + rights() + "#\n";
+ info += QLatin1String("rights: #") + rights() + QLatin1String("#\n");
if (!icon().isEmpty())
- info += "icon: #" + icon() + "#\n";
+ info += QLatin1String("icon: #") + icon() + QLatin1String("#\n");
if (!logo().isEmpty())
- info += "logo: #" + logo() + "#\n";
+ info += QLatin1String("logo: #") + logo() + QLatin1String("#\n");
if (!generator().isNull())
info += generator().debugInfo();
QString dupdated = dateTimeToString(updated());
if (!dupdated.isNull())
- info += "updated: #" + dupdated + "#\n";
+ info += QLatin1String("updated: #") + dupdated + QLatin1String("#\n");
QList<Link> dlinks = links();
QList<Link>::ConstIterator endlinks = dlinks.constEnd();
@@ -269,14 +269,14 @@ QString FeedDocument::debugInfo() const
for (QList<Category>::ConstIterator it = dcats.constBegin(); it != endcats; \
++it) info += (*it).debugInfo();
- info += "### Authors: ###################\n";
+ info += QLatin1String("### Authors: ###################\n");
QList<Person> dauthors = authors();
QList<Person>::ConstIterator endauthors = dauthors.constEnd();
for (QList<Person>::ConstIterator it = dauthors.constBegin(); it != endauthors; \
++it) info += (*it).debugInfo();
- info += "### Contributors: ###################\n";
+ info += QLatin1String("### Contributors: ###################\n");
QList<Person> dcontri = contributors();
QList<Person>::ConstIterator endcontri = dcontri.constEnd();
@@ -288,7 +288,7 @@ QString FeedDocument::debugInfo() const
for (QList<Entry>::ConstIterator it = dentries.constBegin(); it != endentries; \
++it) info += (*it).debugInfo();
- info += "### FeedDocument end ################\n";
+ info += QLatin1String("### FeedDocument end ################\n");
return info;
}
@@ -320,13 +320,13 @@ bool EntryDocument::isValid() const
QString EntryDocument::debugInfo() const
{
QString info;
- info += "### EntryDocument: ##################\n";
+ info += QLatin1String("### EntryDocument: ##################\n");
Entry dentry = entry();
if (!dentry.isNull())
info += dentry.debugInfo();
- info += "### EntryDocument end ###############\n";
+ info += QLatin1String("### EntryDocument end ###############\n");
return info;
}
diff --git a/syndication/atom/entry.cpp b/syndication/atom/entry.cpp
index 5f830ac..f35b654 100644
--- a/syndication/atom/entry.cpp
+++ b/syndication/atom/entry.cpp
@@ -206,27 +206,27 @@ QList<QDomElement> Entry::unhandledElements() const
QString Entry::debugInfo() const
{
QString info;
- info += "### Entry: ###################\n";
+ info += QLatin1String("### Entry: ###################\n");
if (!title().isEmpty())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!summary().isEmpty())
- info += "summary: #" + summary() + "#\n";
+ info += QLatin1String("summary: #") + summary() + QLatin1String("#\n");
if (!id().isEmpty())
- info += "id: #" + id() + "#\n";
+ info += QLatin1String("id: #") + id() + QLatin1String("#\n");
if (!content().isNull())
info += content().debugInfo();
if (!rights().isEmpty())
- info += "rights: #" + rights() + "#\n";
+ info += QLatin1String("rights: #") + rights() + QLatin1String("#\n");
QString dupdated = dateTimeToString(updated());
if (!dupdated.isNull())
- info += "updated: #" + dupdated + "#\n";
+ info += QLatin1String("updated: #") + dupdated + QLatin1String("#\n");
QString dpublished = dateTimeToString(published());
if (!dpublished.isNull())
- info += "published: #" + dpublished + "#\n";
+ info += QLatin1String("published: #") + dpublished + QLatin1String("#\n");
QList<Link> dlinks = links();
QList<Link>::ConstIterator endlinks = dlinks.constEnd();
@@ -238,14 +238,14 @@ QString Entry::debugInfo() const
for (QList<Category>::ConstIterator it = dcats.constBegin(); it != endcats; \
++it) info += (*it).debugInfo();
- info += "### Authors: ###################\n";
+ info += QLatin1String("### Authors: ###################\n");
QList<Person> dauthors = authors();
QList<Person>::ConstIterator endauthors = dauthors.constEnd();
for (QList<Person>::ConstIterator it = dauthors.constBegin(); it != endauthors; \
++it) info += (*it).debugInfo();
- info += "### Contributors: ###################\n";
+ info += QLatin1String("### Contributors: ###################\n");
QList<Person> dcontri = contributors();
QList<Person>::ConstIterator endcontri = dcontri.constEnd();
@@ -255,7 +255,7 @@ QString Entry::debugInfo() const
if (!source().isNull())
info += source().debugInfo();
- info += "### Entry end ################\n";
+ info += QLatin1String("### Entry end ################\n");
return info;
}
diff --git a/syndication/atom/generator.cpp b/syndication/atom/generator.cpp
index 6f2126f..ab27335 100644
--- a/syndication/atom/generator.cpp
+++ b/syndication/atom/generator.cpp
@@ -54,14 +54,14 @@ QString Generator::version() const
QString Generator::debugInfo() const
{
QString info;
- info += "### Generator: ###################\n";
+ info += QLatin1String("### Generator: ###################\n");
if (!name().isEmpty())
- info += "name: #" + name() + "#\n";
+ info += QLatin1String("name: #") + name() + QLatin1String("#\n");
if (!uri().isEmpty())
- info += "uri: #" + uri() + "#\n";
+ info += QLatin1String("uri: #") + uri() + QLatin1String("#\n");
if (!version().isEmpty())
- info += "version: #" + version() + "#\n";
- info += "### Generator end ################\n";
+ info += QLatin1String("version: #") + version() + QLatin1String("#\n");
+ info += QLatin1String("### Generator end ################\n");
return info;
}
diff --git a/syndication/atom/link.cpp b/syndication/atom/link.cpp
index abfc272..59220ee 100644
--- a/syndication/atom/link.cpp
+++ b/syndication/atom/link.cpp
@@ -74,20 +74,20 @@ uint Link::length() const
QString Link::debugInfo() const
{
QString info;
- info += "### Link: ###################\n";
+ info += QLatin1String("### Link: ###################\n");
if (!title().isEmpty())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!href().isEmpty())
- info += "href: #" + href() + "#\n";
+ info += QLatin1String("href: #") + href() + QLatin1String("#\n");
if (!rel().isEmpty())
- info += "rel: #" + rel() + "#\n";
+ info += QLatin1String("rel: #") + rel() + QLatin1String("#\n");
if (!type().isEmpty())
- info += "type: #" + type() + "#\n";
+ info += QLatin1String("type: #") + type() + QLatin1String("#\n");
if (length() != 0)
- info += "length: #" + QString::number(length()) + "#\n";
+ info += QLatin1String("length: #") + QString::number(length()) + \
QLatin1String("#\n"); if (!hrefLanguage().isEmpty())
- info += "hrefLanguage: #" + hrefLanguage() + "#\n";
- info += "### Link end ################\n";
+ info += QLatin1String("hrefLanguage: #") + hrefLanguage() + \
QLatin1String("#\n"); + info += QLatin1String("### Link end ################\n");
return info;
}
diff --git a/syndication/atom/person.cpp b/syndication/atom/person.cpp
index a2b1814..a55a9d2 100644
--- a/syndication/atom/person.cpp
+++ b/syndication/atom/person.cpp
@@ -58,11 +58,11 @@ QString Person::email() const
QString Person::debugInfo() const
{
QString info;
- info += "### Person: ###################\n";
- info += "name: #" + name() + "#\n";
- info += "email: #" + email() + "#\n";
- info += "uri: #" + uri() + "#\n";
- info += "### Person end ################\n";
+ info += QLatin1String("### Person: ###################\n");
+ info += QLatin1String("name: #") + name() + QLatin1String("#\n");
+ info += QLatin1String("email: #") + email() + QLatin1String("#\n");
+ info += QLatin1String("uri: #") + uri() + QLatin1String("#\n");
+ info += QLatin1String("### Person end ################\n");
return info;
}
diff --git a/syndication/atom/source.cpp b/syndication/atom/source.cpp
index de171c6..eac4dfd 100644
--- a/syndication/atom/source.cpp
+++ b/syndication/atom/source.cpp
@@ -170,27 +170,27 @@ time_t Source::updated() const
QString Source::debugInfo() const
{
QString info;
- info += "### Source: ###################\n";
+ info += QLatin1String("### Source: ###################\n");
if (!title().isEmpty())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!subtitle().isEmpty())
- info += "subtitle: #" + subtitle() + "#\n";
+ info += QLatin1String("subtitle: #") + subtitle() + QLatin1String("#\n");
if (!id().isEmpty())
- info += "id: #" + id() + "#\n";
+ info += QLatin1String("id: #") + id() + QLatin1String("#\n");
if (!rights().isEmpty())
- info += "rights: #" + rights() + "#\n";
+ info += QLatin1String("rights: #") + rights() + QLatin1String("#\n");
if (!icon().isEmpty())
- info += "icon: #" + icon() + "#\n";
+ info += QLatin1String("icon: #") + icon() + QLatin1String("#\n");
if (!logo().isEmpty())
- info += "logo: #" + logo() + "#\n";
+ info += QLatin1String("logo: #") + logo() + QLatin1String("#\n");
if (!generator().isNull())
info += generator().debugInfo();
QString dupdated = dateTimeToString(updated());
if (!dupdated.isNull())
- info += "updated: #" + dupdated + "#\n";
+ info += QLatin1String("updated: #") + dupdated + QLatin1String("#\n");
QList<Link> dlinks = links();
QList<Link>::ConstIterator endlinks = dlinks.constEnd();
@@ -202,21 +202,21 @@ QString Source::debugInfo() const
for (QList<Category>::ConstIterator it = dcats.constBegin(); it != endcats; \
++it) info += (*it).debugInfo();
- info += "### Authors: ###################\n";
+ info += QLatin1String("### Authors: ###################\n");
QList<Person> dauthors = authors();
QList<Person>::ConstIterator endauthors = dauthors.constEnd();
for (QList<Person>::ConstIterator it = dauthors.constBegin(); it != endauthors; \
++it) info += (*it).debugInfo();
- info += "### Contributors: ###################\n";
+ info += QLatin1String("### Contributors: ###################\n");
QList<Person> dcontri = contributors();
QList<Person>::ConstIterator endcontri = dcontri.constEnd();
for (QList<Person>::ConstIterator it = dcontri.constBegin(); it != endcontri; \
++it) info += (*it).debugInfo();
- info += "### Source end ################\n";
+ info += QLatin1String("### Source end ################\n");
return info;
}
diff --git a/syndication/category.cpp b/syndication/category.cpp
index 8d009a9..7a63b58 100644
--- a/syndication/category.cpp
+++ b/syndication/category.cpp
@@ -33,30 +33,30 @@ Category::~Category()
QString Category::debugInfo() const
{
QString info;
- info += "# Category begin ##################\n";
+ info += QLatin1String("# Category begin ##################\n");
QString dterm = term();
if (!dterm.isNull())
{
- info += "term: #" + dterm + "#\n";
+ info += QLatin1String("term: #") + dterm + QLatin1String("#\n");
}
QString dscheme = scheme();
if (!dscheme.isNull())
{
- info += "scheme: #" + dscheme + "#\n";
+ info += QLatin1String("scheme: #") + dscheme + QLatin1String("#\n");
}
QString dlabel = label();
if (!dlabel.isNull())
{
- info += "label: #" + dlabel + "#\n";
+ info += QLatin1String("label: #") + dlabel + QLatin1String("#\n");
}
- info += "# Category end ####################\n";
+ info += QLatin1String("# Category end ####################\n");
return info;
}
diff --git a/syndication/category.h b/syndication/category.h
index 729fe16..edd418b 100644
--- a/syndication/category.h
+++ b/syndication/category.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_CATEGORY_H
#define SYNDICATION_CATEGORY_H
+#include <QString>
#include <boost/shared_ptr.hpp>
#include "ksyndication_export.h"
diff --git a/syndication/dataretriever.cpp b/syndication/dataretriever.cpp
index 99e90a8..ed2d464 100644
--- a/syndication/dataretriever.cpp
+++ b/syndication/dataretriever.cpp
@@ -59,7 +59,7 @@ FileRetriever::~FileRetriever()
}
bool FileRetriever::m_useCache = true;
-QString FileRetriever::m_userAgent = QString("Syndication \
%1").arg(SYNDICATION_VERSION); +QString FileRetriever::m_userAgent = \
QString::fromLatin1("Syndication %1").arg(QString::fromLatin1(SYNDICATION_VERSION)); \
void FileRetriever::setUserAgent(const QString& userAgent)
{
@@ -81,13 +81,13 @@ void FileRetriever::retrieveData(const KUrl &url)
KUrl u = url;
- if (u.protocol() == "feed")
- u.setProtocol("http");
+ if (u.protocol() == QLatin1String("feed"))
+ u.setProtocol(QLatin1String("http"));
d->job = KIO::get(u, KIO::NoReload, KIO::HideProgressInfo);
- d->job->addMetaData("UserAgent", m_userAgent);
- d->job->addMetaData("cache", m_useCache ? "refresh" : "reload");
+ d->job->addMetaData(QLatin1String("UserAgent"), m_userAgent);
+ d->job->addMetaData(QLatin1String("cache"), m_useCache ? \
QLatin1String("refresh") : QLatin1String("reload"));
QTimer::singleShot(1000*90, this, SLOT(slotTimeout()));
diff --git a/syndication/documentsource.cpp b/syndication/documentsource.cpp
index d136fba..d608164 100644
--- a/syndication/documentsource.cpp
+++ b/syndication/documentsource.cpp
@@ -84,7 +84,7 @@ QDomDocument DocumentSource::asDomDocument() const
source.setData(d->array);
QXmlSimpleReader reader;
- reader.setFeature("http://xml.org/sax/features/namespaces", true);
+ reader.setFeature(QLatin1String("http://xml.org/sax/features/namespaces"), \
true);
if (!d->domDoc.setContent(&source, &reader))
d->domDoc.clear();
diff --git a/syndication/documentsource.h b/syndication/documentsource.h
index 9c253d5..3e1d844 100644
--- a/syndication/documentsource.h
+++ b/syndication/documentsource.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_DOCUMENTSOURCE_H
#define SYNDICATION_DOCUMENTSOURCE_H
+#include <QString>
#include <boost/shared_ptr.hpp>
#include "ksyndication_export.h"
diff --git a/syndication/enclosure.cpp b/syndication/enclosure.cpp
index 24c981c..0e2b058 100644
--- a/syndication/enclosure.cpp
+++ b/syndication/enclosure.cpp
@@ -33,34 +33,34 @@ Enclosure::~Enclosure()
QString Enclosure::debugInfo() const
{
QString info;
- info += "# Enclosure begin #################\n";
+ info += QLatin1String("# Enclosure begin #################\n");
QString durl = url();
if (!durl.isNull())
{
- info += "url: #" + durl + "#\n";
+ info += QLatin1String("url: #") + durl + QLatin1String("#\n");
}
QString dtitle = title();
if (!dtitle.isNull())
{
- info += "title: #" + dtitle + "#\n";
+ info += QLatin1String("title: #") + dtitle + QLatin1String("#\n");
}
QString dtype = type();
if (!dtype.isNull())
{
- info += "type: #" + dtype + "#\n";
+ info += QLatin1String("type: #") + dtype + QLatin1String("#\n");
}
int dlength = length();
if (dlength != 0)
{
- info += "length: #" + QString::number(dlength) + "#\n";
+ info += QLatin1String("length: #") + QString::number(dlength) + \
QLatin1String("#\n"); }
uint dduration = duration();
@@ -70,10 +70,10 @@ QString Enclosure::debugInfo() const
int hours = dduration / 3600;
int minutes = (dduration - hours*3600) / 60;
int seconds = dduration - hours*3600 - minutes*60;
- info += QString("duration: #%1 \
(%2:%3:%4)#\n").arg(dduration).arg(hours).arg(minutes).arg(seconds); + info += \
QString::fromLatin1("duration: #%1 \
(%2:%3:%4)#\n").arg(dduration).arg(hours).arg(minutes).arg(seconds); }
- info += "# Enclosure end ###################\n";
+ info += QLatin1String("# Enclosure end ###################\n");
return info;
}
diff --git a/syndication/enclosure.h b/syndication/enclosure.h
index 0c083ce..2d0c46b 100644
--- a/syndication/enclosure.h
+++ b/syndication/enclosure.h
@@ -27,6 +27,8 @@
#include <boost/shared_ptr.hpp>
+#include <QString>
+
namespace Syndication {
class Enclosure;
diff --git a/syndication/feed.cpp b/syndication/feed.cpp
index 324e62d..97ffd65 100644
--- a/syndication/feed.cpp
+++ b/syndication/feed.cpp
@@ -39,27 +39,27 @@ QString Feed::debugInfo() const
{
QString info;
- info += "# Feed begin ######################\n";
+ info += QLatin1String("# Feed begin ######################\n");
QString dtitle = title();
if (!dtitle.isNull())
- info += "title: #" + dtitle + "#\n";
+ info += QLatin1String("title: #") + dtitle + QLatin1String("#\n");
QString dlink = link();
if (!dlink.isNull())
- info += "link: #" + dlink + "#\n";
+ info += QLatin1String("link: #") + dlink + QLatin1String("#\n");
QString ddescription = description();
if (!ddescription.isNull())
- info += "description: #" + ddescription + "#\n";
+ info += QLatin1String("description: #") + ddescription + \
QLatin1String("#\n");
QString dcopyright = copyright();
if (!dcopyright.isNull())
- info += "copyright: #" + dcopyright + "#\n";
+ info += QLatin1String("copyright: #") + dcopyright + QLatin1String("#\n");
QString dlanguage = language();
if (!dlanguage.isNull())
- info += "language: #" + dlanguage + "#\n";
+ info += QLatin1String("language: #") + dlanguage + QLatin1String("#\n");
QList<PersonPtr> dauthors = authors();
QList<PersonPtr>::ConstIterator itp = dauthors.constBegin();
@@ -87,7 +87,7 @@ QString Feed::debugInfo() const
for ( ; it != end; ++it)
info += (*it)->debugInfo();
- info += "# Feed end ########################\n";
+ info += QLatin1String("# Feed end ########################\n");
return info;
}
diff --git a/syndication/image.cpp b/syndication/image.cpp
index 26bba7c..117d5bf 100644
--- a/syndication/image.cpp
+++ b/syndication/image.cpp
@@ -33,44 +33,44 @@ Image::~Image()
QString Image::debugInfo() const
{
QString info;
- info += "# Image begin #####################\n";
+ info += QLatin1String("# Image begin #####################\n");
QString durl = url();
if (!durl.isNull())
{
- info += "url: #" + durl + "#\n";
+ info += QLatin1String("url: #") + durl + QLatin1String("#\n");
}
QString dtitle = title();
if (!dtitle.isNull())
{
- info += "title: #" + dtitle + "#\n";
+ info += QLatin1String("title: #") + dtitle + QLatin1String("#\n");
}
QString dlink = link();
if (!dlink.isNull())
{
- info += "link: #" + dlink + "#\n";
+ info += QLatin1String("link: #") + dlink + QLatin1String("#\n");
}
QString ddescription = description();
if (!ddescription.isNull())
{
- info += "description: #" + ddescription + "#\n";
+ info += QLatin1String("description: #") + ddescription + \
QLatin1String("#\n"); }
int dheight = height();
if (dheight > 0)
- info += "height: #" + QString::number(height()) + "#\n";
+ info += QLatin1String("height: #") + QString::number(height()) + \
QLatin1String("#\n");
int dwidth = width();
if (dwidth > 0)
- info += "width: #" + QString::number(width()) + "#\n";
- info += "# Image end #######################\n";
+ info += QLatin1String("width: #") + QString::number(width()) + \
QLatin1String("#\n"); + info += QLatin1String("# Image end \
#######################\n");
return info;
}
diff --git a/syndication/image.h b/syndication/image.h
index 49d7b56..7a6fbd8 100644
--- a/syndication/image.h
+++ b/syndication/image.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_IMAGE_H
#define SYNDICATION_IMAGE_H
+#include <QString>
#include <boost/shared_ptr.hpp>
#include "ksyndication_export.h"
diff --git a/syndication/item.cpp b/syndication/item.cpp
index d0c2af2..5b4d5e2 100644
--- a/syndication/item.cpp
+++ b/syndication/item.cpp
@@ -39,39 +39,39 @@ QString Item::debugInfo() const
{
QString info;
- info += "# Item begin ######################\n";
+ info += QLatin1String("# Item begin ######################\n");
QString did = id();
if (!did.isNull())
- info += "id: #" + did + "#\n";
+ info += QLatin1String("id: #") + did + QLatin1String("#\n");
QString dtitle = title();
if (!dtitle.isNull())
- info += "title: #" + dtitle + "#\n";
+ info += QLatin1String("title: #") + dtitle + QLatin1String("#\n");
QString dlink = link();
if (!dlink.isNull())
- info += "link: #" + dlink + "#\n";
+ info += QLatin1String("link: #") + dlink + QLatin1String("#\n");
QString ddescription = description();
if (!ddescription.isNull())
- info += "description: #" + ddescription + "#\n";
+ info += QLatin1String("description: #") + ddescription + \
QLatin1String("#\n");
QString dcontent = content();
if (!dcontent.isNull())
- info += "content: #" + dcontent + "#\n";
+ info += QLatin1String("content: #") + dcontent + QLatin1String("#\n");
QString pubdate = dateTimeToString(datePublished());
if (!pubdate.isNull())
- info += "datePublished: #" + pubdate + "#\n";
+ info += QLatin1String("datePublished: #") + pubdate + QLatin1String("#\n");
QString update = dateTimeToString(dateUpdated());
if (!update.isNull())
- info += "dateUpdated: #" + update + "#\n";
+ info += QLatin1String("dateUpdated: #") + update + QLatin1String("#\n");
QString dlanguage = language();
if (!dlanguage.isNull())
- info += "language: #" + dlanguage + "#\n";
+ info += QLatin1String("language: #") + dlanguage + QLatin1String("#\n");
QList<PersonPtr> dauthors = authors();
QList<PersonPtr>::ConstIterator itp = dauthors.constBegin();
@@ -97,22 +97,22 @@ QString Item::debugInfo() const
int dcommentsCount = commentsCount();
if (dcommentsCount != -1)
{
- info+= "commentsCount: #" + QString::number(dcommentsCount) + "#\n";
+ info+= QLatin1String("commentsCount: #") + QString::number(dcommentsCount) + \
QLatin1String("#\n"); }
QString dcommentsLink = commentsLink();
if (!dcommentsLink.isNull())
- info+= "commentsLink: #" + dcommentsLink + "#\n";
+ info+= QLatin1String("commentsLink: #") + dcommentsLink + \
QLatin1String("#\n");
QString dcommentsFeed = commentsFeed();
if (!dcommentsFeed.isNull())
- info+= "commentsFeed: #" + dcommentsFeed + "#\n";
+ info+= QLatin1String("commentsFeed: #") + dcommentsFeed + \
QLatin1String("#\n");
QString dcommentPostUri = commentPostUri();
if (!dcommentPostUri.isNull())
- info+= "commentPostUri: #" + dcommentPostUri + "#\n";
+ info+= QLatin1String("commentPostUri: #") + dcommentPostUri + \
QLatin1String("#\n");
- info += "# Item end ########################\n";
+ info += QLatin1String("# Item end ########################\n");
return info;
}
diff --git a/syndication/item.h b/syndication/item.h
index 7e93159..2d20c1e 100644
--- a/syndication/item.h
+++ b/syndication/item.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_ITEM_H
#define SYNDICATION_ITEM_H
+#include <QString>
#include <boost/shared_ptr.hpp>
#include "ksyndication_export.h"
diff --git a/syndication/loader.cpp b/syndication/loader.cpp
index f77f02f..c90998d 100644
--- a/syndication/loader.cpp
+++ b/syndication/loader.cpp
@@ -161,7 +161,7 @@ void Loader::slotRetrieverDone(const QByteArray& data, bool \
success)
void Loader::discoverFeeds(const QByteArray &data)
{
- QString str = QString(data).simplified();
+ QString str = QString::fromLatin1(data.constData()).simplified();
QString s2;
//QTextStream ts( &str, QIODevice::WriteOnly );
//ts << data.data();
@@ -169,7 +169,7 @@ void Loader::discoverFeeds(const QByteArray &data)
// "<[\\s]link[^>]*rel[\\s]=[\\s]\\\"[\\s]alternate[\\s]\\\"[^>]*>"
// "type[\\s]=[\\s]\\\"application/rss+xml\\\""
// "href[\\s]=[\\s]\\\"application/rss+xml\\\""
- QRegExp rx( "(?:REL)[^=]*=[^sAa]*(?:service.feed|ALTERNATE)[\\s]*[^s][^s](?:[^>]*)(?:HREF)[^=]*=[^A-Z0-9-_~,./$]*([^'\">\\s]*)", \
Qt::CaseInsensitive ); + QRegExp rx( \
QLatin1String("(?:REL)[^=]*=[^sAa]*(?:service.feed|ALTERNATE)[\\s]*[^s][^s](?:[^>]*)(?:HREF)[^=]*=[^A-Z0-9-_~,./$]*([^'\">\\s]*)"), \
Qt::CaseInsensitive ); if (rx.indexIn(str)!=-1)
s2=rx.cap(1);
else{
@@ -177,7 +177,7 @@ void Loader::discoverFeeds(const QByteArray &data)
int pos=0;
QStringList feeds;
QString host=d->url.host();
- rx.setPattern("(?:<A )[^H]*(?:HREF)[^=]*=[^A-Z0-9-_~,./]*([^'\">\\s]*)");
+ rx.setPattern(QLatin1String("(?:<A \
)[^H]*(?:HREF)[^=]*=[^A-Z0-9-_~,./]*([^'\">\\s]*)")); while ( pos >= 0 ) {
pos = rx.indexIn( str, pos );
s2=rx.cap(1);
@@ -212,10 +212,10 @@ void Loader::discoverFeeds(const QByteArray &data)
{
if (s2.startsWith(QLatin1String("//")))
{
- s2=s2.prepend(d->url.protocol()+':');
+ s2=s2.prepend(d->url.protocol()+QLatin1Char(':'));
d->discoveredFeedURL=s2;
}
- else if (s2.startsWith('/'))
+ else if (s2.startsWith(QLatin1Char('/')))
{
d->discoveredFeedURL=d->url;
d->discoveredFeedURL.setPath(s2);
diff --git a/syndication/mapper/imagerdfimpl.h b/syndication/mapper/imagerdfimpl.h
index 0a94252..636799f 100644
--- a/syndication/mapper/imagerdfimpl.h
+++ b/syndication/mapper/imagerdfimpl.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_MAPPER_IMAGERDFIMPL_H
#define SYNDICATION_MAPPER_IMAGERDFIMPL_H
+#include <QString>
#include <image.h>
#include <rdf/image.h>
diff --git a/syndication/mapper/itematomimpl.cpp \
b/syndication/mapper/itematomimpl.cpp index b685a30..efd2bea 100644
--- a/syndication/mapper/itematomimpl.cpp
+++ b/syndication/mapper/itematomimpl.cpp
@@ -143,7 +143,7 @@ QString ItemAtomImpl::id() const
if (!id.isEmpty())
return id;
- return QString("hash:%1").arg(Syndication::calcMD5Sum(title() + description() + \
link() + content())); + return \
QString::fromLatin1("hash:%1").arg(Syndication::calcMD5Sum(title() + description() + \
link() + content())); }
diff --git a/syndication/mapper/itemrdfimpl.cpp b/syndication/mapper/itemrdfimpl.cpp
index 793c2cb..7f897e5 100644
--- a/syndication/mapper/itemrdfimpl.cpp
+++ b/syndication/mapper/itemrdfimpl.cpp
@@ -99,7 +99,7 @@ QString ItemRDFImpl::id() const
if (!m_item.resource()->isAnon())
return m_item.resource()->uri();
else
- return "hash:" + calcMD5Sum(title() + description() + link() + content());
+ return QLatin1String("hash:") + calcMD5Sum(title() + description() + link() \
+ content()); }
time_t ItemRDFImpl::datePublished() const
diff --git a/syndication/mapper/itemrss2impl.cpp \
b/syndication/mapper/itemrss2impl.cpp index e2e760c..3a0414b 100644
--- a/syndication/mapper/itemrss2impl.cpp
+++ b/syndication/mapper/itemrss2impl.cpp
@@ -94,7 +94,7 @@ QString ItemRSS2Impl::id() const
if (!guid.isEmpty())
return guid;
- return QString("hash:%1").arg(calcMD5Sum(title()
+ return QString::fromLatin1("hash:%1").arg(calcMD5Sum(title()
+ description() + link() + content()));
}
diff --git a/syndication/person.cpp b/syndication/person.cpp
index d8cfade..c260146 100644
--- a/syndication/person.cpp
+++ b/syndication/person.cpp
@@ -33,30 +33,30 @@ Person::~Person()
QString Person::debugInfo() const
{
QString info;
- info += "# Person begin ####################\n";
+ info += QLatin1String("# Person begin ####################\n");
QString dname = name();
if (!dname.isNull())
{
- info += "name: #" + dname + "#\n";
+ info += QLatin1String("name: #") + dname + QLatin1String("#\n");
}
QString duri = uri();
if (!duri.isNull())
{
- info += "uri: #" + duri + "#\n";
+ info += QLatin1String("uri: #") + duri + QLatin1String("#\n");
}
QString demail = email();
if (!demail.isNull())
{
- info += "email: #" + demail + "#\n";
+ info += QLatin1String("email: #") + demail + QLatin1String("#\n");
}
- info += "# Person end ######################\n";
+ info += QLatin1String("# Person end ######################\n");
return info;
}
diff --git a/syndication/person.h b/syndication/person.h
index 6da2adb..20c612a 100644
--- a/syndication/person.h
+++ b/syndication/person.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_PERSON_H
#define SYNDICATION_PERSON_H
+#include <QString>
#include <boost/shared_ptr.hpp>
#include "ksyndication_export.h"
diff --git a/syndication/rdf/document.cpp b/syndication/rdf/document.cpp
index 2d3295e..e336955 100644
--- a/syndication/rdf/document.cpp
+++ b/syndication/rdf/document.cpp
@@ -255,10 +255,10 @@ void Document::getItemDescriptionFormatInfo(bool* \
containsMarkup) const QString Document::debugInfo() const
{
QString info;
- info += "### Document: ###################\n";
- info += "title: #" + title() + "#\n";
- info += "link: #" + link() + "#\n";
- info += "description: #" + description() + "#\n";
+ info += QLatin1String("### Document: ###################\n");
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
+ info += QLatin1String("description: #") + description() + QLatin1String("#\n");
info += dc().debugInfo();
info += syn().debugInfo();
Image img = image();
@@ -275,7 +275,7 @@ QString Document::debugInfo() const
info += (*it).debugInfo();
- info += "### Document end ################\n";
+ info += QLatin1String("### Document end ################\n");
return info;
}
diff --git a/syndication/rdf/dublincore.cpp b/syndication/rdf/dublincore.cpp
index f11c411..97bea0c 100644
--- a/syndication/rdf/dublincore.cpp
+++ b/syndication/rdf/dublincore.cpp
@@ -170,39 +170,39 @@ QString DublinCore::debugInfo() const
{
QString info;
if (!contributor().isNull())
- info += QString("dc:contributor: #%1#\n").arg(contributor());
+ info += QString::fromLatin1("dc:contributor: #%1#\n").arg(contributor());
if (!coverage().isNull())
- info += QString("dc:coverage: #%1#\n").arg(coverage());
+ info += QString::fromLatin1("dc:coverage: #%1#\n").arg(coverage());
if (!creator().isNull())
- info += QString("dc:creator: #%1#\n").arg(creator());
+ info += QString::fromLatin1("dc:creator: #%1#\n").arg(creator());
QString ddate = dateTimeToString(date());
if (!ddate.isNull())
- info += QString("dc:date: #%1#\n").arg(ddate);
+ info += QString::fromLatin1("dc:date: #%1#\n").arg(ddate);
if (!description().isNull())
- info += QString("dc:description: #%1#\n").arg(description());
+ info += QString::fromLatin1("dc:description: #%1#\n").arg(description());
if (!format().isNull())
- info += QString("dc:format: #%1#\n").arg(format());
+ info += QString::fromLatin1("dc:format: #%1#\n").arg(format());
if (!identifier().isNull())
- info += QString("dc:identifier: #%1#\n").arg(identifier());
+ info += QString::fromLatin1("dc:identifier: #%1#\n").arg(identifier());
if (!language().isNull())
- info += QString("dc:language: #%1#\n").arg(language());
+ info += QString::fromLatin1("dc:language: #%1#\n").arg(language());
if (!publisher().isNull())
- info += QString("dc:publisher: #%1#\n").arg(publisher());
+ info += QString::fromLatin1("dc:publisher: #%1#\n").arg(publisher());
if (!relation().isNull())
- info += QString("dc:relation: #%1#\n").arg(relation());
+ info += QString::fromLatin1("dc:relation: #%1#\n").arg(relation());
if (!rights().isNull())
- info += QString("dc:rights: #%1#\n").arg(rights());
+ info += QString::fromLatin1("dc:rights: #%1#\n").arg(rights());
if (!source().isNull())
- info += QString("dc:source: #%1#\n").arg(source());
+ info += QString::fromLatin1("dc:source: #%1#\n").arg(source());
if (!subject().isNull())
- info += QString("dc:subject: #%1#\n").arg(subject());
+ info += QString::fromLatin1("dc:subject: #%1#\n").arg(subject());
if (!title().isNull())
- info += QString("dc:title: #%1#\n").arg(title());
+ info += QString::fromLatin1("dc:title: #%1#\n").arg(title());
if (!type().isNull())
- info += QString("dc:type: #%1#\n").arg(type());
+ info += QString::fromLatin1("dc:type: #%1#\n").arg(type());
return info;
}
diff --git a/syndication/rdf/image.cpp b/syndication/rdf/image.cpp
index c6a602c..9a922a9 100644
--- a/syndication/rdf/image.cpp
+++ b/syndication/rdf/image.cpp
@@ -59,11 +59,11 @@ QString Image::url() const
QString Image::debugInfo() const
{
QString info;
- info += "### Image: ###################\n";
- info += "url: #" + url() + "#\n";
- info += "title: #" + title() + "#\n";
- info += "link: #" + link() + "#\n";
- info += "### Image end ################\n";
+ info += QLatin1String("### Image: ###################\n");
+ info += QLatin1String("url: #") + url() + QLatin1String("#\n");
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
+ info += QLatin1String("### Image end ################\n");
return info;
}
diff --git a/syndication/rdf/image.h b/syndication/rdf/image.h
index 5d67e1f..d11f13f 100644
--- a/syndication/rdf/image.h
+++ b/syndication/rdf/image.h
@@ -24,6 +24,7 @@
#ifndef SYNDICATION_RDF_IMAGE_H
#define SYNDICATION_RDF_IMAGE_H
+#include <QString>
#include <syndication/rdf/resourcewrapper.h>
namespace Syndication {
diff --git a/syndication/rdf/item.cpp b/syndication/rdf/item.cpp
index 60b3d80..3500098 100644
--- a/syndication/rdf/item.cpp
+++ b/syndication/rdf/item.cpp
@@ -127,13 +127,13 @@ QString Item::originalDescription() const
QString Item::debugInfo() const
{
QString info;
- info += "### Item: ###################\n";
- info += "title: #" + title() + "#\n";
- info += "link: #" + link() + "#\n";
- info += "description: #" + description() + "#\n";
- info += "content:encoded: #" + encodedContent() + "#\n";
+ info += QLatin1String("### Item: ###################\n");
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
+ info += QLatin1String("description: #") + description() + QLatin1String("#\n");
+ info += QLatin1String("content:encoded: #") + encodedContent() + \
QLatin1String("#\n"); info += dc().debugInfo();
- info += "### Item end ################\n";
+ info += QLatin1String("### Item end ################\n");
return info;
}
diff --git a/syndication/rdf/literal.h b/syndication/rdf/literal.h
index 6e930f4..a6393c2 100644
--- a/syndication/rdf/literal.h
+++ b/syndication/rdf/literal.h
@@ -23,6 +23,7 @@
#ifndef SYNDICATION_RDF_LITERAL_H
#define SYNDICATION_RDF_LITERAL_H
+#include <QString>
#include <syndication/rdf/node.h>
#include <boost/shared_ptr.hpp>
diff --git a/syndication/rdf/model.cpp b/syndication/rdf/model.cpp
index 8bab4a0..30483f6 100644
--- a/syndication/rdf/model.cpp
+++ b/syndication/rdf/model.cpp
@@ -136,7 +136,7 @@ void Model::removeStatement(StatementPtr statement)
void Model::removeStatement(ResourcePtr subject, PropertyPtr predicate, NodePtr \
object) {
- QString key = QString("%1-%2-%3")
+ QString key = QString::fromLatin1("%1-%2-%3")
.arg(QString::number(subject->id()))
.arg(QString::number(predicate->id()))
.arg(QString::number(object->id()));
@@ -175,7 +175,7 @@ StatementPtr Model::addStatement(ResourcePtr subject, PropertyPtr \
predicate, Nod
// TODO: avoid duplicated stmts with literal objects!
- QString key = QString("%1-%2-%3")
+ QString key = QString::fromLatin1("%1-%2-%3")
.arg(QString::number(subjInternal->id()))
.arg(QString::number(predInternal->id()))
.arg(QString::number(objInternal->id()));
@@ -281,15 +281,15 @@ QString Model::debugInfo() const
for ( ; it != end; ++it)
{
- info += QString("<%1> <%2> \
").arg((*it)->subject()->uri()).arg((*it)->predicate()->uri()); + info += \
QString::fromLatin1("<%1> <%2> \
").arg((*it)->subject()->uri()).arg((*it)->predicate()->uri());
if ((*it)->object()->isLiteral())
{
- info += QString("\"%1\"\n").arg((*it)->asString());
+ info += QString::fromLatin1("\"%1\"\n").arg((*it)->asString());
}
else
{
- info += QString("<%1>\n").arg((*it)->asResource()->uri());
+ info += QString::fromLatin1("<%1>\n").arg((*it)->asResource()->uri());
}
}
diff --git a/syndication/rdf/node.h b/syndication/rdf/node.h
index f2e55bb..d5ef1f8 100644
--- a/syndication/rdf/node.h
+++ b/syndication/rdf/node.h
@@ -22,6 +22,7 @@
#ifndef SYNDICATION_RDF_NODE_H
#define SYNDICATION_RDF_NODE_H
+#include <QString>
#include <syndication/ksyndication_export.h>
#include <boost/shared_ptr.hpp>
diff --git a/syndication/rdf/syndicationinfo.cpp \
b/syndication/rdf/syndicationinfo.cpp index 0b51ebf..79def84 100644
--- a/syndication/rdf/syndicationinfo.cpp
+++ b/syndication/rdf/syndicationinfo.cpp
@@ -72,12 +72,12 @@ QString SyndicationInfo::debugInfo() const
{
QString info;
if (updatePeriod() != Daily)
- info += QString("syn:updatePeriod: \
#%1#\n").arg(periodToString(updatePeriod()));
- info += QString("syn:updateFrequency: \
#%1#\n").arg(QString::number(updateFrequency())); + info += \
QString::fromLatin1("syn:updatePeriod: #%1#\n").arg(periodToString(updatePeriod())); \
+ info += QString::fromLatin1("syn:updateFrequency: \
#%1#\n").arg(QString::number(updateFrequency()));
QString dbase = dateTimeToString(updateBase());
if (!dbase.isNull())
- info += QString("syn:updateBase: #%1#\n").arg(dbase);
+ info += QString::fromLatin1("syn:updateBase: #%1#\n").arg(dbase);
return info;
}
diff --git a/syndication/rdf/textinput.cpp b/syndication/rdf/textinput.cpp
index b7138c7..b284f54 100644
--- a/syndication/rdf/textinput.cpp
+++ b/syndication/rdf/textinput.cpp
@@ -66,12 +66,12 @@ QString TextInput::name() const
QString TextInput::debugInfo() const
{
QString info;
- info += "### TextInput: ###################\n";
- info += "title: #" + title() + "#\n";
- info += "link: #" + link() + "#\n";
- info += "description: #" + description() + "#\n";
- info += "name: #" + name() + "#\n";
- info += "### TextInput end ################\n";
+ info += QLatin1String("### TextInput: ###################\n");
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
+ info += QLatin1String("description: #") + description() + QLatin1String("#\n");
+ info += QLatin1String("name: #") + name() + QLatin1String("#\n");
+ info += QLatin1String("### TextInput end ################\n");
return info;
}
diff --git a/syndication/rdf/textinput.h b/syndication/rdf/textinput.h
index 93d5211..ce4c10f 100644
--- a/syndication/rdf/textinput.h
+++ b/syndication/rdf/textinput.h
@@ -22,6 +22,7 @@
#ifndef SYNDICATION_RDF_TEXTINPUT_H
#define SYNDICATION_RDF_TEXTINPUT_H
+#include <QString>
#include <syndication/rdf/resourcewrapper.h>
namespace Syndication {
diff --git a/syndication/rss2/category.cpp b/syndication/rss2/category.cpp
index 2e19565..534559c 100644
--- a/syndication/rss2/category.cpp
+++ b/syndication/rss2/category.cpp
@@ -48,12 +48,12 @@ QString Category::domain() const
QString Category::debugInfo() const
{
QString info;
- info += "### Category: ###################\n";
+ info += QLatin1String("### Category: ###################\n");
if (!category().isNull())
- info += "category: #" + category() + "#\n";
+ info += QLatin1String("category: #") + category() + QLatin1String("#\n");
if (!domain().isNull())
- info += "domain: #" + domain() + "#\n";
- info += "### Category end ################\n";
+ info += QLatin1String("domain: #") + domain() + QLatin1String("#\n");
+ info += QLatin1String("### Category end ################\n");
return info;
}
diff --git a/syndication/rss2/cloud.cpp b/syndication/rss2/cloud.cpp
index c871ac8..423c551 100644
--- a/syndication/rss2/cloud.cpp
+++ b/syndication/rss2/cloud.cpp
@@ -72,18 +72,18 @@ QString Cloud::protocol() const
QString Cloud::debugInfo() const
{
QString info;
- info += "### Cloud: ###################\n";
+ info += QLatin1String("### Cloud: ###################\n");
if (!domain().isNull())
- info += "domain: #" + domain() + "#\n";
+ info += QLatin1String("domain: #") + domain() + QLatin1String("#\n");
if (port() != -1)
- info += "port: #" + QString::number(port()) + "#\n";
+ info += QLatin1String("port: #") + QString::number(port()) + \
QLatin1String("#\n"); if (!path().isNull())
- info += "path: #" + path() + "#\n";
+ info += QLatin1String("path: #") + path() + QLatin1String("#\n");
if (!registerProcedure().isNull())
- info += "registerProcedure: #" + registerProcedure() + "#\n";
+ info += QLatin1String("registerProcedure: #") + registerProcedure() + \
QLatin1String("#\n"); if (!protocol().isNull())
- info += "protocol: #" + protocol() + "#\n";
- info += "### Cloud end ################\n";
+ info += QLatin1String("protocol: #") + protocol() + QLatin1String("#\n");
+ info += QLatin1String("### Cloud end ################\n");
return info;
}
diff --git a/syndication/rss2/document.cpp b/syndication/rss2/document.cpp
index 3a29f4d..f9f91bc 100644
--- a/syndication/rss2/document.cpp
+++ b/syndication/rss2/document.cpp
@@ -344,29 +344,29 @@ QList<QDomElement> Document::unhandledElements() const
QString Document::debugInfo() const
{
QString info;
- info += "### Document: ###################\n";
+ info += QLatin1String("### Document: ###################\n");
if (!title().isNull())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!description().isNull())
- info += "description: #" + description() + "#\n";
+ info += QLatin1String("description: #") + description() + \
QLatin1String("#\n"); if (!link().isNull())
- info += "link: #" + link() + "#\n";
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
if (!language().isNull())
- info += "language: #" + language() + "#\n";
+ info += QLatin1String("language: #") + language() + QLatin1String("#\n");
if (!copyright().isNull())
- info += "copyright: #" + copyright() + "#\n";
+ info += QLatin1String("copyright: #") + copyright() + QLatin1String("#\n");
if (!managingEditor().isNull())
- info += "managingEditor: #" + managingEditor() + "#\n";
+ info += QLatin1String("managingEditor: #") + managingEditor() + \
QLatin1String("#\n"); if (!webMaster().isNull())
- info += "webMaster: #" + webMaster() + "#\n";
+ info += QLatin1String("webMaster: #") + webMaster() + QLatin1String("#\n");
QString dpubdate = dateTimeToString(pubDate());
if (!dpubdate.isNull())
- info += "pubDate: #" + dpubdate + "#\n";
+ info += QLatin1String("pubDate: #") + dpubdate + QLatin1String("#\n");
QString dlastbuilddate = dateTimeToString(lastBuildDate());
if (!dlastbuilddate.isNull())
- info += "lastBuildDate: #" + dlastbuilddate + "#\n";
+ info += QLatin1String("lastBuildDate: #") + dlastbuilddate + \
QLatin1String("#\n");
if (!textInput().isNull())
info += textInput().debugInfo();
@@ -382,7 +382,7 @@ QString Document::debugInfo() const
QList<Item> litems = items();
for (QList<Item>::ConstIterator it = litems.constBegin(); it != \
litems.constEnd(); ++it) info += (*it).debugInfo();
- info += "### Document end ################\n";
+ info += QLatin1String("### Document end ################\n");
return info;
}
diff --git a/syndication/rss2/enclosure.cpp b/syndication/rss2/enclosure.cpp
index 7f6faf1..936e622 100644
--- a/syndication/rss2/enclosure.cpp
+++ b/syndication/rss2/enclosure.cpp
@@ -62,14 +62,14 @@ QString Enclosure::type() const
QString Enclosure::debugInfo() const
{
QString info;
- info += "### Enclosure: ###################\n";
+ info += QLatin1String("### Enclosure: ###################\n");
if (!url().isNull())
- info += "url: #" + url() + "#\n";
+ info += QLatin1String("url: #") + url() + QLatin1String("#\n");
if (!type().isNull())
- info += "type: #" + type() + "#\n";
+ info += QLatin1String("type: #") + type() + QLatin1String("#\n");
if (length() != -1)
- info += "length: #" + QString::number(length()) + "#\n";
- info += "### Enclosure end ################\n";
+ info += QLatin1String("length: #") + QString::number(length()) + \
QLatin1String("#\n"); + info += QLatin1String("### Enclosure end \
################\n"); return info;
}
diff --git a/syndication/rss2/image.cpp b/syndication/rss2/image.cpp
index aa3b3e8..83a6e8b 100644
--- a/syndication/rss2/image.cpp
+++ b/syndication/rss2/image.cpp
@@ -82,18 +82,18 @@ QString Image::description() const
QString Image::debugInfo() const
{
QString info;
- info += "### Image: ###################\n";
+ info += QLatin1String("### Image: ###################\n");
if (!title().isNull())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!link().isNull())
- info += "link: #" + link() + "#\n";
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
if (!description().isNull())
- info += "description: #" + description() + "#\n";
+ info += QLatin1String("description: #") + description() + \
QLatin1String("#\n"); if (!url().isNull())
- info += "url: #" + url() + "#\n";
- info += "width: #" + QString::number(width()) + "#\n";
- info += "height: #" + QString::number(height()) + "#\n";
- info += "### Image end ################\n";
+ info += QLatin1String("url: #") + url() + QLatin1String("#\n");
+ info += QLatin1String("width: #") + QString::number(width()) + \
QLatin1String("#\n"); + info += QLatin1String("height: #") + \
QString::number(height()) + QLatin1String("#\n"); + info += QLatin1String("### \
Image end ################\n"); return info;
}
diff --git a/syndication/rss2/item.cpp b/syndication/rss2/item.cpp
index dbb6e4e..f288767 100644
--- a/syndication/rss2/item.cpp
+++ b/syndication/rss2/item.cpp
@@ -224,26 +224,26 @@ QString Item::rating() const
QString Item::debugInfo() const
{
QString info;
- info += "### Item: ###################\n";
+ info += QLatin1String("### Item: ###################\n");
if (!title().isNull())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!link().isNull())
- info += "link: #" + link() + "#\n";
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
if (!description().isNull())
- info += "description: #" + description() + "#\n";
+ info += QLatin1String("description: #") + description() + \
QLatin1String("#\n"); if (!content().isNull())
- info += "content: #" + content() + "#\n";
+ info += QLatin1String("content: #") + content() + QLatin1String("#\n");
if (!author().isNull())
- info += "author: #" + author() + "#\n";
+ info += QLatin1String("author: #") + author() + QLatin1String("#\n");
if (!comments().isNull())
- info += "comments: #" + comments() + "#\n";
+ info += QLatin1String("comments: #") + comments() + QLatin1String("#\n");
QString dpubdate = dateTimeToString(pubDate());
if (!dpubdate.isNull())
- info += "pubDate: #" + dpubdate + "#\n";
+ info += QLatin1String("pubDate: #") + dpubdate + QLatin1String("#\n");
if (!guid().isNull())
- info += "guid: #" + guid() + "#\n";
+ info += QLatin1String("guid: #") + guid() + QLatin1String("#\n");
if (guidIsPermaLink())
- info += "guid is PL: #true#\n";
+ info += QLatin1String("guid is PL: #true#\n");
if (!source().isNull())
info += source().debugInfo();
@@ -254,7 +254,7 @@ QString Item::debugInfo() const
for (QList<Enclosure>::ConstIterator it = encs.constBegin(); it != \
encs.constEnd(); ++it) info += (*it).debugInfo();
- info += "### Item end ################\n";
+ info += QLatin1String("### Item end ################\n");
return info;
}
diff --git a/syndication/rss2/source.cpp b/syndication/rss2/source.cpp
index 5962ebb..a7f3a2d 100644
--- a/syndication/rss2/source.cpp
+++ b/syndication/rss2/source.cpp
@@ -49,12 +49,12 @@ QString Source::url() const
QString Source::debugInfo() const
{
QString info;
- info += "### Source: ###################\n";
+ info += QLatin1String("### Source: ###################\n");
if (!source().isNull())
- info += "source: #" + source() + "#\n";
+ info += QLatin1String("source: #") + source() + QLatin1String("#\n");
if (!url().isNull())
- info += "url: #" + url() + "#\n";
- info += "### Source end ################\n";
+ info += QLatin1String("url: #") + url() + QLatin1String("#\n");
+ info += QLatin1String("### Source end ################\n");
return info;
}
diff --git a/syndication/rss2/textinput.cpp b/syndication/rss2/textinput.cpp
index ec4ce77..67d378c 100644
--- a/syndication/rss2/textinput.cpp
+++ b/syndication/rss2/textinput.cpp
@@ -61,16 +61,16 @@ QString TextInput::link() const
QString TextInput::debugInfo() const
{
QString info;
- info += "### TextInput: ###################\n";
+ info += QLatin1String("### TextInput: ###################\n");
if (!title().isNull())
- info += "title: #" + title() + "#\n";
+ info += QLatin1String("title: #") + title() + QLatin1String("#\n");
if (!link().isNull())
- info += "link: #" + link() + "#\n";
+ info += QLatin1String("link: #") + link() + QLatin1String("#\n");
if (!description().isNull())
- info += "description: #" + description() + "#\n";
+ info += QLatin1String("description: #") + description() + \
QLatin1String("#\n"); if (!name().isNull())
- info += "name: #" + name() + "#\n";
- info += "### TextInput end ################\n";
+ info += QLatin1String("name: #") + name() + QLatin1String("#\n");
+ info += QLatin1String("### TextInput end ################\n");
return info;
}
diff --git a/syndication/tests/testlibsyndication.cpp \
b/syndication/tests/testlibsyndication.cpp index cd69ec0..72630db 100644
--- a/syndication/tests/testlibsyndication.cpp
+++ b/syndication/tests/testlibsyndication.cpp
@@ -61,7 +61,7 @@ void printUsage(const QString& error)
int main(int argc, char **argv)
{
- KComponentData componentData( "testlibsyndication" );
+ KComponentData componentData("testlibsyndication");
int pcompare = 2;
if (argc < 2)
{
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
if (ptr == 0L)
{
- printUsage( QString( "Couldn't parse file: (%1)" ).arg( \
Syndication::parserCollection()->lastError() ) ); + printUsage( \
QString("Couldn't parse file: (%1)").arg( \
Syndication::parserCollection()->lastError() ) ); return 1;
}
diff --git a/syndication/tools.cpp b/syndication/tools.cpp
index 4819563..1c630ea 100644
--- a/syndication/tools.cpp
+++ b/syndication/tools.cpp
@@ -104,7 +104,7 @@ QString calcMD5Sum(const QString& str)
{
md5Machine.reset();
md5Machine.update(str.toUtf8());
- return QString(md5Machine.hexDigest().data());
+ return QLatin1String(md5Machine.hexDigest().constData());
}
QString resolveEntities(const QString& str)
@@ -115,29 +115,29 @@ QString resolveEntities(const QString& str)
QString escapeSpecialCharacters(const QString& strp)
{
QString str(strp);
- str.replace('&', "&");
- str.replace('\"', """);
- str.replace('<', "<");
- str.replace('>', ">");
- str.replace('\'', "'");
+ str.replace(QLatin1Char('&'), QLatin1String("&"));
+ str.replace(QLatin1Char('\"'), QLatin1String("""));
+ str.replace(QLatin1Char('<'), QLatin1String("<"));
+ str.replace(QLatin1Char('>'), QLatin1String(">"));
+ str.replace(QLatin1Char('\''), QLatin1String("'"));
return str.trimmed();
}
QString convertNewlines(const QString& strp)
{
QString str(strp);
- str.replace('\n', "<br/>");
+ str.replace(QLatin1Char('\n'), QLatin1String("<br/>"));
return str;
}
QString plainTextToHtml(const QString& plainText)
{
QString str(plainText);
- str.replace('&', "&");
- str.replace('\"', """);
- str.replace('<', "<");
- //str.replace('>', ">");
- str.replace('\n', "<br/>");
+ str.replace(QLatin1Char('&'), QLatin1String("&"));
+ str.replace(QLatin1Char('\"'), QLatin1String("""));
+ str.replace(QLatin1Char('<'), QLatin1String("<"));
+ //str.replace(QLatin1Char('>'), QLatin1String(">"));
+ str.replace(QLatin1Char('\n'), QLatin1String("<br/>"));
return str.trimmed();
}
@@ -145,7 +145,7 @@ QString htmlToPlainText(const QString& html)
{
QString str(html);
//TODO: preserve some formatting, such as line breaks
- str.remove(QRegExp("<[^>]*>")); // remove tags
+ str.remove(QRegExp(QLatin1String("<[^>]*>"))); // remove tags
str = resolveEntities(str);
return str.trimmed();
}
@@ -158,16 +158,16 @@ namespace {
bool stringContainsMarkup(const QString& str)
{
//check for entities
- if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
+ if (str.contains(QRegExp(QLatin1String("&[a-zA-Z0-9#]+;"))))
return true;
- const int ltc = str.count('<');
+ const int ltc = str.count(QLatin1Char('<'));
if (ltc == 0)
return false;
if (!tagRegExpSet)
{
- tagRegExp = QRegExp("<\\w+.*/?>");
+ tagRegExp = QRegExp(QLatin1String("<\\w+.*/?>"));
tagRegExpSet = true;
}
return str.contains(tagRegExp);
@@ -176,16 +176,16 @@ bool stringContainsMarkup(const QString& str)
bool isHtml(const QString& str)
{
//check for entities
- if (str.contains(QRegExp("&[a-zA-Z0-9#]+;")))
+ if (str.contains(QRegExp(QLatin1String("&[a-zA-Z0-9#]+;"))))
return true;
- const int ltc = str.count('<');
+ const int ltc = str.count(QLatin1Char('<'));
if (ltc == 0)
return false;
if (!tagRegExpSet)
{
- tagRegExp = QRegExp("<\\w+.*/?>");
+ tagRegExp = QRegExp(QLatin1String("<\\w+.*/?>"));
tagRegExpSet = true;
}
if (str.contains(tagRegExp))
@@ -233,10 +233,10 @@ PersonPtr personFromString(const QString& strp)
QString uri;
QString email;
- // look for something looking like a mail address ( "foo@bar.com",
+ // look for something looking like a mail address ("foo@bar.com",
// "<foo@bar.com>") and extract it
- QRegExp remail("<?([^@\\s<]+@[^>\\s]+)>?"); // FIXME: user "proper" regexp,
+ QRegExp remail(QLatin1String("<?([^@\\s<]+@[^>\\s]+)>?")); // FIXME: user \
"proper" regexp, // search kmail source for it
int pos = remail.indexIn(str);
@@ -248,8 +248,8 @@ PersonPtr personFromString(const QString& strp)
}
// replace "mailto", "(", ")" (to be extended)
- email.remove("mailto:");
- email.remove(QRegExp("[\\(\\)]"));
+ email.remove(QLatin1String("mailto:"));
+ email.remove(QRegExp(QLatin1String("[\\(\\)]")));
// simplify the rest and use it as name
@@ -261,7 +261,7 @@ PersonPtr personFromString(const QString& strp)
// str is of the format "Foo M. Bar (President)",
// we should not cut anything.
- QRegExp rename("^\\(([^\\)]*)\\)");
+ QRegExp rename(QLatin1String("^\\(([^\\)]*)\\)"));
if (rename.exactMatch(name))
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic