From 96740b5c1364f3ef4a32110ea98dde6128e922fc Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 2 Aug 2018 15:41:55 +0200 Subject: Cleanup --- examples/caldavresource/caldavresource.cpp | 4 ++-- examples/webdavcommon/webdav.cpp | 8 ++++---- examples/webdavcommon/webdav.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/caldavresource/caldavresource.cpp b/examples/caldavresource/caldavresource.cpp index d33f625..8574575 100644 --- a/examples/caldavresource/caldavresource.cpp +++ b/examples/caldavresource/caldavresource.cpp @@ -130,7 +130,7 @@ protected: switch (operation) { case Sink::Operation_Creation: { auto rawIcal = localItem.getIcal(); - if (rawIcal == "") { + if (rawIcal.isEmpty()) { return KAsync::error("No ICal in item for creation replay"); } @@ -152,7 +152,7 @@ protected: } case Sink::Operation_Modification: auto rawIcal = localItem.getIcal(); - if (rawIcal == "") { + if (rawIcal.isEmpty()) { return KAsync::error("No ICal in item for modification replay"); } diff --git a/examples/webdavcommon/webdav.cpp b/examples/webdavcommon/webdav.cpp index e13d121..904e1e2 100644 --- a/examples/webdavcommon/webdav.cpp +++ b/examples/webdavcommon/webdav.cpp @@ -97,8 +97,8 @@ WebDavSynchronizer::WebDavSynchronizer(const Sink::ResourceContext &context, { auto config = ResourceConfig::getConfiguration(context.instanceId()); - server = QUrl::fromUserInput(config.value("server").toString()); - username = config.value("username").toString(); + mServer = QUrl::fromUserInput(config.value("server").toString()); + mUsername = config.value("username").toString(); } QList WebDavSynchronizer::getSyncRequests(const Sink::QueryBase &query) @@ -322,8 +322,8 @@ KDAV2::DavUrl WebDavSynchronizer::serverUrl() const return {}; } - auto result = server; - result.setUserName(username); + auto result = mServer; + result.setUserName(mUsername); result.setPassword(secret()); return KDAV2::DavUrl{ result, protocol }; diff --git a/examples/webdavcommon/webdav.h b/examples/webdavcommon/webdav.h index ecb6a81..813da60 100644 --- a/examples/webdavcommon/webdav.h +++ b/examples/webdavcommon/webdav.h @@ -112,6 +112,6 @@ private: const QByteArray collectionName; const QByteArray itemName; - QUrl server; - QString username; + QUrl mServer; + QString mUsername; }; -- cgit v1.2.3