6 files changed, 22 insertions, 21 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index df44ce5..e8bb055 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -69,7 +69,7 @@ set(command_SRCS
     changereplay.cpp
     adaptorfactoryregistry.cpp
     synchronizer.cpp
-    remoteidmap.cpp
+    synchronizerstore.cpp
     mailpreprocessor.cpp
     specialpurposepreprocessor.cpp
     datastorequery.cpp
diff --git a/common/inspector.h b/common/inspector.h
index ff167b1..a746f03 100644
--- a/common/inspector.h
+++ b/common/inspector.h
@@ -25,6 +25,7 @@
 
 #include "notification.h"
 #include "resourcecontext.h"
+#include "synchronizerstore.h"
 
 namespace Sink {
 
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index f7dd816..11c7caf 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -22,7 +22,7 @@
 #include "definitions.h"
 #include "commands.h"
 #include "bufferutils.h"
-#include "remoteidmap.h"
+#include "synchronizerstore.h"
 #include "datastorequery.h"
 #include "createentity_generated.h"
 #include "modifyentity_generated.h"
@@ -66,10 +66,10 @@ Storage::EntityStore &Synchronizer::store()
     return *mEntityStore;
 }
 
-RemoteIdMap &Synchronizer::syncStore()
+SynchronizerStore &Synchronizer::syncStore()
 {
     if (!mSyncStore) {
-        mSyncStore = QSharedPointer<RemoteIdMap>::create(syncTransaction());
+        mSyncStore = QSharedPointer<SynchronizerStore>::create(syncTransaction());
     }
     return *mSyncStore;
 }
diff --git a/common/synchronizer.h b/common/synchronizer.h
index ae597bd..989f902 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -28,10 +28,10 @@
 #include <storage.h>
 #include <storage/entitystore.h>
 #include "changereplay.h"
-#include "remoteidmap.h"
+#include "synchronizerstore.h"
 
 namespace Sink {
-class RemoteIdMap;
+class SynchronizerStore;
 
 /**
  * Synchronize and add what we don't already have to local queue
@@ -51,7 +51,7 @@ public:
     Storage::EntityStore &store();
 
     //Read/Write access to sync storage
-    RemoteIdMap &syncStore();
+    SynchronizerStore &syncStore();
 
     void commit();
     Sink::Storage::DataStore::Transaction &syncTransaction();
@@ -171,7 +171,7 @@ private:
 
     Sink::ResourceContext mResourceContext;
     Sink::Storage::EntityStore::Ptr mEntityStore;
-    QSharedPointer<RemoteIdMap> mSyncStore;
+    QSharedPointer<SynchronizerStore> mSyncStore;
     Sink::Storage::DataStore mSyncStorage;
     Sink::Storage::DataStore::Transaction mSyncTransaction;
     std::function<void(int commandId, const QByteArray &data)> mEnqueue;
diff --git a/common/remoteidmap.cpp b/common/synchronizerstore.cpp
index a16473d..fcb3ed0 100644
--- a/common/remoteidmap.cpp
+++ b/common/synchronizerstore.cpp
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "remoteidmap.h"
+#include "synchronizerstore.h"
 
 #include <QUuid>
 #include "index.h"
@@ -25,34 +25,34 @@
 
 using namespace Sink;
 
-SINK_DEBUG_AREA("remoteidmap")
+SINK_DEBUG_AREA("synchronizerstore")
 
-RemoteIdMap::RemoteIdMap(Sink::Storage::DataStore::Transaction &transaction)
+SynchronizerStore::SynchronizerStore(Sink::Storage::DataStore::Transaction &transaction)
     : mTransaction(transaction)
 {
 
 }
 
-void RemoteIdMap::recordRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
+void SynchronizerStore::recordRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
 {
     Index("rid.mapping." + bufferType, mTransaction).add(remoteId, localId);
     Index("localid.mapping." + bufferType, mTransaction).add(localId, remoteId);
 }
 
-void RemoteIdMap::removeRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
+void SynchronizerStore::removeRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
 {
     Index("rid.mapping." + bufferType, mTransaction).remove(remoteId, localId);
     Index("localid.mapping." + bufferType, mTransaction).remove(localId, remoteId);
 }
 
-void RemoteIdMap::updateRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
+void SynchronizerStore::updateRemoteId(const QByteArray &bufferType, const QByteArray &localId, const QByteArray &remoteId)
 {
     const auto oldRemoteId = Index("localid.mapping." + bufferType, mTransaction).lookup(localId);
     removeRemoteId(bufferType, localId, oldRemoteId);
     recordRemoteId(bufferType, localId, remoteId);
 }
 
-QByteArray RemoteIdMap::resolveRemoteId(const QByteArray &bufferType, const QByteArray &remoteId)
+QByteArray SynchronizerStore::resolveRemoteId(const QByteArray &bufferType, const QByteArray &remoteId)
 {
     // Lookup local id for remote id, or insert a new pair otherwise
     Index index("rid.mapping." + bufferType, mTransaction);
@@ -65,7 +65,7 @@ QByteArray RemoteIdMap::resolveRemoteId(const QByteArray &bufferType, const QByt
     return sinkId;
 }
 
-QByteArray RemoteIdMap::resolveLocalId(const QByteArray &bufferType, const QByteArray &localId)
+QByteArray SynchronizerStore::resolveLocalId(const QByteArray &bufferType, const QByteArray &localId)
 {
     QByteArray remoteId = Index("localid.mapping." + bufferType, mTransaction).lookup(localId);
     if (remoteId.isEmpty()) {
@@ -75,7 +75,7 @@ QByteArray RemoteIdMap::resolveLocalId(const QByteArray &bufferType, const QByte
     return remoteId;
 }
 
-QByteArrayList RemoteIdMap::resolveLocalIds(const QByteArray &bufferType, const QByteArrayList &localIds)
+QByteArrayList SynchronizerStore::resolveLocalIds(const QByteArray &bufferType, const QByteArrayList &localIds)
 {
     QByteArrayList result;
     for (const auto &l : localIds) {
@@ -84,7 +84,7 @@ QByteArrayList RemoteIdMap::resolveLocalIds(const QByteArray &bufferType, const
     return result;
 }
 
-QByteArray RemoteIdMap::readValue(const QByteArray &key)
+QByteArray SynchronizerStore::readValue(const QByteArray &key)
 {
     QByteArray value;
     mTransaction.openDatabase("values").scan(key, [&value](const QByteArray &, const QByteArray &v) {
@@ -96,7 +96,7 @@ QByteArray RemoteIdMap::readValue(const QByteArray &key)
     return value;
 }
 
-void RemoteIdMap::writeValue(const QByteArray &key, const QByteArray &value)
+void SynchronizerStore::writeValue(const QByteArray &key, const QByteArray &value)
 {
     mTransaction.openDatabase("values").write(key, value);
 }
diff --git a/common/remoteidmap.h b/common/synchronizerstore.h
index 52e05d7..be33562 100644
--- a/common/remoteidmap.h
+++ b/common/synchronizerstore.h
@@ -29,10 +29,10 @@ namespace Sink {
 /**
  * A remoteId mapping
  */
-class SINK_EXPORT RemoteIdMap
+class SINK_EXPORT SynchronizerStore
 {
 public:
-    RemoteIdMap(Sink::Storage::DataStore::Transaction &);
+    SynchronizerStore(Sink::Storage::DataStore::Transaction &);
 
     /**
      * Records a localId to remoteId mapping