[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime] /: Use QStringLiteral
From: Montel Laurent <montel () kde ! org>
Date: 2015-05-03 8:58:12
Message-ID: E1Yopj2-0005cW-Ei () scm ! kde ! org
[Download RAW message or body]
Git commit e932f7e0a96bf291cd0811190332194c52f8d57f by Montel Laurent.
Committed on 03/05/2015 at 08:49.
Pushed by mlaurent into branch 'master'.
Use QStringLiteral
M +4 -4 agents/invitations/invitationsagent.cpp
M +2 -2 agents/maildispatcher/maildispatcheragent.cpp
M +4 -4 kioslave/akonadislave.cpp
M +1 -1 plugins/akonadi_serializer_kalarm.cpp
M +28 -28 resources/dav/common/davprincipalsearchjob.cpp
M +66 -66 resources/dav/protocols/caldavprotocol.cpp
M +21 -21 resources/dav/protocols/carddavprotocol.cpp
M +16 -16 resources/dav/protocols/groupdavprotocol.cpp
M +5 -5 resources/dav/resource/configdialog.cpp
M +4 -4 resources/dav/resource/davfreebusyhandler.cpp
M +11 -11 resources/dav/resource/davgroupwareresource.cpp
M +2 -2 resources/dav/resource/searchdialog.cpp
M +12 -12 resources/dav/resource/settings.cpp
M +51 -51 resources/dav/resource/setupwizard.cpp
M +2 -2 resources/dav/resource/urlconfigurationdialog.cpp
M +2 -2 resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp
M +7 -7 resources/folderarchivesettings/folderarchiveaccountinfo.cpp
M +3 -3 resources/folderarchivesettings/folderarchivesettingpage.cpp
M +2 -2 resources/folderarchivesettings/folderarchiveutil.cpp
M +3 -3 resources/icaldir/icaldirresource.cpp
M +1 -1 resources/imap/autotests/dummyresourcestate.cpp
M +1 -1 resources/imap/changecollectiontask.cpp
M +1 -1 resources/imap/imapresource.cpp
M +4 -4 resources/imap/resourcetask.cpp
M +1 -1 resources/imap/subscriptiondialog.cpp
M +9 -9 resources/openxchange/oxa/objectcreatejob.cpp
M +7 -7 resources/openxchange/oxa/objectdeletejob.cpp
M +9 -9 resources/openxchange/oxa/objectmovejob.cpp
M +4 -4 resources/openxchange/oxa/objectrequestjob.cpp
M +7 -7 resources/openxchange/oxa/objectsrequestjob.cpp
M +4 -4 resources/vcard/vcardresource.cpp
http://commits.kde.org/kdepim-runtime/e932f7e0a96bf291cd0811190332194c52f8d57f
diff --git a/agents/invitations/invitationsagent.cpp \
b/agents/invitations/invitationsagent.cpp index 8bfca9b..4ecb036 100644
--- a/agents/invitations/invitationsagent.cpp
+++ b/agents/invitations/invitationsagent.cpp
@@ -66,11 +66,11 @@ public:
InvitationsCollectionRequestJob(SpecialCollections *collection, InvitationsAgent \
*agent) : SpecialCollectionsRequestJob(collection, agent)
{
- setDefaultResourceType(QLatin1String("akonadi_ical_resource"));
+ setDefaultResourceType(QStringLiteral("akonadi_ical_resource"));
QVariantMap options;
- options.insert(QLatin1String("Path"), \
QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
QLatin1Char('/') + QLatin1String("akonadi_invitations")));
- options.insert(QLatin1String("Name"), i18n("Invitations"));
+ options.insert(QStringLiteral("Path"), \
QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + \
QLatin1Char('/') + QStringLiteral("akonadi_invitations"))); + \
options.insert(QStringLiteral("Name"), i18n("Invitations")); \
setDefaultResourceOptions(options);
QMap<QByteArray, QString> displayNameMap;
@@ -79,7 +79,7 @@ public:
setNameForTypeMap(displayNameMap);
QMap<QByteArray, QString> iconNameMap;
- iconNameMap.insert("invitations", QLatin1String("folder"));
+ iconNameMap.insert("invitations", QStringLiteral("folder"));
setIconForTypeMap(iconNameMap);
}
diff --git a/agents/maildispatcher/maildispatcheragent.cpp \
b/agents/maildispatcher/maildispatcheragent.cpp index 4e27ecb..e406c8a 100644
--- a/agents/maildispatcher/maildispatcheragent.cpp
+++ b/agents/maildispatcher/maildispatcheragent.cpp
@@ -158,8 +158,8 @@ void MailDispatcherAgent::Private::dispatch()
Q_EMIT q->status(AgentBase::Idle, i18n("Finished sending \
messages."));
if (!errorOccurred) {
- KNotification *notify = new \
KNotification(QLatin1String("emailsent"));
- \
notify->setComponentName(QLatin1String("akonadi_maildispatcher_agent")); + \
KNotification *notify = new KNotification(QStringLiteral("emailsent")); + \
notify->setComponentName(QStringLiteral("akonadi_maildispatcher_agent"));
notify->setTitle(i18nc("Notification title when email was sent", \
"E-Mail Successfully Sent"));
notify->setText(i18nc("Notification when the email was sent", \
"Your E-Mail has been sent successfully.")); notify->sendEvent();
diff --git a/kioslave/akonadislave.cpp b/kioslave/akonadislave.cpp
index 481b4c7..b6593a2 100644
--- a/kioslave/akonadislave.cpp
+++ b/kioslave/akonadislave.cpp
@@ -42,15 +42,15 @@ extern "C" {
int kdemain(int argc, char **argv)
{
- KAboutData aboutData(QLatin1String("kio_akonadi"), QString(), \
QLatin1String("0")); + KAboutData aboutData(QStringLiteral("kio_akonadi"), \
QString(), QStringLiteral("0")); QApplication app(argc, argv);
QCommandLineParser parser;
KAboutData::setApplicationData(aboutData);
parser.addVersionOption();
parser.addHelpOption();
- parser.addOption(QCommandLineOption(QStringList() << \
QLatin1String("+protocol"), i18n("Protocol name")));
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("+pool"), \
i18n("Socket name")));
- parser.addOption(QCommandLineOption(QStringList() << QLatin1String("+app"), \
i18n("Socket name"))); + parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("+protocol"), i18n("Protocol name"))); + \
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("+pool"), \
i18n("Socket name"))); + parser.addOption(QCommandLineOption(QStringList() << \
QStringLiteral("+app"), i18n("Socket name")));
aboutData.setupCommandLine(&parser);
parser.process(app);
diff --git a/plugins/akonadi_serializer_kalarm.cpp \
b/plugins/akonadi_serializer_kalarm.cpp index 708abf6..9876ca3 100644
--- a/plugins/akonadi_serializer_kalarm.cpp
+++ b/plugins/akonadi_serializer_kalarm.cpp
@@ -70,7 +70,7 @@ bool SerializerPluginKAlarm::deserialize(Item &item, const \
QByteArray &label, QI // Set additional event data contained in attributes
if (mRegistered.isEmpty()) {
AttributeFactory::registerAttribute<KAlarmCal::EventAttribute>();
- mRegistered = QLatin1String("x"); // set to any non-null string
+ mRegistered = QStringLiteral("x"); // set to any non-null string
}
const EventAttribute dummy;
if (item.hasAttribute(dummy.type())) {
diff --git a/resources/dav/common/davprincipalsearchjob.cpp \
b/resources/dav/common/davprincipalsearchjob.cpp index 3372e8d..2947556 100644
--- a/resources/dav/common/davprincipalsearchjob.cpp
+++ b/resources/dav/common/davprincipalsearchjob.cpp
@@ -35,7 +35,7 @@ void DavPrincipalSearchJob::fetchProperty(const QString &name, \
const QString &ns {
QString propNamespace = ns;
if (propNamespace.isEmpty()) {
- propNamespace = QLatin1String("DAV:");
+ propNamespace = QStringLiteral("DAV:");
}
mFetchProperties << QPair<QString, QString>(propNamespace, name);
@@ -60,17 +60,17 @@ void DavPrincipalSearchJob::start()
*/
QDomDocument query;
- QDomElement propfind = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfind = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
query.appendChild(propfind);
- QDomElement prop = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement prop = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfind.appendChild(prop);
- QDomElement principalCollectionSet = \
query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("principal-collection-set")); + QDomElement principalCollectionSet = \
query.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("principal-collection-set")); \
prop.appendChild(principalCollectionSet);
KIO::DavJob *job = DavManager::self()->createPropFindJob(mUrl.url(), query);
- job->addMetaData(QLatin1String("PropagateHttpHeader"), QLatin1String("true"));
+ job->addMetaData(QStringLiteral("PropagateHttpHeader"), QStringLiteral("true"));
connect(job, &KIO::DavJob::result, this, \
&DavPrincipalSearchJob::principalCollectionSetSearchFinished); job->start();
}
@@ -78,9 +78,9 @@ void DavPrincipalSearchJob::start()
void DavPrincipalSearchJob::principalCollectionSetSearchFinished(KJob *job)
{
KIO::DavJob *davJob = qobject_cast<KIO::DavJob *>(job);
- const int responseCode = \
davJob->queryMetaData(QLatin1String("responsecode")).isEmpty() ? + const int \
responseCode = davJob->queryMetaData(QStringLiteral("responsecode")).isEmpty() ? 0 :
- \
davJob->queryMetaData(QLatin1String("responsecode")).toInt(); + \
davJob->queryMetaData(QStringLiteral("responsecode")).toInt();
// KIO::DavJob does not set error() even if the HTTP status code is a 4xx or a \
5xx if (davJob->error() || (responseCode >= 400 && responseCode < 600)) {
@@ -129,7 +129,7 @@ void \
DavPrincipalSearchJob::principalCollectionSetSearchFinished(KJob *job) QDomDocument \
document = davJob->response(); QDomElement documentElement = \
document.documentElement();
- QDomElement responseElement = DavUtils::firstChildElementNS(documentElement, \
QLatin1String("DAV:"), QLatin1String("response")); + QDomElement responseElement = \
DavUtils::firstChildElementNS(documentElement, QStringLiteral("DAV:"), \
QStringLiteral("response")); if (responseElement.isNull()) {
emitResult();
return;
@@ -138,11 +138,11 @@ void \
DavPrincipalSearchJob::principalCollectionSetSearchFinished(KJob *job) // check for \
the valid propstat, without giving up on first error QDomElement propstatElement;
{
- const QDomNodeList propstats = \
responseElement.elementsByTagNameNS(QLatin1String("DAV:"), \
QLatin1String("propstat")); + const QDomNodeList propstats = \
responseElement.elementsByTagNameNS(QStringLiteral("DAV:"), \
QStringLiteral("propstat")); for (uint i = 0; i < propstats.length(); ++i) {
const QDomElement propstatCandidate = propstats.item(i).toElement();
- const QDomElement statusElement = \
DavUtils::firstChildElementNS(propstatCandidate, QLatin1String("DAV:"), \
QLatin1String("status"));
- if (statusElement.text().contains(QLatin1String("200"))) {
+ const QDomElement statusElement = \
DavUtils::firstChildElementNS(propstatCandidate, QStringLiteral("DAV:"), \
QStringLiteral("status")); + if \
(statusElement.text().contains(QStringLiteral("200"))) { propstatElement = \
propstatCandidate; }
}
@@ -153,19 +153,19 @@ void \
DavPrincipalSearchJob::principalCollectionSetSearchFinished(KJob *job) return;
}
- QDomElement propElement = DavUtils::firstChildElementNS(propstatElement, \
QLatin1String("DAV:"), QLatin1String("prop")); + QDomElement propElement = \
DavUtils::firstChildElementNS(propstatElement, QStringLiteral("DAV:"), \
QStringLiteral("prop")); if (propElement.isNull()) {
emitResult();
return;
}
- QDomElement principalCollectionSetElement = \
DavUtils::firstChildElementNS(propElement, QLatin1String("DAV:"), \
QLatin1String("principal-collection-set")); + QDomElement \
principalCollectionSetElement = DavUtils::firstChildElementNS(propElement, \
QStringLiteral("DAV:"), QStringLiteral("principal-collection-set")); if \
(principalCollectionSetElement.isNull()) { emitResult();
return;
}
- QDomNodeList hrefNodes = \
principalCollectionSetElement.elementsByTagNameNS(QLatin1String("DAV:"), \
QLatin1String("href")); + QDomNodeList hrefNodes = \
principalCollectionSetElement.elementsByTagNameNS(QStringLiteral("DAV:"), \
QStringLiteral("href")); for (int i = 0; i < hrefNodes.size(); ++i) {
QDomElement hrefElement = hrefNodes.at(i).toElement();
QString href = hrefElement.text();
@@ -185,7 +185,7 @@ void \
DavPrincipalSearchJob::principalCollectionSetSearchFinished(KJob *job) QDomDocument \
principalPropertySearchQuery; buildReportQuery(principalPropertySearchQuery);
KIO::DavJob *reportJob = DavManager::self()->createReportJob(url, \
principalPropertySearchQuery);
- reportJob->addMetaData(QLatin1String("PropagateHttpHeader"), \
QLatin1String("true")); + \
reportJob->addMetaData(QStringLiteral("PropagateHttpHeader"), \
QStringLiteral("true"));
connect(reportJob, &KIO::DavJob::result, this, \
&DavPrincipalSearchJob::principalPropertySearchFinished); \
++mPrincipalPropertySearchSubJobCount; reportJob->start();
@@ -207,7 +207,7 @@ void DavPrincipalSearchJob::principalPropertySearchFinished(KJob \
*job)
KIO::DavJob *davJob = qobject_cast<KIO::DavJob *>(job);
- const int responseCode = \
davJob->queryMetaData(QLatin1String("responsecode")).toInt(); + const int \
responseCode = davJob->queryMetaData(QStringLiteral("responsecode")).toInt();
if (responseCode > 499 && responseCode < 600 && \
!mPrincipalPropertySearchSubJobSuccessful) { // Server-side error, unrecoverable
@@ -262,7 +262,7 @@ void DavPrincipalSearchJob::principalPropertySearchFinished(KJob \
*job) const QDomDocument document = davJob->response();
const QDomElement documentElement = document.documentElement();
- QDomElement responseElement = DavUtils::firstChildElementNS(documentElement, \
QLatin1String("DAV:"), QLatin1String("response")); + QDomElement responseElement = \
DavUtils::firstChildElementNS(documentElement, QStringLiteral("DAV:"), \
QStringLiteral("response")); if (responseElement.isNull()) {
if (mPrincipalPropertySearchSubJobCount == 0) {
emitResult();
@@ -273,11 +273,11 @@ void \
DavPrincipalSearchJob::principalPropertySearchFinished(KJob *job) // check for the \
valid propstat, without giving up on first error QDomElement propstatElement;
{
- const QDomNodeList propstats = \
responseElement.elementsByTagNameNS(QLatin1String("DAV:"), \
QLatin1String("propstat")); + const QDomNodeList propstats = \
responseElement.elementsByTagNameNS(QStringLiteral("DAV:"), \
QStringLiteral("propstat")); for (uint i = 0; i < propstats.length(); ++i) {
const QDomElement propstatCandidate = propstats.item(i).toElement();
- const QDomElement statusElement = \
DavUtils::firstChildElementNS(propstatCandidate, QLatin1String("DAV:"), \
QLatin1String("status"));
- if (statusElement.text().contains(QLatin1String("200"))) {
+ const QDomElement statusElement = \
DavUtils::firstChildElementNS(propstatCandidate, QStringLiteral("DAV:"), \
QStringLiteral("status")); + if \
(statusElement.text().contains(QStringLiteral("200"))) { propstatElement = \
propstatCandidate; }
}
@@ -290,7 +290,7 @@ void DavPrincipalSearchJob::principalPropertySearchFinished(KJob \
*job) return;
}
- QDomElement propElement = DavUtils::firstChildElementNS(propstatElement, \
QLatin1String("DAV:"), QLatin1String("prop")); + QDomElement propElement = \
DavUtils::firstChildElementNS(propstatElement, QStringLiteral("DAV:"), \
QStringLiteral("prop")); if (propElement.isNull()) {
if (mPrincipalPropertySearchSubJobCount == 0) {
emitResult();
@@ -342,32 +342,32 @@ void DavPrincipalSearchJob::buildReportQuery(QDomDocument \
&query)
* </D:principal-property-search>
*/
- QDomElement principalPropertySearch = \
query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("principal-property-search")); + QDomElement principalPropertySearch \
= query.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("principal-property-search")); \
query.appendChild(principalPropertySearch);
- QDomElement propertySearch = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("property-search")); + QDomElement propertySearch = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("property-search")); \
principalPropertySearch.appendChild(propertySearch);
- QDomElement prop = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement prop = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propertySearch.appendChild(prop);
if (mType == DisplayName) {
- QDomElement displayName = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")); + QDomElement displayName = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("displayname")); \
prop.appendChild(displayName); } else if (mType == EmailAddress) {
- QDomElement calendarUserAddressSet = \
query.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-user-address-set")); + QDomElement \
calendarUserAddressSet = \
query.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-user-address-set")); \
prop.appendChild(calendarUserAddressSet);
//QDomElement hrefElement = query.createElementNS( "DAV:", "href" );
//prop.appendChild( hrefElement );
}
- QDomElement match = query.createElementNS(QLatin1String("DAV:"), \
QLatin1String("match")); + QDomElement match = \
query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("match")); \
propertySearch.appendChild(match);
QDomText propFilter = query.createTextNode(mFilter);
match.appendChild(propFilter);
- prop = query.createElementNS(QLatin1String("DAV:"), QLatin1String("prop"));
+ prop = query.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop"));
principalPropertySearch.appendChild(prop);
typedef QPair<QString, QString> PropertyPair;
diff --git a/resources/dav/protocols/caldavprotocol.cpp \
b/resources/dav/protocols/caldavprotocol.cpp index 4154dc3..ca3188a 100644
--- a/resources/dav/protocols/caldavprotocol.cpp
+++ b/resources/dav/protocols/caldavprotocol.cpp
@@ -51,35 +51,35 @@ CaldavProtocol::CaldavProtocol()
{
QDomDocument document;
- QDomElement queryElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-query")); + QDomElement queryElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-query")); document.appendChild(queryElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
queryElement.appendChild(propElement);
- QDomElement getetagElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag")); + QDomElement getetagElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("getetag")); \
propElement.appendChild(getetagElement);
- QDomElement getRTypeElement = \
document.createElementNS(QLatin1String("DAV:"), QLatin1String("resourcetype")); + \
QDomElement getRTypeElement = document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype")); propElement.appendChild(getRTypeElement);
- QDomElement filterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("filter")); + QDomElement filterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("filter")); queryElement.appendChild(filterElement);
- QDomElement compfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter")); + QDomElement compfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter"));
- QDomAttr nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VCALENDAR"));
+ QDomAttr nameAttribute = document.createAttribute(QStringLiteral("name"));
+ nameAttribute.setValue(QStringLiteral("VCALENDAR"));
compfilterElement.setAttributeNode(nameAttribute);
filterElement.appendChild(compfilterElement);
- QDomElement subcompfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter"));
- nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VEVENT"));
+ QDomElement subcompfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter")); + nameAttribute = \
document.createAttribute(QStringLiteral("name")); + \
nameAttribute.setValue(QStringLiteral("VEVENT")); \
subcompfilterElement.setAttributeNode(nameAttribute);
- QDomElement timeRangeElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("time-range"));
- QDomAttr startAttribute = document.createAttribute(QLatin1String("start"));
+ QDomElement timeRangeElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("time-range")); + QDomAttr startAttribute = \
document.createAttribute(QStringLiteral("start")); \
startAttribute.setValue(startTime); \
timeRangeElement.setAttributeNode(startAttribute); \
subcompfilterElement.appendChild(timeRangeElement); @@ -108,35 +108,35 @@ \
CaldavProtocol::CaldavProtocol() {
QDomDocument document;
- QDomElement queryElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-query")); + QDomElement queryElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-query")); document.appendChild(queryElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
queryElement.appendChild(propElement);
- QDomElement getetagElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag")); + QDomElement getetagElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("getetag")); \
propElement.appendChild(getetagElement);
- QDomElement getRTypeElement = \
document.createElementNS(QLatin1String("DAV:"), QLatin1String("resourcetype")); + \
QDomElement getRTypeElement = document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype")); propElement.appendChild(getRTypeElement);
- QDomElement filterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("filter")); + QDomElement filterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("filter")); queryElement.appendChild(filterElement);
- QDomElement compfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter")); + QDomElement compfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter"));
- QDomAttr nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VCALENDAR"));
+ QDomAttr nameAttribute = document.createAttribute(QStringLiteral("name"));
+ nameAttribute.setValue(QStringLiteral("VCALENDAR"));
compfilterElement.setAttributeNode(nameAttribute);
filterElement.appendChild(compfilterElement);
- QDomElement subcompfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter"));
- nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VTODO"));
+ QDomElement subcompfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter")); + nameAttribute = \
document.createAttribute(QStringLiteral("name")); + \
nameAttribute.setValue(QStringLiteral("VTODO")); \
subcompfilterElement.setAttributeNode(nameAttribute);
- QDomElement timeRangeElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("time-range"));
- QDomAttr startAttribute = document.createAttribute(QLatin1String("start"));
+ QDomElement timeRangeElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("time-range")); + QDomAttr startAttribute = \
document.createAttribute(QStringLiteral("start")); \
startAttribute.setValue(startTime); \
timeRangeElement.setAttributeNode(startAttribute); \
subcompfilterElement.appendChild(timeRangeElement); @@ -165,35 +165,35 @@ \
CaldavProtocol::CaldavProtocol() {
QDomDocument document;
- QDomElement queryElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-query")); + QDomElement queryElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-query")); document.appendChild(queryElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
queryElement.appendChild(propElement);
- QDomElement getetagElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag")); + QDomElement getetagElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("getetag")); \
propElement.appendChild(getetagElement);
- QDomElement getRTypeElement = \
document.createElementNS(QLatin1String("DAV:"), QLatin1String("resourcetype")); + \
QDomElement getRTypeElement = document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype")); propElement.appendChild(getRTypeElement);
- QDomElement filterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("filter")); + QDomElement filterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("filter")); queryElement.appendChild(filterElement);
- QDomElement compfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter")); + QDomElement compfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter"));
- QDomAttr nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VCALENDAR"));
+ QDomAttr nameAttribute = document.createAttribute(QStringLiteral("name"));
+ nameAttribute.setValue(QStringLiteral("VCALENDAR"));
compfilterElement.setAttributeNode(nameAttribute);
filterElement.appendChild(compfilterElement);
- QDomElement subcompfilterElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("comp-filter"));
- nameAttribute = document.createAttribute(QLatin1String("name"));
- nameAttribute.setValue(QLatin1String("VJOURNAL"));
+ QDomElement subcompfilterElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("comp-filter")); + nameAttribute = \
document.createAttribute(QStringLiteral("name")); + \
nameAttribute.setValue(QStringLiteral("VJOURNAL")); \
subcompfilterElement.setAttributeNode(nameAttribute);
- QDomElement timeRangeElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("time-range"));
- QDomAttr startAttribute = document.createAttribute(QLatin1String("start"));
+ QDomElement timeRangeElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("time-range")); + QDomAttr startAttribute = \
document.createAttribute(QStringLiteral("start")); \
startAttribute.setValue(startTime); \
timeRangeElement.setAttributeNode(startAttribute); \
subcompfilterElement.appendChild(timeRangeElement); @@ -222,29 +222,29 @@ bool \
CaldavProtocol::useMultiget() const
QString CaldavProtocol::principalHomeSet() const
{
- return QLatin1String("calendar-home-set");
+ return QStringLiteral("calendar-home-set");
}
QString CaldavProtocol::principalHomeSetNS() const
{
- return QLatin1String("urn:ietf:params:xml:ns:caldav");
+ return QStringLiteral("urn:ietf:params:xml:ns:caldav");
}
QDomDocument CaldavProtocol::collectionsQuery() const
{
QDomDocument document;
- QDomElement propfindElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfindElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
document.appendChild(propfindElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfindElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("resourcetype")));
- propElement.appendChild(document.createElementNS(QLatin1String("http://apple.com/ns/ical/"), \
QLatin1String("calendar-color")));
- propElement.appendChild(document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("supported-calendar-component-set")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("current-user-privilege-set"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("displayname"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("http://apple.com/ns/ical/"), \
QStringLiteral("calendar-color"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("supported-calendar-component-set"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("current-user-privilege-set")));
return document;
}
@@ -252,7 +252,7 @@ QDomDocument CaldavProtocol::collectionsQuery() const
QString CaldavProtocol::collectionsXQuery() const
{
//const QString query( "//*[local-name()='calendar' and \
namespace-uri()='urn:ietf:params:xml:ns:caldav']/ancestor::*[local-name()='prop' and \
namespace-uri()='DAV:']/*[local-name()='supported-calendar-component-set' and \
namespace-uri()='urn:ietf:params:xml:ns:caldav']/*[local-name()='comp' and \
namespace-uri()='urn:ietf:params:xml:ns:caldav' and (@name='VTODO' or \
@name='VEVENT')]/ancestor::*[local-name()='response' and \
namespace-uri()='DAV:']" );
- const QString query(QLatin1String("//*[local-name()='calendar' and \
namespace-uri()='urn:ietf:params:xml:ns:caldav']/ancestor::*[local-name()='prop' and \
namespace-uri()='DAV:']/ancestor::*[local-name()='response' and \
namespace-uri()='DAV:']")); + const QString \
query(QStringLiteral("//*[local-name()='calendar' and \
namespace-uri()='urn:ietf:params:xml:ns:caldav']/ancestor::*[local-name()='prop' and \
namespace-uri()='DAV:']/ancestor::*[local-name()='response' and \
namespace-uri()='DAV:']"));
return query;
}
@@ -271,17 +271,17 @@ QDomDocument CaldavProtocol::itemsReportQuery(const QStringList \
&urls) const {
QDomDocument document;
- QDomElement multigetElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-multiget")); + QDomElement multigetElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-multiget")); document.appendChild(multigetElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
multigetElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag")));
- propElement.appendChild(document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("calendar-data"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("getetag"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("calendar-data")));
foreach (const QString &url, urls) {
- QDomElement hrefElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("href")); + QDomElement hrefElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("href")); const KUrl \
pathUrl(url);
const QDomText textNode = \
document.createTextNode(pathUrl.encodedPathAndQuery()); @@ -295,12 +295,12 @@ \
QDomDocument CaldavProtocol::itemsReportQuery(const QStringList &urls) const
QString CaldavProtocol::responseNamespace() const
{
- return QLatin1String("urn:ietf:params:xml:ns:caldav");
+ return QStringLiteral("urn:ietf:params:xml:ns:caldav");
}
QString CaldavProtocol::dataTagName() const
{
- return QLatin1String("calendar-data");
+ return QStringLiteral("calendar-data");
}
DavCollection::ContentTypes CaldavProtocol::collectionContentTypes(const QDomElement \
&propstatElement) const @@ -327,11 +327,11 @@ DavCollection::ContentTypes \
CaldavProtocol::collectionContentTypes(const QDomEle
* </propstat>
*/
- const QDomElement propElement = DavUtils::firstChildElementNS(propstatElement, \
QLatin1String("DAV:"), QLatin1String("prop"));
- const QDomElement supportedcomponentElement = \
DavUtils::firstChildElementNS(propElement, \
QLatin1String("urn:ietf:params:xml:ns:caldav"), \
QLatin1String("supported-calendar-component-set")); + const QDomElement \
propElement = DavUtils::firstChildElementNS(propstatElement, QStringLiteral("DAV:"), \
QStringLiteral("prop")); + const QDomElement supportedcomponentElement = \
DavUtils::firstChildElementNS(propElement, \
QStringLiteral("urn:ietf:params:xml:ns:caldav"), \
QStringLiteral("supported-calendar-component-set"));
DavCollection::ContentTypes contentTypes;
- QDomElement compElement = \
DavUtils::firstChildElementNS(supportedcomponentElement, \
QLatin1String("urn:ietf:params:xml:ns:caldav"), QLatin1String("comp")); + \
QDomElement compElement = DavUtils::firstChildElementNS(supportedcomponentElement, \
QStringLiteral("urn:ietf:params:xml:ns:caldav"), QStringLiteral("comp"));
/*
* Assign the content-type if the server didn't return anything.
@@ -349,20 +349,20 @@ DavCollection::ContentTypes \
CaldavProtocol::collectionContentTypes(const QDomEle }
while (!compElement.isNull()) {
- const QString type = compElement.attribute(QLatin1String("name")).toLower();
- if (type == QLatin1String("vcalendar")) {
+ const QString type = \
compElement.attribute(QStringLiteral("name")).toLower(); + if (type == \
QStringLiteral("vcalendar")) { contentTypes |= DavCollection::Calendar;
- } else if (type == QLatin1String("vevent")) {
+ } else if (type == QStringLiteral("vevent")) {
contentTypes |= DavCollection::Events;
- } else if (type == QLatin1String("vtodo")) {
+ } else if (type == QStringLiteral("vtodo")) {
contentTypes |= DavCollection::Todos;
- } else if (type == QLatin1String("vfreebusy")) {
+ } else if (type == QStringLiteral("vfreebusy")) {
contentTypes |= DavCollection::FreeBusy;
- } else if (type == QLatin1String("vjournal")) {
+ } else if (type == QStringLiteral("vjournal")) {
contentTypes |= DavCollection::Journal;
}
- compElement = DavUtils::nextSiblingElementNS(compElement, \
QLatin1String("urn:ietf:params:xml:ns:caldav"), QLatin1String("comp")); + \
compElement = DavUtils::nextSiblingElementNS(compElement, \
QStringLiteral("urn:ietf:params:xml:ns:caldav"), QStringLiteral("comp")); }
return contentTypes;
diff --git a/resources/dav/protocols/carddavprotocol.cpp \
b/resources/dav/protocols/carddavprotocol.cpp index 149885a..b6b8abb 100644
--- a/resources/dav/protocols/carddavprotocol.cpp
+++ b/resources/dav/protocols/carddavprotocol.cpp
@@ -27,15 +27,15 @@ CarddavProtocol::CarddavProtocol()
{
QDomDocument document;
- QDomElement propfindElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfindElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
document.appendChild(propfindElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfindElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("resourcetype")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("displayname"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("getetag")));
mItemsQueries << document;
mItemsMimeTypes << KContacts::Addressee::mimeType();
@@ -58,33 +58,33 @@ bool CarddavProtocol::useMultiget() const
QString CarddavProtocol::principalHomeSet() const
{
- return QLatin1String("addressbook-home-set");
+ return QStringLiteral("addressbook-home-set");
}
QString CarddavProtocol::principalHomeSetNS() const
{
- return QLatin1String("urn:ietf:params:xml:ns:carddav");
+ return QStringLiteral("urn:ietf:params:xml:ns:carddav");
}
QDomDocument CarddavProtocol::collectionsQuery() const
{
QDomDocument document;
- QDomElement propfindElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfindElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
document.appendChild(propfindElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfindElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("resourcetype"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("displayname"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype")));
return document;
}
QString CarddavProtocol::collectionsXQuery() const
{
- const QString query(QLatin1String("//*[local-name()='addressbook' and \
namespace-uri()='urn:ietf:params:xml:ns:carddav']/ancestor::*[local-name()='response' \
and namespace-uri()='DAV:']")); + const QString \
query(QStringLiteral("//*[local-name()='addressbook' and \
namespace-uri()='urn:ietf:params:xml:ns:carddav']/ancestor::*[local-name()='response' \
and namespace-uri()='DAV:']"));
return query;
}
@@ -103,19 +103,19 @@ QDomDocument CarddavProtocol::itemsReportQuery(const \
QStringList &urls) const {
QDomDocument document;
- QDomElement multigetElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:carddav"), \
QLatin1String("addressbook-multiget")); + QDomElement multigetElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:carddav"), \
QStringLiteral("addressbook-multiget")); document.appendChild(multigetElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
multigetElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag")));
- QDomElement addressDataElement = \
document.createElementNS(QLatin1String("urn:ietf:params:xml:ns:carddav"), \
QLatin1String("address-data"));
- addressDataElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("allprop"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("getetag"))); + QDomElement addressDataElement = \
document.createElementNS(QStringLiteral("urn:ietf:params:xml:ns:carddav"), \
QStringLiteral("address-data")); + \
addressDataElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("allprop"))); propElement.appendChild(addressDataElement);
foreach (const QString &url, urls) {
- QDomElement hrefElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("href")); + QDomElement hrefElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("href")); const KUrl \
pathUrl(url);
const QDomText textNode = \
document.createTextNode(pathUrl.encodedPathAndQuery()); @@ -129,12 +129,12 @@ \
QDomDocument CarddavProtocol::itemsReportQuery(const QStringList &urls) const
QString CarddavProtocol::responseNamespace() const
{
- return QLatin1String("urn:ietf:params:xml:ns:carddav");
+ return QStringLiteral("urn:ietf:params:xml:ns:carddav");
}
QString CarddavProtocol::dataTagName() const
{
- return QLatin1String("address-data");
+ return QStringLiteral("address-data");
}
DavCollection::ContentTypes CarddavProtocol::collectionContentTypes(const \
QDomElement &) const @@ -144,5 +144,5 @@ DavCollection::ContentTypes \
CarddavProtocol::collectionContentTypes(const QDomEl
QString CarddavProtocol::contactsMimeType() const
{
- return QLatin1String("text/vcard");
+ return QStringLiteral("text/vcard");
}
diff --git a/resources/dav/protocols/groupdavprotocol.cpp \
b/resources/dav/protocols/groupdavprotocol.cpp index a14367b..44c36a4 100644
--- a/resources/dav/protocols/groupdavprotocol.cpp
+++ b/resources/dav/protocols/groupdavprotocol.cpp
@@ -26,15 +26,15 @@ GroupdavProtocol::GroupdavProtocol()
{
QDomDocument document;
- QDomElement propfindElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfindElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
document.appendChild(propfindElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfindElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("resourcetype")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("getetag"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("displayname"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("getetag")));
mItemsQueries << document;
}
@@ -58,21 +58,21 @@ QDomDocument GroupdavProtocol::collectionsQuery() const
{
QDomDocument document;
- QDomElement propfindElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("propfind")); + QDomElement propfindElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("propfind")); \
document.appendChild(propfindElement);
- QDomElement propElement = document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("prop")); + QDomElement propElement = \
document.createElementNS(QStringLiteral("DAV:"), QStringLiteral("prop")); \
propfindElement.appendChild(propElement);
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("displayname")));
- propElement.appendChild(document.createElementNS(QLatin1String("DAV:"), \
QLatin1String("resourcetype"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("displayname"))); + \
propElement.appendChild(document.createElementNS(QStringLiteral("DAV:"), \
QStringLiteral("resourcetype")));
return document;
}
QString GroupdavProtocol::collectionsXQuery() const
{
- const QString query(QLatin1String("//*[(local-name()='vevent-collection' or \
local-name()='vtodo-collection' or local-name()='vcard-collection') and \
namespace-uri()='http://groupdav.org/']/ancestor::*[local-name()='response' and \
namespace-uri()='DAV:']")); + const QString \
query(QStringLiteral("//*[(local-name()='vevent-collection' or \
local-name()='vtodo-collection' or local-name()='vcard-collection') and \
namespace-uri()='http://groupdav.org/']/ancestor::*[local-name()='response' and \
namespace-uri()='DAV:']"));
return query;
}
@@ -105,20 +105,20 @@ DavCollection::ContentTypes \
GroupdavProtocol::collectionContentTypes(const QDomE
* </propstat>
*/
- const QDomElement propElement = DavUtils::firstChildElementNS(propstatElement, \
QLatin1String("DAV:"), QLatin1String("prop"));
- const QDomElement resourcetypeElement = \
DavUtils::firstChildElementNS(propElement, QLatin1String("DAV:"), \
QLatin1String("resourcetype")); + const QDomElement propElement = \
DavUtils::firstChildElementNS(propstatElement, QStringLiteral("DAV:"), \
QStringLiteral("prop")); + const QDomElement resourcetypeElement = \
DavUtils::firstChildElementNS(propElement, QStringLiteral("DAV:"), \
QStringLiteral("resourcetype"));
DavCollection::ContentTypes contentTypes;
- if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QLatin1String("http://groupdav.org/"), QLatin1String("vevent-collection")).isNull()) \
{ + if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QStringLiteral("http://groupdav.org/"), \
QStringLiteral("vevent-collection")).isNull()) { contentTypes |= \
DavCollection::Events; }
- if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QLatin1String("http://groupdav.org/"), QLatin1String("vtodo-collection")).isNull()) { \
+ if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QStringLiteral("http://groupdav.org/"), QStringLiteral("vtodo-collection")).isNull()) \
{ contentTypes |= DavCollection::Todos;
}
- if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QLatin1String("http://groupdav.org/"), QLatin1String("vcard-collection")).isNull()) { \
+ if (!DavUtils::firstChildElementNS(resourcetypeElement, \
QStringLiteral("http://groupdav.org/"), QStringLiteral("vcard-collection")).isNull()) \
{ contentTypes |= DavCollection::Contacts;
}
@@ -127,5 +127,5 @@ DavCollection::ContentTypes \
GroupdavProtocol::collectionContentTypes(const QDomE
QString GroupdavProtocol::contactsMimeType() const
{
- return QLatin1String("text/x-vcard");
+ return QStringLiteral("text/x-vcard");
}
diff --git a/resources/dav/resource/configdialog.cpp \
b/resources/dav/resource/configdialog.cpp index b5046b0..af2b8f3 100644
--- a/resources/dav/resource/configdialog.cpp
+++ b/resources/dav/resource/configdialog.cpp
@@ -42,7 +42,7 @@ ConfigDialog::ConfigDialog(QWidget *parent)
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
mUi.setupUi(mainWidget);
- setWindowIcon(QIcon::fromTheme(QLatin1String("folder-remote")));
+ setWindowIcon(QIcon::fromTheme(QStringLiteral("folder-remote")));
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); mOkButton = buttonBox->button(QDialogButtonBox::Ok);
@@ -119,7 +119,7 @@ void ConfigDialog::onAddButtonClicked()
urlConfig->mUrl = dlg->remoteUrl();
if (dlg->useDefaultCredentials()) {
- urlConfig->mUser = QLatin1String("$default$");
+ urlConfig->mUser = QStringLiteral("$default$");
} else {
urlConfig->mUser = dlg->username();
urlConfig->mPassword = dlg->password();
@@ -156,7 +156,7 @@ void ConfigDialog::onSearchButtonClicked()
urlConfig->mUrl = split.at(1);
if (dlg->useDefaultCredentials()) {
- urlConfig->mUser = QLatin1String("$default$");
+ urlConfig->mUser = QStringLiteral("$default$");
} else {
urlConfig->mUser = dlg->username();
urlConfig->mPassword = dlg->password();
@@ -211,7 +211,7 @@ void ConfigDialog::onEditButtonClicked()
dlg->setRemoteUrl(urlConfig->mUrl);
dlg->setProtocol(DavUtils::Protocol(urlConfig->mProtocol));
- if (urlConfig->mUser == QLatin1String("$default$")) {
+ if (urlConfig->mUser == QStringLiteral("$default$")) {
dlg->setUseDefaultCredentials(true);
} else {
dlg->setUseDefaultCredentials(false);
@@ -228,7 +228,7 @@ void ConfigDialog::onEditButtonClicked()
Settings::UrlConfiguration *urlConfigAccepted = new \
Settings::UrlConfiguration(); urlConfigAccepted->mUrl = dlg->remoteUrl();
if (dlg->useDefaultCredentials()) {
- urlConfigAccepted->mUser = QLatin1String("$default$");
+ urlConfigAccepted->mUser = QStringLiteral("$default$");
} else {
urlConfigAccepted->mUser = dlg->username();
urlConfigAccepted->mPassword = dlg->password();
diff --git a/resources/dav/resource/davfreebusyhandler.cpp \
b/resources/dav/resource/davfreebusyhandler.cpp index 0b91acd..9b9d30f 100644
--- a/resources/dav/resource/davfreebusyhandler.cpp
+++ b/resources/dav/resource/davfreebusyhandler.cpp
@@ -44,7 +44,7 @@ void DavFreeBusyHandler::canHandleFreeBusy(const QString &email)
DavPrincipalSearchJob *job = new DavPrincipalSearchJob(url, \
DavPrincipalSearchJob::EmailAddress, email); job->setProperty("email", \
QVariant::fromValue(email));
job->setProperty("url", QVariant::fromValue(url.url().url()));
- job->fetchProperty(QLatin1String("schedule-inbox-URL"), \
QLatin1String("urn:ietf:params:xml:ns:caldav")); + \
job->fetchProperty(QStringLiteral("schedule-inbox-URL"), \
QStringLiteral("urn:ietf:params:xml:ns:caldav"));
connect(job, &DavPrincipalSearchJob::result, this, \
&DavFreeBusyHandler::onPrincipalSearchJobFinished); job->start();
}
@@ -72,7 +72,7 @@ void DavFreeBusyHandler::retrieveFreeBusy(const QString &email, \
const KDateTime
KUrl url(outbox);
KIO::StoredTransferJob *job = KIO::storedHttpPost(fbData, url);
- job->addMetaData(QLatin1String("content-type"), \
QLatin1String("text/calendar")); + \
job->addMetaData(QStringLiteral("content-type"), QStringLiteral("text/calendar")); \
job->setProperty("email", QVariant::fromValue(email)); \
job->setProperty("request-id", QVariant::fromValue(requestId));
connect(job, &DavPrincipalSearchJob::result, this, \
&DavFreeBusyHandler::onRetrieveFreeBusyJobFinished); @@ -181,7 +181,7 @@ void \
DavFreeBusyHandler::onRetrieveFreeBusyJobFinished(KJob *job) QDomElement \
scheduleResponse = response.documentElement();
// We are only expecting one response tag
- QDomElement responseElement = DavUtils::firstChildElementNS(scheduleResponse, \
QLatin1String("urn:ietf:params:xml:ns:caldav"), QLatin1String("response")); + \
QDomElement responseElement = DavUtils::firstChildElementNS(scheduleResponse, \
QStringLiteral("urn:ietf:params:xml:ns:caldav"), QStringLiteral("response")); if \
(responseElement.isNull()) {
if (retrievalJobCount == 0 && \
!mRequestsTracker[email].retrievalJobSuccessful) {
emit(freeBusyRetrieved(email, QString(), false, i18n("Invalid response \
from the server"))); @@ -192,7 +192,7 @@ void \
DavFreeBusyHandler::onRetrieveFreeBusyJobFinished(KJob *job)
// We can load directly the calendar-data and use its content to create
// an incidence base that will give us everything we need to test
// the success
- QDomElement calendarDataElement = DavUtils::firstChildElementNS(responseElement, \
QLatin1String("urn:ietf:params:xml:ns:caldav"), QLatin1String("calendar-data")); + \
QDomElement calendarDataElement = DavUtils::firstChildElementNS(responseElement, \
QStringLiteral("urn:ietf:params:xml:ns:caldav"), QStringLiteral("calendar-data")); \
if (calendarDataElement.isNull()) {
if (retrievalJobCount == 0 && \
!mRequestsTracker[email].retrievalJobSuccessful) {
emit(freeBusyRetrieved(email, QString(), false, i18n("Invalid response \
from the server")));
diff --git a/resources/dav/resource/davgroupwareresource.cpp \
b/resources/dav/resource/davgroupwareresource.cpp index 3fd152e..72bb1a0 100644
--- a/resources/dav/resource/davgroupwareresource.cpp
+++ b/resources/dav/resource/davgroupwareresource.cpp
@@ -82,7 +82,7 @@ DavGroupwareResource::DavGroupwareResource(const QString &id)
mDavCollectionRoot.setRights(Collection::CanCreateCollection | \
Collection::CanDeleteCollection | Collection::CanChangeCollection);
EntityDisplayAttribute *attribute = \
mDavCollectionRoot.attribute<EntityDisplayAttribute>(Collection::AddIfMissing);
- attribute->setIconName(QLatin1String("folder-remote"));
+ attribute->setIconName(QStringLiteral("folder-remote"));
int refreshInterval = Settings::self()->refreshInterval();
if (refreshInterval == 0) {
@@ -94,7 +94,7 @@ DavGroupwareResource::DavGroupwareResource(const QString &id)
cachePolicy.setSyncOnDemand(false);
cachePolicy.setCacheTimeout(-1);
cachePolicy.setIntervalCheckTime(refreshInterval);
- cachePolicy.setLocalParts(QStringList() << QLatin1String("ALL"));
+ cachePolicy.setLocalParts(QStringList() << QStringLiteral("ALL"));
mDavCollectionRoot.setCachePolicy(cachePolicy);
changeRecorder()->fetchCollection(true);
@@ -195,7 +195,7 @@ void DavGroupwareResource::configure(WId windowId)
urlConfig->mUrl = url.url;
urlConfig->mProtocol = url.protocol;
urlConfig->mUser = url.userName;
- urlConfig->mPassword = \
wizard.field(QLatin1String("credentialsPassword")).toString(); + \
urlConfig->mPassword = \
wizard.field(QStringLiteral("credentialsPassword")).toString();
Settings::self()->newUrlConfiguration(urlConfig);
}
@@ -204,10 +204,10 @@ void DavGroupwareResource::configure(WId windowId)
Settings::self()->setDisplayName(wizard.displayName());
}
- QString defaultUser = \
wizard.field(QLatin1String("credentialsUserName")).toString(); + QString \
defaultUser = wizard.field(QStringLiteral("credentialsUserName")).toString(); if \
(!defaultUser.isEmpty()) { Settings::self()->setDefaultUsername(defaultUser);
- Settings::self()->setDefaultPassword(wizard.field(QLatin1String("credentialsPassword")).toString());
+ Settings::self()->setDefaultPassword(wizard.field(QStringLiteral("credentialsPassword")).toString());
}
}
}
@@ -300,7 +300,7 @@ bool DavGroupwareResource::retrieveItem(const Akonadi::Item \
&item, const QSet<QB
DavItem davItem;
davItem.setUrl(item.remoteId());
- davItem.setContentType(QLatin1String("text/calendar"));
+ davItem.setContentType(QStringLiteral("text/calendar"));
davItem.setEtag(item.remoteRevision());
DavItemFetchJob *job = new DavItemFetchJob(davUrl, davItem);
@@ -626,7 +626,7 @@ void DavGroupwareResource::onRetrieveCollectionsFinished(KJob \
*job)
const DavCollection::ContentTypes contentTypes = \
davCollection.contentTypes(); if (contentTypes & DavCollection::Calendar) {
- mimeTypes << QLatin1String("text/calendar");
+ mimeTypes << QStringLiteral("text/calendar");
}
if (contentTypes & DavCollection::Events) {
@@ -1030,10 +1030,10 @@ void \
DavGroupwareResource::setCollectionIcon(Akonadi::Collection &collection) const \
QStringList mimeTypes = collection.contentMimeTypes(); if (mimeTypes.count() == 1) {
QHash<QString, QString> mapping;
- mapping.insert(KCalCore::Event::eventMimeType(), \
QLatin1String("view-calendar"));
- mapping.insert(KCalCore::Todo::todoMimeType(), \
QLatin1String("view-calendar-tasks"));
- mapping.insert(KCalCore::Journal::journalMimeType(), \
QLatin1String("view-pim-journal"));
- mapping.insert(KContacts::Addressee::mimeType(), \
QLatin1String("view-pim-contacts")); + \
mapping.insert(KCalCore::Event::eventMimeType(), QStringLiteral("view-calendar")); + \
mapping.insert(KCalCore::Todo::todoMimeType(), \
QStringLiteral("view-calendar-tasks")); + \
mapping.insert(KCalCore::Journal::journalMimeType(), \
QStringLiteral("view-pim-journal")); + \
mapping.insert(KContacts::Addressee::mimeType(), \
QStringLiteral("view-pim-contacts"));
if (mapping.contains(mimeTypes.first())) {
EntityDisplayAttribute *attribute = \
collection.attribute<EntityDisplayAttribute>(Collection::AddIfMissing);
diff --git a/resources/dav/resource/searchdialog.cpp \
b/resources/dav/resource/searchdialog.cpp index 4872fe7..84688a6 100644
--- a/resources/dav/resource/searchdialog.cpp
+++ b/resources/dav/resource/searchdialog.cpp
@@ -202,9 +202,9 @@ void SearchDialog::onCollectionsFetchJobFinished(KJob *job)
item->setData(data, Qt::UserRole + 1);
item->setToolTip(collection.url());
if (collection.protocol() == DavUtils::CalDav) {
- item->setIcon(QIcon::fromTheme(QLatin1String("view-calendar")));
+ item->setIcon(QIcon::fromTheme(QStringLiteral("view-calendar")));
} else {
- item->setIcon(QIcon::fromTheme(QLatin1String("view-pim-contacts")));
+ item->setIcon(QIcon::fromTheme(QStringLiteral("view-pim-contacts")));
}
mModel->appendRow(item);
}
diff --git a/resources/dav/resource/settings.cpp \
b/resources/dav/resource/settings.cpp index 8204696..9fb1a4e 100644
--- a/resources/dav/resource/settings.cpp
+++ b/resources/dav/resource/settings.cpp
@@ -114,7 +114,7 @@ Settings::Settings()
s_globalSettings->q = this;
new SettingsAdaptor(this);
- QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"), this,
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this,
QDBusConnection::ExportAdaptors | \
QDBusConnection::ExportScriptableContents);
if (settingsVersion() == 1) {
@@ -153,12 +153,12 @@ void Settings::setResourceIdentifier(const QString &identifier)
void Settings::setDefaultPassword(const QString &password)
{
- savePassword(mResourceIdentifier, QLatin1String("$default$"), password);
+ savePassword(mResourceIdentifier, QStringLiteral("$default$"), password);
}
QString Settings::defaultPassword()
{
- return loadPassword(mResourceIdentifier, QLatin1String("$default$"));
+ return loadPassword(mResourceIdentifier, QStringLiteral("$default$"));
}
DavUtils::DavUrl::List Settings::configuredDavUrls()
@@ -267,7 +267,7 @@ void Settings::newUrlConfiguration(Settings::UrlConfiguration \
*urlConfig) }
mUrls[ key ] = urlConfig;
- if (urlConfig->mUser != QLatin1String("$default$")) {
+ if (urlConfig->mUser != QStringLiteral("$default$")) {
savePassword(key, urlConfig->mUser, urlConfig->mPassword);
}
updateRemoteUrls();
@@ -311,11 +311,11 @@ QString Settings::username(DavUtils::Protocol proto, const \
QString &url) const QString key = url + QLatin1Char(',') + \
DavUtils::protocolName(proto);
if (mUrls.contains(key))
- if (mUrls[ key ]->mUser == QLatin1String("$default$")) {
+ if (mUrls[ key ]->mUser == QStringLiteral("$default$")) {
return defaultUsername();
}
#ifdef HAVE_ACCOUNTS
- else if (mUrls[ key ]->mUser == QLatin1String("$accounts$")) {
+ else if (mUrls[ key ]->mUser == QStringLiteral("$accounts$")) {
return accountsUsername();
}
#endif
@@ -332,7 +332,7 @@ QString Settings::password(DavUtils::Protocol proto, const \
QString &url) QString key = url + QLatin1Char(',') + DavUtils::protocolName(proto);
if (mUrls.contains(key))
- if (mUrls[ key ]->mUser == QLatin1String("$default$")) {
+ if (mUrls[ key ]->mUser == QStringLiteral("$default$")) {
return defaultPassword();
} else {
return mUrls[ key ]->mPassword;
@@ -506,11 +506,11 @@ QString Settings::loadPassword(const QString &key, const \
QString &user) QString entry;
QString pass;
- if (user == QLatin1String("$default$")) {
+ if (user == QStringLiteral("$default$")) {
entry = mResourceIdentifier + QLatin1Char(',') + user;
}
#ifdef HAVE_ACCOUNTS
- else if (user == QLatin1String("$accounts$")) {
+ else if (user == QStringLiteral("$accounts$")) {
return loadPasswordFromAccounts();
}
#endif
@@ -591,7 +591,7 @@ QString Settings::promptForPassword(const QString &user)
QVBoxLayout *vLayout = new QVBoxLayout();
mainWidget->setLayout(vLayout);
QLabel *label = new QLabel(i18n("A password is required for user %1",
- (user == QLatin1String("$default$") ? \
defaultUsername() : user)), + (user == \
QStringLiteral("$default$") ? defaultUsername() : user)), mainWidget
);
vLayout->addWidget(label);
@@ -631,7 +631,7 @@ void Settings::updateToV2()
QMutableStringListIterator it(urls);
while (it.hasNext()) {
it.next();
- it.value().replace(regexp, QLatin1String("$default$"));
+ it.value().replace(regexp, QStringLiteral("$default$"));
}
setDefaultUsername(urlConfig.mUser);
@@ -655,7 +655,7 @@ void Settings::updateToV3()
if (splitUrl.size() == 3) {
DavUtils::Protocol protocol = \
DavUtils::protocolByTranslatedName(splitUrl.at(1)); splitUrl[1] = \
DavUtils::protocolName(protocol);
- updatedUrls << splitUrl.join(QLatin1String("|"));
+ updatedUrls << splitUrl.join(QStringLiteral("|"));
}
}
diff --git a/resources/dav/resource/setupwizard.cpp \
b/resources/dav/resource/setupwizard.cpp index 04f6ed0..5528eb6 100644
--- a/resources/dav/resource/setupwizard.cpp
+++ b/resources/dav/resource/setupwizard.cpp
@@ -61,32 +61,32 @@ static QString settingsToUrl(const QWizard *wizard, const QString \
&protocol) return QString();
}
- QStringList supportedProtocols = \
service->property(QLatin1String("X-DavGroupware-SupportedProtocols")).toStringList(); \
+ QStringList supportedProtocols = \
service->property(QStringLiteral("X-DavGroupware-SupportedProtocols")).toStringList();
if (!supportedProtocols.contains(protocol)) {
return QString();
}
QString pathPattern;
- QString pathPropertyName(QLatin1String("X-DavGroupware-") + protocol + \
QLatin1String("Path")); + QString \
pathPropertyName(QStringLiteral("X-DavGroupware-") + protocol + \
QStringLiteral("Path")); if (service->property(pathPropertyName).isNull()) {
return QString();
}
pathPattern.append(service->property(pathPropertyName).toString() + \
QLatin1Char('/'));
- QString username = \
wizard->field(QLatin1String("credentialsUserName")).toString(); + QString username \
= wizard->field(QStringLiteral("credentialsUserName")).toString(); QString \
localPart(username);
- localPart.remove(QRegExp(QLatin1String("@.*$")));
- pathPattern.replace(QLatin1String("$user$"), username);
- pathPattern.replace(QLatin1String("$localpart$"), localPart);
+ localPart.remove(QRegExp(QStringLiteral("@.*$")));
+ pathPattern.replace(QStringLiteral("$user$"), username);
+ pathPattern.replace(QStringLiteral("$localpart$"), localPart);
QString providerName;
if (!service->property("X-DavGroupware-Provider").isNull()) {
providerName = service->property("X-DavGroupware-Provider").toString();
}
- QString localPath = wizard->field(QLatin1String("installationPath")).toString();
+ QString localPath = \
wizard->field(QStringLiteral("installationPath")).toString(); if \
(!localPath.isEmpty()) {
- if (providerName == QLatin1String("davical")) {
+ if (providerName == QStringLiteral("davical")) {
if (!localPath.endsWith(QLatin1Char('/'))) {
pathPattern.append(localPath + QLatin1Char('/'));
} else {
@@ -103,13 +103,13 @@ static QString settingsToUrl(const QWizard *wizard, const \
QString &protocol) QUrl url;
if (!wizard->property("usePredefinedProvider").isNull()) {
- if (service->property(QLatin1String("X-DavGroupware-ProviderUsesSSL")).toBool()) \
{
- url.setScheme(QLatin1String("https"));
+ if (service->property(QStringLiteral("X-DavGroupware-ProviderUsesSSL")).toBool()) \
{ + url.setScheme(QStringLiteral("https"));
} else {
- url.setScheme(QLatin1String("http"));
+ url.setScheme(QStringLiteral("http"));
}
- QString hostPropertyName(QLatin1String("X-DavGroupware-") + protocol + \
QLatin1String("Host")); + QString \
hostPropertyName(QStringLiteral("X-DavGroupware-") + protocol + \
QStringLiteral("Host")); if (service->property(hostPropertyName).isNull()) {
return QString();
}
@@ -117,13 +117,13 @@ static QString settingsToUrl(const QWizard *wizard, const \
QString &protocol) url.setHost(service->property(hostPropertyName).toString());
url.setPath(pathPattern);
} else {
- if (wizard->field(QLatin1String("connectionUseSecureConnection")).toBool()) \
{
- url.setScheme(QLatin1String("https"));
+ if (wizard->field(QStringLiteral("connectionUseSecureConnection")).toBool()) \
{ + url.setScheme(QStringLiteral("https"));
} else {
- url.setScheme(QLatin1String("http"));
+ url.setScheme(QStringLiteral("http"));
}
- QString host = wizard->field(QLatin1String("connectionHost")).toString();
+ QString host = wizard->field(QStringLiteral("connectionHost")).toString();
if (host.isEmpty()) {
return QString();
}
@@ -149,7 +149,7 @@ SetupWizard::SetupWizard(QWidget *parent)
: QWizard(parent)
{
setWindowTitle(i18n("DAV groupware configuration wizard"));
- setWindowIcon(QIcon::fromTheme(QLatin1String("folder-remote")));
+ setWindowIcon(QIcon::fromTheme(QStringLiteral("folder-remote")));
setPage(W_CredentialsPage, new CredentialsPage);
setPage(W_PredefinedProviderPage, new PredefinedProviderPage);
setPage(W_ServerTypePage, new ServerTypePage);
@@ -186,15 +186,15 @@ SetupWizard::Url::List SetupWizard::urls() const
return urls;
}
- QStringList supportedProtocols = \
service->property(QLatin1String("X-DavGroupware-SupportedProtocols")).toStringList(); \
+ QStringList supportedProtocols = \
service->property(QStringLiteral("X-DavGroupware-SupportedProtocols")).toStringList();
foreach (const QString &protocol, supportedProtocols) {
Url url;
- if (protocol == QLatin1String("CalDav")) {
+ if (protocol == QStringLiteral("CalDav")) {
url.protocol = DavUtils::CalDav;
- } else if (protocol == QLatin1String("CardDav")) {
+ } else if (protocol == QStringLiteral("CardDav")) {
url.protocol = DavUtils::CardDav;
- } else if (protocol == QLatin1String("GroupDav")) {
+ } else if (protocol == QStringLiteral("GroupDav")) {
url.protocol = DavUtils::GroupDav;
} else {
return urls;
@@ -204,7 +204,7 @@ SetupWizard::Url::List SetupWizard::urls() const
if (!urlStr.isEmpty()) {
url.url = urlStr;
- url.userName = QLatin1String("$default$");
+ url.userName = QStringLiteral("$default$");
urls << url;
}
}
@@ -226,20 +226,20 @@ CredentialsPage::CredentialsPage(QWidget *parent)
mUserName = new KLineEdit;
layout->addRow(i18n("User"), mUserName);
- registerField(QLatin1String("credentialsUserName*"), mUserName);
+ registerField(QStringLiteral("credentialsUserName*"), mUserName);
mPassword = new KLineEdit;
mPassword->setPasswordMode(true);
layout->addRow(i18n("Password"), mPassword);
- registerField(QLatin1String("credentialsPassword*"), mPassword);
+ registerField(QStringLiteral("credentialsPassword*"), mPassword);
}
int CredentialsPage::nextId() const
{
- QString userName = field(QLatin1String("credentialsUserName")).toString();
- if (userName.endsWith(QLatin1String("@yahoo.com"))) {
+ QString userName = field(QStringLiteral("credentialsUserName")).toString();
+ if (userName.endsWith(QStringLiteral("@yahoo.com"))) {
KService::List offers;
- offers = KServiceTypeTrader::self()->query(QLatin1String("DavGroupwareProvider"), \
QLatin1String("Name == 'Yahoo!'")); + offers = \
KServiceTypeTrader::self()->query(QStringLiteral("DavGroupwareProvider"), \
QStringLiteral("Name == 'Yahoo!'")); if (offers.isEmpty()) {
return SetupWizard::W_ServerTypePage;
}
@@ -319,7 +319,7 @@ ServerTypePage::ServerTypePage(QWidget *parent)
mProvidersCombo = new QComboBox(this);
KService::List providers;
KServiceTypeTrader *trader = KServiceTypeTrader::self();
- providers = trader->query(QLatin1String("DavGroupwareProvider"));
+ providers = trader->query(QStringLiteral("DavGroupwareProvider"));
QList< QPair<QString, QString> > offers;
foreach (const KService::Ptr &provider, providers) {
offers.append(QPair<QString, QString>(provider->name(), \
provider->entryPath())); @@ -330,7 +330,7 @@ ServerTypePage::ServerTypePage(QWidget \
*parent) QPair<QString, QString> p = it.next();
mProvidersCombo->addItem(p.first, p.second);
}
- registerField(QLatin1String("provider"), mProvidersCombo, "currentText");
+ registerField(QStringLiteral("provider"), mProvidersCombo, "currentText");
QVBoxLayout *layout = new QVBoxLayout(this);
@@ -341,7 +341,7 @@ ServerTypePage::ServerTypePage(QWidget *parent)
QHBoxLayout *hLayout = new QHBoxLayout;
button = new QRadioButton(i18n("Use one of those servers:"));
- registerField(QLatin1String("templateConfiguration"), button);
+ registerField(QStringLiteral("templateConfiguration"), button);
mServerGroup->addButton(button);
mServerGroup->setId(button, 0);
button->setChecked(true);
@@ -352,7 +352,7 @@ ServerTypePage::ServerTypePage(QWidget *parent)
button = new QRadioButton(i18n("Configure the resource manually"));
connect(button, &QRadioButton::toggled, this, \
&ServerTypePage::manualConfigToggled);
- registerField(QLatin1String("manualConfiguration"), button);
+ registerField(QStringLiteral("manualConfiguration"), button);
mServerGroup->addButton(button);
mServerGroup->setId(button, 1);
layout->addWidget(button);
@@ -389,19 +389,19 @@ ConnectionPage::ConnectionPage(QWidget *parent)
mLayout = new QFormLayout;
setLayout(mLayout);
- QRegExp hostnameRegexp(QLatin1String("^[a-z0-9][.a-z0-9-]*[a-z0-9](?::[0-9]+)?$"));
+ QRegExp hostnameRegexp(QStringLiteral("^[a-z0-9][.a-z0-9-]*[a-z0-9](?::[0-9]+)?$"));
mHost = new KLineEdit;
- registerField(QLatin1String("connectionHost*"), mHost);
+ registerField(QStringLiteral("connectionHost*"), mHost);
mHost->setValidator(new QRegExpValidator(hostnameRegexp, this));
mLayout->addRow(i18n("Host"), mHost);
mPath = new KLineEdit;
mLayout->addRow(i18n("Installation path"), mPath);
- registerField(QLatin1String("installationPath"), mPath);
+ registerField(QStringLiteral("installationPath"), mPath);
mUseSecureConnection = new QCheckBox(i18n("Use secure connection"));
mUseSecureConnection->setChecked(true);
- registerField(QLatin1String("connectionUseSecureConnection"), \
mUseSecureConnection); + \
registerField(QStringLiteral("connectionUseSecureConnection"), mUseSecureConnection); \
mLayout->addRow(QString(), mUseSecureConnection);
connect(mHost, &KLineEdit::textChanged, this, \
&ConnectionPage::urlElementChanged); @@ -416,27 +416,27 @@ void \
ConnectionPage::initializePage() return;
}
- QString providerInstallationPath = \
service->property(QLatin1String("X-DavGroupware-InstallationPath")).toString(); + \
QString providerInstallationPath = \
service->property(QStringLiteral("X-DavGroupware-InstallationPath")).toString(); if \
(!providerInstallationPath.isEmpty()) { mPath->setText(providerInstallationPath);
}
- QStringList supportedProtocols = \
service->property(QLatin1String("X-DavGroupware-SupportedProtocols")).toStringList(); \
+ QStringList supportedProtocols = \
service->property(QStringLiteral("X-DavGroupware-SupportedProtocols")).toStringList();
mPreviewLayout = new QFormLayout;
mLayout->addRow(mPreviewLayout);
- if (supportedProtocols.contains(QLatin1String("CalDav"))) {
+ if (supportedProtocols.contains(QStringLiteral("CalDav"))) {
mCalDavUrlLabel = new QLabel(i18n("Final URL (CalDav)"));
mCalDavUrlPreview = new QLabel;
mPreviewLayout->addRow(mCalDavUrlLabel, mCalDavUrlPreview);
}
- if (supportedProtocols.contains(QLatin1String("CardDav"))) {
+ if (supportedProtocols.contains(QStringLiteral("CardDav"))) {
mCardDavUrlLabel = new QLabel(i18n("Final URL (CardDav)"));
mCardDavUrlPreview = new QLabel;
mPreviewLayout->addRow(mCardDavUrlLabel, mCardDavUrlPreview);
}
- if (supportedProtocols.contains(QLatin1String("GroupDav"))) {
+ if (supportedProtocols.contains(QStringLiteral("GroupDav"))) {
mGroupDavUrlLabel = new QLabel(i18n("Final URL (GroupDav)"));
mGroupDavUrlPreview = new QLabel;
mPreviewLayout->addRow(mGroupDavUrlLabel, mGroupDavUrlPreview);
@@ -472,23 +472,23 @@ void ConnectionPage::urlElementChanged()
{
if (mHost->text().isEmpty()) {
if (mCalDavUrlPreview) {
- mCalDavUrlPreview->setText(QLatin1String("-"));
+ mCalDavUrlPreview->setText(QStringLiteral("-"));
}
if (mCardDavUrlPreview) {
- mCardDavUrlPreview->setText(QLatin1String("-"));
+ mCardDavUrlPreview->setText(QStringLiteral("-"));
}
if (mGroupDavUrlPreview) {
- mGroupDavUrlPreview->setText(QLatin1String("-"));
+ mGroupDavUrlPreview->setText(QStringLiteral("-"));
}
} else {
if (mCalDavUrlPreview) {
- mCalDavUrlPreview->setText(settingsToUrl(this->wizard(), \
QLatin1String("CalDav"))); + \
mCalDavUrlPreview->setText(settingsToUrl(this->wizard(), QStringLiteral("CalDav"))); \
} if (mCardDavUrlPreview) {
- mCardDavUrlPreview->setText(settingsToUrl(this->wizard(), \
QLatin1String("CardDav"))); + \
mCardDavUrlPreview->setText(settingsToUrl(this->wizard(), \
QStringLiteral("CardDav"))); }
if (mGroupDavUrlPreview) {
- mGroupDavUrlPreview->setText(settingsToUrl(this->wizard(), \
QLatin1String("GroupDav"))); + \
mGroupDavUrlPreview->setText(settingsToUrl(this->wizard(), \
QStringLiteral("GroupDav"))); }
}
}
@@ -528,8 +528,8 @@ void CheckPage::checkConnection()
davUrl.setProtocol(url.protocol);
KUrl serverUrl(url.url);
- serverUrl.setUser(wizard()->field(QLatin1String("credentialsUserName")).toString());
- serverUrl.setPass(wizard()->field(QLatin1String("credentialsPassword")).toString());
+ serverUrl.setUser(wizard()->field(QStringLiteral("credentialsUserName")).toString());
+ serverUrl.setPass(wizard()->field(QStringLiteral("credentialsPassword")).toString());
davUrl.setUrl(serverUrl);
davUrls << davUrl;
@@ -548,13 +548,13 @@ void CheckPage::onFetchDone(KJob *job)
if (job->error()) {
msg = i18n("An error occurred: %1", job->errorText());
- icon = QIcon::fromTheme(QLatin1String("dialog-close")).pixmap(16, 16);
+ icon = QIcon::fromTheme(QStringLiteral("dialog-close")).pixmap(16, 16);
} else {
msg = i18n("Connected successfully");
- icon = QIcon::fromTheme(QLatin1String("dialog-ok-apply")).pixmap(16, 16);
+ icon = QIcon::fromTheme(QStringLiteral("dialog-ok-apply")).pixmap(16, 16);
}
mStatusLabel->setHtml(QStringLiteral("<html><body><img src=\"icon\"> \
%1</body></html>").arg(msg));
- mStatusLabel->document()->addResource(QTextDocument::ImageResource, \
QUrl(QLatin1String("icon")), QVariant(icon)); + \
mStatusLabel->document()->addResource(QTextDocument::ImageResource, \
QUrl(QStringLiteral("icon")), QVariant(icon)); }
diff --git a/resources/dav/resource/urlconfigurationdialog.cpp \
b/resources/dav/resource/urlconfigurationdialog.cpp index d785728..73d0fc0 100644
--- a/resources/dav/resource/urlconfigurationdialog.cpp
+++ b/resources/dav/resource/urlconfigurationdialog.cpp
@@ -173,7 +173,7 @@ void UrlConfigurationDialog::onFetchButtonClicked()
setRemoteUrl(remoteUrl() + QLatin1Char('/'));
}
- if (!remoteUrl().startsWith(QLatin1String("https://")) && \
!remoteUrl().startsWith(QLatin1String("http://"))) { + if \
(!remoteUrl().startsWith(QStringLiteral("https://")) && \
!remoteUrl().startsWith(QStringLiteral("http://"))) { \
setRemoteUrl(QString("https://") + remoteUrl()); }
@@ -231,7 +231,7 @@ void UrlConfigurationDialog::onModelDataChanged(const QModelIndex \
&topLeft, cons
DavUtils::DavUrl davUrl(fullUrl, protocol());
DavCollectionModifyJob *job = new DavCollectionModifyJob(davUrl);
- job->setProperty(QLatin1String("displayname"), newName);
+ job->setProperty(QStringLiteral("displayname"), newName);
connect(job, &DavCollectionModifyJob::result, this, \
&UrlConfigurationDialog::onChangeDisplayNameFinished); job->start();
mUi.discoveredUrls->setEnabled(false);
diff --git a/resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp \
b/resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp index \
b4e347f..7da553d 100644
--- a/resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp
+++ b/resources/folderarchivesettings/autotests/folderarchiveaccountinfotest.cpp
@@ -50,14 +50,14 @@ void FolderArchiveAccountInfoTest::shouldBeValid()
QVERIFY(!info.isValid());
info.setArchiveTopLevel(Akonadi::Collection(42).id());
QVERIFY(!info.isValid());
- info.setInstanceName(QLatin1String("FOO"));
+ info.setInstanceName(QStringLiteral("FOO"));
QVERIFY(info.isValid());
}
void FolderArchiveAccountInfoTest::shouldRestoreFromSettings()
{
FolderArchiveAccountInfo info;
- info.setInstanceName(QLatin1String("FOO1"));
+ info.setInstanceName(QStringLiteral("FOO1"));
info.setArchiveTopLevel(Akonadi::Collection(42).id());
info.setFolderArchiveType(FolderArchiveAccountInfo::FolderByMonths);
info.setEnabled(true);
diff --git a/resources/folderarchivesettings/folderarchiveaccountinfo.cpp \
b/resources/folderarchivesettings/folderarchiveaccountinfo.cpp index 62ecaaf..791281c \
100644
--- a/resources/folderarchivesettings/folderarchiveaccountinfo.cpp
+++ b/resources/folderarchivesettings/folderarchiveaccountinfo.cpp
@@ -97,8 +97,8 @@ bool FolderArchiveAccountInfo::keepExistingStructure() const
void FolderArchiveAccountInfo::readConfig(const KConfigGroup &config)
{
- mInstanceName = config.readEntry(QLatin1String("instanceName"));
- mArchiveTopLevelCollectionId = \
config.readEntry(QLatin1String("topLevelCollectionId"), -1); + mInstanceName = \
config.readEntry(QStringLiteral("instanceName")); + mArchiveTopLevelCollectionId = \
config.readEntry(QStringLiteral("topLevelCollectionId"), -1);
mArchiveType = static_cast<FolderArchiveType>(config.readEntry("folderArchiveType", \
(int)UniqueFolder)); mEnabled = config.readEntry("enabled", false);
mKeepExistingStructure = config.readEntry("keepExistingStructure", false);
@@ -106,15 +106,15 @@ void FolderArchiveAccountInfo::readConfig(const KConfigGroup \
&config)
void FolderArchiveAccountInfo::writeConfig(KConfigGroup &config)
{
- config.writeEntry(QLatin1String("instanceName"), mInstanceName);
+ config.writeEntry(QStringLiteral("instanceName"), mInstanceName);
if (mArchiveTopLevelCollectionId > -1) {
- config.writeEntry(QLatin1String("topLevelCollectionId"), \
mArchiveTopLevelCollectionId); + \
config.writeEntry(QStringLiteral("topLevelCollectionId"), \
mArchiveTopLevelCollectionId); } else {
- config.deleteEntry(QLatin1String("topLevelCollectionId"));
+ config.deleteEntry(QStringLiteral("topLevelCollectionId"));
}
- config.writeEntry(QLatin1String("folderArchiveType"), (int)mArchiveType);
- config.writeEntry(QLatin1String("enabled"), mEnabled);
+ config.writeEntry(QStringLiteral("folderArchiveType"), (int)mArchiveType);
+ config.writeEntry(QStringLiteral("enabled"), mEnabled);
config.writeEntry("keepExistingStructure", mKeepExistingStructure);
}
diff --git a/resources/folderarchivesettings/folderarchivesettingpage.cpp \
b/resources/folderarchivesettings/folderarchivesettingpage.cpp index 21c9c46..8913877 \
100644
--- a/resources/folderarchivesettings/folderarchivesettingpage.cpp
+++ b/resources/folderarchivesettings/folderarchivesettingpage.cpp
@@ -148,12 +148,12 @@ void FolderArchiveSettingPage::writeSettings()
mInfo->writeConfig(grp);
//Update cache from KMail
- const QString kmailInterface = QLatin1String("org.kde.kmail");
+ const QString kmailInterface = QStringLiteral("org.kde.kmail");
QDBusReply<bool> reply = \
QDBusConnection::sessionBus().interface()->isServiceRegistered(kmailInterface); if \
(!reply.isValid() || !reply.value()) { return;
}
- QDBusInterface kmail(kmailInterface, QLatin1String("/KMail"), \
QLatin1String("org.kde.kmail.kmail"));
- kmail.asyncCall(QLatin1String("reloadFolderArchiveConfig"));
+ QDBusInterface kmail(kmailInterface, QStringLiteral("/KMail"), \
QStringLiteral("org.kde.kmail.kmail")); + \
kmail.asyncCall(QStringLiteral("reloadFolderArchiveConfig")); }
diff --git a/resources/folderarchivesettings/folderarchiveutil.cpp \
b/resources/folderarchivesettings/folderarchiveutil.cpp index f7e2935..de0d3be 100644
--- a/resources/folderarchivesettings/folderarchiveutil.cpp
+++ b/resources/folderarchivesettings/folderarchiveutil.cpp
@@ -21,10 +21,10 @@ using namespace FolderArchive;
QString FolderArchiveUtil::groupConfigPattern()
{
- return QLatin1String("FolderArchiveAccount ");
+ return QStringLiteral("FolderArchiveAccount ");
}
QString FolderArchiveUtil::configFileName()
{
- return QLatin1String("foldermailarchiverc");
+ return QStringLiteral("foldermailarchiverc");
}
diff --git a/resources/icaldir/icaldirresource.cpp \
b/resources/icaldir/icaldirresource.cpp index 2235299..8c5fa4a 100644
--- a/resources/icaldir/icaldirresource.cpp
+++ b/resources/icaldir/icaldirresource.cpp
@@ -44,7 +44,7 @@ using namespace KCalCore;
static Incidence::Ptr readFromFile(const QString &fileName, const QString \
&expectedIdentifier) {
- MemoryCalendar::Ptr calendar = MemoryCalendar::Ptr(new \
MemoryCalendar(QLatin1String("UTC"))); + MemoryCalendar::Ptr calendar = \
MemoryCalendar::Ptr(new MemoryCalendar(QStringLiteral("UTC")));
FileStorage::Ptr fileStorage = FileStorage::Ptr(new FileStorage(calendar, \
fileName, new ICalFormat()));
Incidence::Ptr incidence;
@@ -67,7 +67,7 @@ static bool writeToFile(const QString &fileName, Incidence::Ptr \
&incidence) return false;
}
- MemoryCalendar::Ptr calendar = MemoryCalendar::Ptr(new \
MemoryCalendar(QLatin1String("UTC"))); + MemoryCalendar::Ptr calendar = \
MemoryCalendar::Ptr(new MemoryCalendar(QStringLiteral("UTC")));
FileStorage::Ptr fileStorage = FileStorage::Ptr(new FileStorage(calendar, \
fileName, new ICalFormat())); calendar->addIncidence(incidence);
Q_ASSERT(calendar->incidences().count() == 1);
@@ -85,7 +85,7 @@ ICalDirResource::ICalDirResource(const QString &id)
{
// setup the resource
new SettingsAdaptor(Settings::self());
- QDBusConnection::sessionBus().registerObject(QLatin1String("/Settings"),
+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"),
Settings::self(), QDBusConnection::ExportAdaptors);
changeRecorder()->itemFetchScope().fetchFullPayload();
diff --git a/resources/imap/autotests/dummyresourcestate.cpp \
b/resources/imap/autotests/dummyresourcestate.cpp index 92f147e..8b28f0b 100644
--- a/resources/imap/autotests/dummyresourcestate.cpp
+++ b/resources/imap/autotests/dummyresourcestate.cpp
@@ -252,7 +252,7 @@ Akonadi::Relation::List DummyResourceState::removedRelations() \
const
QString DummyResourceState::rootRemoteId() const
{
- return QLatin1String("root-id");
+ return QStringLiteral("root-id");
}
void DummyResourceState::setIdleCollection(const Akonadi::Collection &collection)
diff --git a/resources/imap/changecollectiontask.cpp \
b/resources/imap/changecollectiontask.cpp index cad8447..3e31106 100644
--- a/resources/imap/changecollectiontask.cpp
+++ b/resources/imap/changecollectiontask.cpp
@@ -137,7 +137,7 @@ void ChangeCollectionTask::doStart(KIMAP::Session *session)
foreach (const QByteArray &entry, annotations.keys()) { \
//krazy:exclude=foreach
KIMAP::SetMetaDataJob *job = new KIMAP::SetMetaDataJob(session);
- if (serverCapabilities().contains(QLatin1String("METADATA"))) {
+ if (serverCapabilities().contains(QStringLiteral("METADATA"))) {
job->setServerCapability(KIMAP::MetaDataJobBase::Metadata);
} else {
job->setServerCapability(KIMAP::MetaDataJobBase::Annotatemore);
diff --git a/resources/imap/imapresource.cpp b/resources/imap/imapresource.cpp
index 6f61503..4af9510 100644
--- a/resources/imap/imapresource.cpp
+++ b/resources/imap/imapresource.cpp
@@ -56,7 +56,7 @@ QDialog *ImapResource::createConfigureDialog(WId windowId)
{
SetupServer *dlg = new SetupServer(this, windowId);
KWindowSystem::setMainWindow(dlg, windowId);
- dlg->setWindowIcon(QIcon::fromTheme(QLatin1String("network-server")));
+ dlg->setWindowIcon(QIcon::fromTheme(QStringLiteral("network-server")));
connect(dlg, &SetupServer::finished, this, &ImapResource::onConfigurationDone);
return dlg;
}
diff --git a/resources/imap/resourcetask.cpp b/resources/imap/resourcetask.cpp
index 278dbf8..59532cd 100644
--- a/resources/imap/resourcetask.cpp
+++ b/resources/imap/resourcetask.cpp
@@ -555,16 +555,16 @@ void ResourceTask::setSeparatorCharacter(const QChar \
&separator)
bool ResourceTask::serverSupportsAnnotations() const
{
- return serverCapabilities().contains(QLatin1String("METADATA"))
- || serverCapabilities().contains(QLatin1String("ANNOTATEMORE"));
+ return serverCapabilities().contains(QStringLiteral("METADATA"))
+ || serverCapabilities().contains(QStringLiteral("ANNOTATEMORE"));
}
bool ResourceTask::serverSupportsCondstore() const
{
// Don't enable CONDSTORE for GMail (X-GM-EXT-1 is a GMail-specific capability)
// because it breaks changes synchronization when using labels.
- return serverCapabilities().contains(QLatin1String("CONDSTORE")) &&
- !serverCapabilities().contains(QLatin1String("X-GM-EXT-1"));
+ return serverCapabilities().contains(QStringLiteral("CONDSTORE")) &&
+ !serverCapabilities().contains(QStringLiteral("X-GM-EXT-1"));
}
int ResourceTask::batchSize() const
diff --git a/resources/imap/subscriptiondialog.cpp \
b/resources/imap/subscriptiondialog.cpp index 7079ea4..b34307f 100644
--- a/resources/imap/subscriptiondialog.cpp
+++ b/resources/imap/subscriptiondialog.cpp
@@ -138,7 +138,7 @@ SubscriptionDialog::SubscriptionDialog(QWidget *parent, \
SubscriptionDialog::Subs
KDescendantsProxyModel *flatModel = new KDescendantsProxyModel(m_listView);
flatModel->setDisplayAncestorData(true);
- flatModel->setAncestorSeparator(QLatin1String("/"));
+ flatModel->setAncestorSeparator(QStringLiteral("/"));
flatModel->setSourceModel(m_model);
CheckableFilterProxyModel *checkableModel = new \
CheckableFilterProxyModel(m_listView);
diff --git a/resources/openxchange/oxa/objectcreatejob.cpp \
b/resources/openxchange/oxa/objectcreatejob.cpp index bb27545..d0a8383 100644
--- a/resources/openxchange/oxa/objectcreatejob.cpp
+++ b/resources/openxchange/oxa/objectcreatejob.cpp
@@ -43,9 +43,9 @@ void ObjectCreateJob::start()
job->start();
} else {
QDomDocument document;
- QDomElement propertyupdate = DAVUtils::addDavElement(document, document, \
QLatin1String("propertyupdate"));
- QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QLatin1String("set"));
- QDomElement prop = DAVUtils::addDavElement(document, set, \
QLatin1String("prop")); + QDomElement propertyupdate = \
DAVUtils::addDavElement(document, document, QStringLiteral("propertyupdate")); + \
QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QStringLiteral("set")); + QDomElement prop = DAVUtils::addDavElement(document, \
set, QStringLiteral("prop"));
ObjectUtils::addObjectElements(document, prop, mObject);
@@ -66,9 +66,9 @@ void ObjectCreateJob::preloadingJobFinished(KJob *job)
void *preloadedData = ObjectUtils::preloadData(mObject, job);
QDomDocument document;
- QDomElement propertyupdate = DAVUtils::addDavElement(document, document, \
QLatin1String("propertyupdate"));
- QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QLatin1String("set"));
- QDomElement prop = DAVUtils::addDavElement(document, set, \
QLatin1String("prop")); + QDomElement propertyupdate = \
DAVUtils::addDavElement(document, document, QStringLiteral("propertyupdate")); + \
QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QStringLiteral("set")); + QDomElement prop = DAVUtils::addDavElement(document, \
set, QStringLiteral("prop"));
ObjectUtils::addObjectElements(document, prop, mObject, preloadedData);
@@ -100,15 +100,15 @@ void ObjectCreateJob::davJobFinished(KJob *job)
}
QDomElement multistatus = document.documentElement();
- QDomElement response = multistatus.firstChildElement(QLatin1String("response"));
+ QDomElement response = \
multistatus.firstChildElement(QStringLiteral("response")); const QDomNodeList props \
= response.elementsByTagName("prop"); const QDomElement prop = \
props.at(0).toElement();
QDomElement element = prop.firstChildElement();
while (!element.isNull()) {
- if (element.tagName() == QLatin1String("object_id")) {
+ if (element.tagName() == QStringLiteral("object_id")) {
mObject.setObjectId(OXUtils::readNumber(element.text()));
- } else if (element.tagName() == QLatin1String("last_modified")) {
+ } else if (element.tagName() == QStringLiteral("last_modified")) {
mObject.setLastModified(OXUtils::readString(element.text()));
}
diff --git a/resources/openxchange/oxa/objectdeletejob.cpp \
b/resources/openxchange/oxa/objectdeletejob.cpp index 05b7d03..ad0dd8b 100644
--- a/resources/openxchange/oxa/objectdeletejob.cpp
+++ b/resources/openxchange/oxa/objectdeletejob.cpp
@@ -38,13 +38,13 @@ ObjectDeleteJob::ObjectDeleteJob(const Object &object, QObject \
*parent) void ObjectDeleteJob::start()
{
QDomDocument document;
- QDomElement propertyupdate = DAVUtils::addDavElement(document, document, \
QLatin1String("propertyupdate"));
- QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QLatin1String("set"));
- QDomElement prop = DAVUtils::addDavElement(document, set, \
QLatin1String("prop"));
- DAVUtils::addOxElement(document, prop, QLatin1String("object_id"), \
OXUtils::writeNumber(mObject.objectId()));
- DAVUtils::addOxElement(document, prop, QLatin1String("folder_id"), \
OXUtils::writeNumber(mObject.folderId()));
- DAVUtils::addOxElement(document, prop, QLatin1String("method"), \
OXUtils::writeString(QLatin1String("DELETE")));
- DAVUtils::addOxElement(document, prop, QLatin1String("last_modified"), \
OXUtils::writeString(mObject.lastModified())); + QDomElement propertyupdate = \
DAVUtils::addDavElement(document, document, QStringLiteral("propertyupdate")); + \
QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QStringLiteral("set")); + QDomElement prop = DAVUtils::addDavElement(document, \
set, QStringLiteral("prop")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("object_id"), OXUtils::writeNumber(mObject.objectId())); + \
DAVUtils::addOxElement(document, prop, QStringLiteral("folder_id"), \
OXUtils::writeNumber(mObject.folderId())); + DAVUtils::addOxElement(document, \
prop, QStringLiteral("method"), OXUtils::writeString(QStringLiteral("DELETE"))); + \
DAVUtils::addOxElement(document, prop, QStringLiteral("last_modified"), \
OXUtils::writeString(mObject.lastModified()));
const QString path = ObjectUtils::davPath(mObject.module());
diff --git a/resources/openxchange/oxa/objectmovejob.cpp \
b/resources/openxchange/oxa/objectmovejob.cpp index a4447e7..b8d12a2 100644
--- a/resources/openxchange/oxa/objectmovejob.cpp
+++ b/resources/openxchange/oxa/objectmovejob.cpp
@@ -38,13 +38,13 @@ ObjectMoveJob::ObjectMoveJob(const Object &object, const Folder \
&destinationFold void ObjectMoveJob::start()
{
QDomDocument document;
- QDomElement propertyupdate = DAVUtils::addDavElement(document, document, \
QLatin1String("propertyupdate"));
- QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QLatin1String("set"));
- QDomElement prop = DAVUtils::addDavElement(document, set, \
QLatin1String("prop"));
- DAVUtils::addOxElement(document, prop, QLatin1String("object_id"), \
OXUtils::writeNumber(mObject.objectId()));
- DAVUtils::addOxElement(document, prop, QLatin1String("folder_id"), \
OXUtils::writeNumber(mObject.folderId()));
- DAVUtils::addOxElement(document, prop, QLatin1String("last_modified"), \
OXUtils::writeString(mObject.lastModified()));
- DAVUtils::addOxElement(document, prop, QLatin1String("folder"), \
OXUtils::writeNumber(mDestinationFolder.objectId())); + QDomElement propertyupdate \
= DAVUtils::addDavElement(document, document, QStringLiteral("propertyupdate")); + \
QDomElement set = DAVUtils::addDavElement(document, propertyupdate, \
QStringLiteral("set")); + QDomElement prop = DAVUtils::addDavElement(document, \
set, QStringLiteral("prop")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("object_id"), OXUtils::writeNumber(mObject.objectId())); + \
DAVUtils::addOxElement(document, prop, QStringLiteral("folder_id"), \
OXUtils::writeNumber(mObject.folderId())); + DAVUtils::addOxElement(document, \
prop, QStringLiteral("last_modified"), OXUtils::writeString(mObject.lastModified())); \
+ DAVUtils::addOxElement(document, prop, QStringLiteral("folder"), \
OXUtils::writeNumber(mDestinationFolder.objectId()));
const QString path = ObjectUtils::davPath(mObject.module());
@@ -79,13 +79,13 @@ void ObjectMoveJob::davJobFinished(KJob *job)
}
QDomElement multistatus = document.documentElement();
- QDomElement response = multistatus.firstChildElement(QLatin1String("response"));
+ QDomElement response = \
multistatus.firstChildElement(QStringLiteral("response")); const QDomNodeList props \
= response.elementsByTagName("prop"); const QDomElement prop = \
props.at(0).toElement();
QDomElement element = prop.firstChildElement();
while (!element.isNull()) {
- if (element.tagName() == QLatin1String("last_modified")) {
+ if (element.tagName() == QStringLiteral("last_modified")) {
mObject.setLastModified(OXUtils::readString(element.text()));
}
diff --git a/resources/openxchange/oxa/objectrequestjob.cpp \
b/resources/openxchange/oxa/objectrequestjob.cpp index 3d3decc..302cc6e 100644
--- a/resources/openxchange/oxa/objectrequestjob.cpp
+++ b/resources/openxchange/oxa/objectrequestjob.cpp
@@ -38,9 +38,9 @@ ObjectRequestJob::ObjectRequestJob(const Object &object, QObject \
*parent) void ObjectRequestJob::start()
{
QDomDocument document;
- QDomElement multistatus = DAVUtils::addDavElement(document, document, \
QLatin1String("multistatus"));
- QDomElement prop = DAVUtils::addDavElement(document, multistatus, \
QLatin1String("prop"));
- DAVUtils::addOxElement(document, prop, QLatin1String("object_id"), \
OXUtils::writeNumber(mObject.objectId())); + QDomElement multistatus = \
DAVUtils::addDavElement(document, document, QStringLiteral("multistatus")); + \
QDomElement prop = DAVUtils::addDavElement(document, multistatus, \
QStringLiteral("prop")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("object_id"), OXUtils::writeNumber(mObject.objectId()));
const QString path = ObjectUtils::davPath(mObject.module());
@@ -75,7 +75,7 @@ void ObjectRequestJob::davJobFinished(KJob *job)
}
QDomElement multistatus = document.documentElement();
- QDomElement response = multistatus.firstChildElement(QLatin1String("response"));
+ QDomElement response = \
multistatus.firstChildElement(QStringLiteral("response")); const QDomNodeList props \
= response.elementsByTagName("prop"); const QDomElement prop = \
props.at(0).toElement(); mObject = ObjectUtils::parseObject(prop, mObject.module());
diff --git a/resources/openxchange/oxa/objectsrequestjob.cpp \
b/resources/openxchange/oxa/objectsrequestjob.cpp index aa4d3ab..5e5d420 100644
--- a/resources/openxchange/oxa/objectsrequestjob.cpp
+++ b/resources/openxchange/oxa/objectsrequestjob.cpp
@@ -40,14 +40,14 @@ ObjectsRequestJob::ObjectsRequestJob(const Folder &folder, \
qulonglong lastSync, void ObjectsRequestJob::start()
{
QDomDocument document;
- QDomElement multistatus = DAVUtils::addDavElement(document, document, \
QLatin1String("multistatus"));
- QDomElement prop = DAVUtils::addDavElement(document, multistatus, \
QLatin1String("prop"));
- DAVUtils::addOxElement(document, prop, QLatin1String("folder_id"), \
OXUtils::writeNumber(mFolder.objectId()));
- DAVUtils::addOxElement(document, prop, QLatin1String("lastsync"), \
OXUtils::writeNumber(mLastSync)); + QDomElement multistatus = \
DAVUtils::addDavElement(document, document, QStringLiteral("multistatus")); + \
QDomElement prop = DAVUtils::addDavElement(document, multistatus, \
QStringLiteral("prop")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("folder_id"), OXUtils::writeNumber(mFolder.objectId())); + \
DAVUtils::addOxElement(document, prop, QStringLiteral("lastsync"), \
OXUtils::writeNumber(mLastSync)); if (mMode == Modified) {
- DAVUtils::addOxElement(document, prop, QLatin1String("objectmode"), \
QLatin1String("MODIFIED")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("objectmode"), QStringLiteral("MODIFIED")); } else {
- DAVUtils::addOxElement(document, prop, QLatin1String("objectmode"), \
QLatin1String("DELETED")); + DAVUtils::addOxElement(document, prop, \
QStringLiteral("objectmode"), QStringLiteral("DELETED")); }
const QString path = ObjectUtils::davPath(mFolder.module());
@@ -83,7 +83,7 @@ void ObjectsRequestJob::davJobFinished(KJob *job)
}
QDomElement multistatus = document.documentElement();
- QDomElement response = multistatus.firstChildElement(QLatin1String("response"));
+ QDomElement response = \
multistatus.firstChildElement(QStringLiteral("response")); while \
(!response.isNull()) { const QDomNodeList props = \
response.elementsByTagName("prop"); const QDomElement prop = \
props.at(0).toElement();
diff --git a/resources/vcard/vcardresource.cpp b/resources/vcard/vcardresource.cpp
index bfac52e..4d9202b 100644
--- a/resources/vcard/vcardresource.cpp
+++ b/resources/vcard/vcardresource.cpp
@@ -35,10 +35,10 @@ using namespace Akonadi_VCard_Resource;
VCardResource::VCardResource(const QString &id)
: SingleFileResource<Settings>(id)
{
- setSupportedMimetypes(QStringList() << KContacts::Addressee::mimeType(), \
QLatin1String("office-address-book")); + setSupportedMimetypes(QStringList() << \
KContacts::Addressee::mimeType(), QStringLiteral("office-address-book"));
new VCardSettingsAdaptor(mSettings);
- KDBusConnectionPool::threadConnection().registerObject(QLatin1String("/Settings"),
+ KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Settings"),
mSettings, QDBusConnection::ExportAdaptors);
}
@@ -71,8 +71,8 @@ void VCardResource::aboutToQuit()
void VCardResource::customizeConfigDialog(SingleFileResourceConfigDialog<Settings> \
*dlg) {
- dlg->setWindowIcon(QIcon::fromTheme(QLatin1String("text-directory")));
- dlg->setFilter(QLatin1String("*.vcf|") + i18nc("Filedialog filter for *.vcf", \
"vCard Address Book File")); + \
dlg->setWindowIcon(QIcon::fromTheme(QStringLiteral("text-directory"))); + \
dlg->setFilter(QStringLiteral("*.vcf|") + i18nc("Filedialog filter for *.vcf", "vCard \
Address Book File")); dlg->setWindowTitle(i18n("Select Address Book"));
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic