9 files changed, 36 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f2f08..0bbd9f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 option(BUILD_MAILDIR "BUILD_MAILDIR" ON)
 option(AVOID_BINDING_REBUILD "AVOID_BINDING_REBUILD" OFF)
+option(CATCH_ERRORS "CATCH_ERRORS" OFF)
 
 # ECM setup
 find_package(ECM 0.0.10 REQUIRED NO_MODULE)
@@ -58,7 +59,9 @@ function(add_clang_static_analysis target)
 endfunction()
 
 set(CMAKE_AUTOMOC ON)
-add_definitions("-Wall -Weverything -Wno-cast-align -Wno-used-but-marked-unused -Wno-shadow -Wno-weak-vtables -Wno-global-constructors -Wno-deprecated -Wno-weak-template-vtables -Wno-exit-time-destructors -Wno-covered-switch-default -Wno-shorten-64-to-32 -Wno-documentation -Wno-old-style-cast -Wno-extra-semi -Wno-unused-parameter -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-noreturn -Wno-missing-prototypes -Wno-documentation-unknown-command -Wno-sign-conversion")
+if (${CATCH_ERRORS})
+    add_definitions("-Werror -Wall -Weverything -Wno-unused-function -Wno-cast-align -Wno-used-but-marked-unused -Wno-shadow -Wno-weak-vtables -Wno-global-constructors -Wno-deprecated -Wno-weak-template-vtables -Wno-exit-time-destructors -Wno-covered-switch-default -Wno-shorten-64-to-32 -Wno-documentation -Wno-old-style-cast -Wno-extra-semi -Wno-unused-parameter -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Wno-missing-noreturn -Wno-missing-prototypes -Wno-documentation-unknown-command -Wno-sign-conversion")
+endif()
 add_definitions("-std=c++0x -g")
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${FLATBUFFERS_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/common)
 include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/common/domain)
diff --git a/common/genericresource.cpp b/common/genericresource.cpp
index 758ea0d..1e45243 100644
--- a/common/genericresource.cpp
+++ b/common/genericresource.cpp
@@ -662,4 +662,7 @@ void GenericResource::createOrModify(Sink::Storage::Transaction &transaction, Si
 }
 
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
 #include "genericresource.moc"
+#pragma clang diagnostic pop
diff --git a/common/listener.cpp b/common/listener.cpp
index 13ebbbb..6b62552 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -424,3 +424,7 @@ Sink::Resource *Listener::loadResource()
     return m_resource;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "moc_listener.cpp"
+#pragma clang diagnostic pop
diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index 1055922..73198a5 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -174,3 +174,7 @@ bool MessageQueue::isEmpty()
     return count == 0;
 }
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "moc_messagequeue.cpp"
+#pragma clang diagnostic pop
diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index 401c26d..0598bad 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -459,3 +459,7 @@ void Preprocessor::finalize()
 
 } // namespace Sink
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "moc_pipeline.cpp"
+#pragma clang diagnostic pop
diff --git a/common/resource.cpp b/common/resource.cpp
index 8c448a8..6972efe 100644
--- a/common/resource.cpp
+++ b/common/resource.cpp
@@ -34,7 +34,7 @@ Resource::Resource()
     : QObject(),
     d(0)
 {
-
+    Q_UNUSED(d);
 }
 
 Resource::~Resource()
@@ -75,7 +75,7 @@ ResourceFactory::ResourceFactory(QObject *parent)
     : QObject(parent),
       d(0)
 {
-
+    Q_UNUSED(d);
 }
 
 ResourceFactory::~ResourceFactory()
@@ -129,3 +129,9 @@ ResourceFactory *ResourceFactory::load(const QString &resourceName)
 }
 
 } // namespace Sink
+
+//Ignore warning I don't know how to fix in a moc file
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "moc_resource.cpp"
+#pragma clang diagnostic pop
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 8296f1d..2e87bc7 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -589,3 +589,8 @@ void ResourceAccess::log(const QString &message)
 }
 
 }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
+#include "moc_resourceaccess.cpp"
+#pragma clang diagnostic pop
diff --git a/sinksh/repl/replStates.cpp b/sinksh/repl/replStates.cpp
index 5bfc064..0cd2620 100644
--- a/sinksh/repl/replStates.cpp
+++ b/sinksh/repl/replStates.cpp
@@ -169,5 +169,7 @@ static char *sink_cli_next_tab_complete_match(const char *text, int state)
 }
 
 //Ignore warning I don't know how to fix in a moc file
+#pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundefined-reinterpret-cast"
 #include "moc_replStates.cpp"
+#pragma clang diagnostic pop
diff --git a/tests/hawd/dataset.cpp b/tests/hawd/dataset.cpp
index fd931e8..372a4b6 100644
--- a/tests/hawd/dataset.cpp
+++ b/tests/hawd/dataset.cpp
@@ -216,8 +216,8 @@ QString Dataset::Row::toString(const QStringList &cols, int standardCols, const
 Dataset::Dataset(const QString &name, const State &state)
     : m_definition(state.datasetDefinition(name)),
       m_storage(state.resultsPath(), name, Sink::Storage::ReadWrite),
-      m_commitHash(state.commitHash()),
-      m_transaction(std::move(m_storage.createTransaction()))
+      m_transaction(std::move(m_storage.createTransaction())),
+      m_commitHash(state.commitHash())
 {
 }