summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2018-08-02 15:41:55 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2018-08-02 20:00:37 +0200
commit96740b5c1364f3ef4a32110ea98dde6128e922fc (patch)
tree675f8d7eb7bd717e2b7ae92cf0931263ec97ae0a
parentdacf52300b389c9ab2a6141423962202b84da6d8 (diff)
downloadsink-96740b5c1364f3ef4a32110ea98dde6128e922fc.tar.gz
sink-96740b5c1364f3ef4a32110ea98dde6128e922fc.zip
Cleanup
-rw-r--r--examples/caldavresource/caldavresource.cpp4
-rw-r--r--examples/webdavcommon/webdav.cpp8
-rw-r--r--examples/webdavcommon/webdav.h4
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:
130 switch (operation) { 130 switch (operation) {
131 case Sink::Operation_Creation: { 131 case Sink::Operation_Creation: {
132 auto rawIcal = localItem.getIcal(); 132 auto rawIcal = localItem.getIcal();
133 if (rawIcal == "") { 133 if (rawIcal.isEmpty()) {
134 return KAsync::error<QByteArray>("No ICal in item for creation replay"); 134 return KAsync::error<QByteArray>("No ICal in item for creation replay");
135 } 135 }
136 136
@@ -152,7 +152,7 @@ protected:
152 } 152 }
153 case Sink::Operation_Modification: 153 case Sink::Operation_Modification:
154 auto rawIcal = localItem.getIcal(); 154 auto rawIcal = localItem.getIcal();
155 if (rawIcal == "") { 155 if (rawIcal.isEmpty()) {
156 return KAsync::error<QByteArray>("No ICal in item for modification replay"); 156 return KAsync::error<QByteArray>("No ICal in item for modification replay");
157 } 157 }
158 158
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,
97{ 97{
98 auto config = ResourceConfig::getConfiguration(context.instanceId()); 98 auto config = ResourceConfig::getConfiguration(context.instanceId());
99 99
100 server = QUrl::fromUserInput(config.value("server").toString()); 100 mServer = QUrl::fromUserInput(config.value("server").toString());
101 username = config.value("username").toString(); 101 mUsername = config.value("username").toString();
102} 102}
103 103
104QList<Sink::Synchronizer::SyncRequest> WebDavSynchronizer::getSyncRequests(const Sink::QueryBase &query) 104QList<Sink::Synchronizer::SyncRequest> WebDavSynchronizer::getSyncRequests(const Sink::QueryBase &query)
@@ -322,8 +322,8 @@ KDAV2::DavUrl WebDavSynchronizer::serverUrl() const
322 return {}; 322 return {};
323 } 323 }
324 324
325 auto result = server; 325 auto result = mServer;
326 result.setUserName(username); 326 result.setUserName(mUsername);
327 result.setPassword(secret()); 327 result.setPassword(secret());
328 328
329 return KDAV2::DavUrl{ result, protocol }; 329 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:
112 const QByteArray collectionName; 112 const QByteArray collectionName;
113 const QByteArray itemName; 113 const QByteArray itemName;
114 114
115 QUrl server; 115 QUrl mServer;
116 QString username; 116 QString mUsername;
117}; 117};