6 files changed, 2 insertions, 26 deletions

diff --git a/common/commandprocessor.cpp b/common/commandprocessor.cpp
index 3507ef1..8b6e685 100644
--- a/common/commandprocessor.cpp
+++ b/common/commandprocessor.cpp
@@ -364,8 +364,3 @@ KAsync::Job<void> CommandProcessor::processAllMessages()
         });
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
-#include "commandprocessor.moc"
-#include "moc_commandprocessor.cpp"
-#pragma clang diagnostic pop
diff --git a/common/facade.cpp b/common/facade.cpp
index 9c14a23..92eeaca 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -115,5 +115,3 @@ QPair<KAsync::Job<void>, typename ResultEmitter<typename DomainType::Ptr>::Ptr>
     template class Sink::GenericFacade<T>; \
 
 SINK_REGISTER_TYPES()
-
-#include "facade.moc"
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 9cf91da..bd97036 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -166,7 +166,3 @@ void GenericResource::setLowerBoundRevision(qint64 revision)
     updateLowerBoundRevision();
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
-#include "genericresource.moc"
-#pragma clang diagnostic pop
diff --git a/common/inspector.cpp b/common/inspector.cpp
index 0e7a61f..0fa0f3d 100644
--- a/common/inspector.cpp
+++ b/common/inspector.cpp
@@ -90,8 +90,3 @@ KAsync::Job<void> Inspector::inspect(int inspectionType, const QByteArray &inspe
     return KAsync::error(-1, "Inspection not implemented.");
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
-#include "inspector.moc"
-#include "moc_inspector.cpp"
-#pragma clang diagnostic pop
diff --git a/common/storage_lmdb.cpp b/common/storage_lmdb.cpp
index 2f6e7e1..ddad69d 100644
--- a/common/storage_lmdb.cpp
+++ b/common/storage_lmdb.cpp
@@ -570,11 +570,8 @@ int DataStore::NamedDatabase::findAllInRange(const QByteArray &lowerBound, const
         return 0;
     }
 
-    int numberOfRetrievedValues = 0;
-
-    MDB_val firstKey = { .mv_size = (size_t)lowerBound.size(), .mv_data = (void *)lowerBound.constData() };
-    MDB_val idealLastKey = { .mv_size = (size_t)upperBound.size(), .mv_data = (void *)upperBound.constData() };
-    MDB_val lastKey = idealLastKey;
+    MDB_val firstKey = {(size_t)lowerBound.size(), (void *)lowerBound.constData()};
+    MDB_val idealLastKey = {(size_t)upperBound.size(), (void *)upperBound.constData()};
     MDB_val currentKey;
     MDB_val data;
 
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index 037a01f..41ab1e9 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -741,8 +741,3 @@ bool Synchronizer::allChangesReplayed()
 
 SINK_REGISTER_TYPES()
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
-#include "synchronizer.moc"
-#include "moc_synchronizer.cpp"
-#pragma clang diagnostic pop