6 files changed, 16 insertions, 4 deletions

diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 688f47b..a17fc88 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -127,3 +127,7 @@ void ChangeReplay::revisionChanged()
     }
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "changereplay.moc"
+#pragma clang diagnostic pop
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 94ed546..87b6da1 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -40,10 +40,6 @@
 #include <QDataStream>
 #include <QTime>
 
-//This is the resources entity type, and not the domain type
-#define ENTITY_TYPE_MAIL "mail"
-#define ENTITY_TYPE_FOLDER "folder"
-
 static int sBatchSize = 100;
 // This interval directly affects the roundtrip time of single commands
 static int sCommitInterval = 10;
diff --git a/common/query.cpp b/common/query.cpp
index 75d2a2e..fd99367 100644
--- a/common/query.cpp
+++ b/common/query.cpp
@@ -59,6 +59,7 @@ bool Query::Comparator::matches(const QVariant &v) const
                 return false;
             }
             return v.value<QByteArrayList>().contains(value.toByteArray());
+        case Invalid:
         default:
             break;
     }
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 526ce6d..ba04b2f 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -209,3 +209,8 @@ IdentityFacade::IdentityFacade() : LocalStorageFacade<Sink::ApplicationDomain::I
 IdentityFacade::~IdentityFacade()
 {
 }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "resourcefacade.moc"
+#pragma clang diagnostic pop
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 46712b5..be969d2 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -40,6 +40,11 @@ Synchronizer::Synchronizer(const QByteArray &resourceType, const QByteArray &res
     Trace() << "Starting synchronizer: " << resourceType << resourceInstanceIdentifier;
 }
 
+Synchronizer::~Synchronizer()
+{
+
+}
+
 void Synchronizer::setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback)
 {
     mEnqueue = enqueueCommandCallback;
diff --git a/common/synchronizer.h b/common/synchronizer.h
index 8442aa2..6521876 100644
--- a/common/synchronizer.h
+++ b/common/synchronizer.h
@@ -38,6 +38,7 @@ class SINK_EXPORT Synchronizer
 {
 public:
     Synchronizer(const QByteArray &resourceType, const QByteArray &resourceInstanceIdentifier);
+    virtual ~Synchronizer();
 
     void setup(const std::function<void(int commandId, const QByteArray &data)> &enqueueCommandCallback);
     KAsync::Job<void> synchronize();