From 31a39fecd50d3804087f0878b2d6b5f31bbadd1c 2017-05-29 14:34:58
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-05-29 14:34:58
Subject: [PATCH] Ajout des règles vera++
---

diff --git a/cmake/sciqlop_applications.cmake b/cmake/sciqlop_applications.cmake
index b4fb446..877c2d4 100644
--- a/cmake/sciqlop_applications.cmake
+++ b/cmake/sciqlop_applications.cmake
@@ -23,6 +23,9 @@ ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
 #
 # Code formatting
 #
+# Vera++ exclusion files
+LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/formatting/vera-exclusions/exclusions.txt)
+SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
 INCLUDE ("cmake/sciqlop_formatting.cmake")
 
 #
diff --git a/cmake/sciqlop_formatting.cmake b/cmake/sciqlop_formatting.cmake
index 98fa28e..539f2a8 100644
--- a/cmake/sciqlop_formatting.cmake
+++ b/cmake/sciqlop_formatting.cmake
@@ -34,6 +34,8 @@ IF (ENABLE_CHECKSTYLE)
             LIST(APPEND EXCLUSIONS EXCLUSION ${e})
         ENDFOREACH()
 
+        message("Exclusions de vera++: ${EXCLUSIONS}")
+
         ADD_VERA_TARGETS(${CHECKSTYLE_INPUT_FILES}
             ADD_TO_ALL
             PROFILE "sciqlop"
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 6313ed2..27e4fb1 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -57,7 +57,7 @@ SCIQLOP_COPY_TO_TARGET(LIBRARY ${SQPCORE_LIBRARY_NAME} ${EXTERN_SHARED_LIBRARIES
 LIST(APPEND CHECKSTYLE_INPUT_FILES ${MODULE_SOURCES})
 SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_INPUT_FILES)
 # Vera++ exclusion files
-#LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/path/to/exclusionFiles.tcl)
+LIST(APPEND CHECKSTYLE_EXCLUSION_FILES ${CMAKE_CURRENT_SOURCE_DIR}/vera-exclusions/exclusions.txt)
 SCIQLOP_SET_TO_PARENT_SCOPE(CHECKSTYLE_EXCLUSION_FILES)
 
 #
diff --git a/core/include/Common/spimpl.h b/core/include/Common/spimpl.h
index d58c7e4..b4d5e04 100644
--- a/core/include/Common/spimpl.h
+++ b/core/include/Common/spimpl.h
@@ -30,7 +30,6 @@
 #include <memory>
 #include <type_traits>
 
-
 #if defined _MSC_VER && _MSC_VER < 1900 // MS Visual Studio before VS2015
 #define SPIMPL_NO_CPP11_NOEXCEPT
 #define SPIMPL_NO_CPP11_CONSTEXPR
diff --git a/core/vera-exclusions/exclusions.txt b/core/vera-exclusions/exclusions.txt
new file mode 100644
index 0000000..15b0dba
--- /dev/null
+++ b/core/vera-exclusions/exclusions.txt
@@ -0,0 +1,3 @@
+# On ignore toutes les règles vera++ pour le fichier spimpl
+Common/spimpl\.h:\d+:.*
+
diff --git a/formatting/vera-exclusions/exclusions.txt b/formatting/vera-exclusions/exclusions.txt
new file mode 100644
index 0000000..44b1f23
--- /dev/null
+++ b/formatting/vera-exclusions/exclusions.txt
@@ -0,0 +1,4 @@
+# On ignore toutes les règles vera++ pour le fichier spimpl
+
+.*IPSIS_S04_METHOD.*found: Q_DECLARE_LOGGING_CATEGORY.*
+.*IPSIS_S04_VARIABLE.*found: impl.*
diff --git a/gui/include/SqpApplication.h b/gui/include/SqpApplication.h
index 7114ca5..997d97a 100644
--- a/gui/include/SqpApplication.h
+++ b/gui/include/SqpApplication.h
@@ -18,6 +18,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
  * method will ba able to access it.
  * You can load a data source driver plugin then create a data source.
  */
+
 class SqpApplication : public QApplication {
     Q_OBJECT
 public:
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 6900d5f..c510e53 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -8,10 +8,9 @@ Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
 class SqpApplication::SqpApplicationPrivate {
 public:
     SqpApplicationPrivate() {}
-    ~SqpApplicationPrivate()
+    virtual ~SqpApplicationPrivate()
     {
         qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate");
-        ;
         m_DataSourceControllerThread.quit();
         m_DataSourceControllerThread.wait();
     }