From e2d079fe6ab395558360a94cf383e7cecd17ed5b Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 17 Aug 2018 20:21:53 +0200
Subject: Members start with m

---
 examples/webdavcommon/webdav.cpp | 21 +++++++++++----------
 examples/webdavcommon/webdav.h   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/examples/webdavcommon/webdav.cpp b/examples/webdavcommon/webdav.cpp
index 904e1e2..ffda34a 100644
--- a/examples/webdavcommon/webdav.cpp
+++ b/examples/webdavcommon/webdav.cpp
@@ -89,11 +89,11 @@ static KAsync::Job<T> runJob(KJob *job, const std::function<T(KJob *)> &func)
 }
 
 WebDavSynchronizer::WebDavSynchronizer(const Sink::ResourceContext &context,
-    KDAV2::Protocol protocol, QByteArray collectionName, QByteArray itemName)
+    KDAV2::Protocol protocol, QByteArray mCollectionType, QByteArray mEntityType)
     : Sink::Synchronizer(context),
       protocol(protocol),
-      collectionName(std::move(collectionName)),
-      itemName(std::move(itemName))
+      mCollectionType(std::move(mCollectionType)),
+      mEntityType(std::move(mEntityType))
 {
     auto config = ResourceConfig::getConfiguration(context.instanceId());
 
@@ -111,15 +111,16 @@ QList<Sink::Synchronizer::SyncRequest> WebDavSynchronizer::getSyncRequests(const
         // We want to synchronize everything
 
         // Item synchronization does the collections anyway
-        // list << Synchronizer::SyncRequest{ Sink::QueryBase(collectionName) };
-        list << Synchronizer::SyncRequest{ Sink::QueryBase(itemName) };
+        // list << Synchronizer::SyncRequest{ Sink::QueryBase(mCollectionType) };
+        list << Synchronizer::SyncRequest{ Sink::QueryBase(mEntityType) };
     }
     return list;
 }
 
 KAsync::Job<void> WebDavSynchronizer::synchronizeWithSource(const Sink::QueryBase &query)
 {
-    if (query.type() != collectionName && query.type() != itemName) {
+    if (query.type() != mCollectionType && query.type() != mEntityType) {
+        SinkWarning() << "Received synchronization reuqest with unkown type" << query;
         return KAsync::null<void>();
     }
 
@@ -133,10 +134,10 @@ KAsync::Job<void> WebDavSynchronizer::synchronizeWithSource(const Sink::QueryBas
                        return collections;
                    });
 
-    if (query.type() == collectionName) {
+    if (query.type() == mCollectionType) {
         // Do nothing more
         return job;
-    } else if (query.type() == itemName) {
+    } else if (query.type() == mEntityType) {
         auto progress = QSharedPointer<int>::create(0);
         auto total = QSharedPointer<int>::create(0);
 
@@ -160,13 +161,13 @@ KAsync::Job<void> WebDavSynchronizer::synchronizeWithSource(const Sink::QueryBas
                 auto itemsResourceIDs = QSharedPointer<QSet<QByteArray>>::create();
                 return synchronizeCollection(collection, progress, total, itemsResourceIDs)
                 .then([=] {
-                    scanForRemovals(itemName, [&itemsResourceIDs](const QByteArray &remoteId) {
+                    scanForRemovals(mEntityType, [&itemsResourceIDs](const QByteArray &remoteId) {
                         return itemsResourceIDs->contains(remoteId);
                     });
                 });
             })
             .then([=]() {
-                scanForRemovals(collectionName, [&collectionResourceIDs](const QByteArray &remoteId) {
+                scanForRemovals(mCollectionType, [&collectionResourceIDs](const QByteArray &remoteId) {
                     return collectionResourceIDs->contains(remoteId);
                 });
             });
diff --git a/examples/webdavcommon/webdav.h b/examples/webdavcommon/webdav.h
index 813da60..af6c47e 100644
--- a/examples/webdavcommon/webdav.h
+++ b/examples/webdavcommon/webdav.h
@@ -109,8 +109,8 @@ protected:
 
 private:
     KDAV2::Protocol protocol;
-    const QByteArray collectionName;
-    const QByteArray itemName;
+    const QByteArray mCollectionType;
+    const QByteArray mEntityType;
 
     QUrl mServer;
     QString mUsername;
-- 
cgit v1.2.3