GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r27:36eb6adb226c

config/QtProject/qtlogging.ini created 755 +4 0

@@ -0,0 +1,4
	1	[Rules]
	2	*.debug=false
	3	SqpApplication.debug=true
	4	DataSourceController.debug=true

core/vera-exclusions/exclusions.txt created 644 +3 0

@@ -0,0 +1,3
	1	# On ignore toutes les règles vera++ pour le fichier spimpl
	2	Common/spimpl\.h:\d+:.*
	3

formatting/vera-exclusions/exclusions.txt created 644 +4 0

@@ -0,0 +1,4
	1	# On ignore toutes les règles vera++ pour le fichier spimpl
	2
	3	.IPSIS_S04_METHOD.found: Q_DECLARE_LOGGING_CATEGORY.*
	4	.IPSIS_S04_VARIABLE.found: impl.*

app/CMakeLists.txt 0 -1

             # ========================
             find_package(sciqlop-gui)
-            message("Librairies inclues dans APP: ${SCIQLOP-GUI_LIBRARIES}")
             SET(LIBRARIES ${SCIQLOP-GUI_LIBRARIES})
             SET(EXTERN_SHARED_LIBRARIES)

cmake/sciqlop_applications.cmake +15 -1

             #
             SET (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
             SET (LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            IF (UNIX)
+                SET (CONFIG_OUTPUT_PATH $ENV{HOME}/.config/QtProject)
+            ELSEIF(WIN32)
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE}/app/QtProject)
+            ELSE()
+                SET (CONFIG_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/dist/${CMAKE_BUILD_TYPE})
+            ENDIF()
             #
             # Compile the diffents modules
             ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/app")
+            # LOGGER
+            set(QTLOGGING_INI_FILE "${CMAKE_SOURCE_DIR}/config/QtProject/qtlogging.ini")
+            FILE(COPY ${QTLOGGING_INI_FILE} DESTINATION ${CONFIG_OUTPUT_PATH})
             #
             # 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")
             #

cmake/sciqlop_params.cmake +9 0

@@ -17,6 +17,15
17	# SET (DEBUG_SUFFIX "")	17	# SET (DEBUG_SUFFIX "")
18	#ENDIF()	18	#ENDIF()
19		19
		20	IF(CMAKE_BUILD_TYPE MATCHES "Debug")
		21	SET (CMAKE_BUILD_TYPE "Debug")
		22	SET (DEBUG_SUFFIX "d")
		23	ELSE()
		24	MESSAGE (STATUS "Build in Release")
		25	SET (SCIQLOP_BUILD_TYPE "Release")
		26	SET (DEBUG_SUFFIX "")
		27	ENDIF()
		28
20	#	29	#
21	# Need to compile tests?	30	# Need to compile tests?
22	#	31	#

core/CMakeLists.txt +1 -1

             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)
             #

core/include/Common/spimpl.h 0 -1

             #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

core/src/DataSource/DataSourceController.cpp +4 -1

             #include <QMutex>
             #include <QThread>
-            Q_LOGGING_CATEGORY(LOG_DataSourceController, "dataSourceController")
+            #include <QDir>
+            #include <QStandardPaths>
+            Q_LOGGING_CATEGORY(LOG_DataSourceController, "DataSourceController")
             class DataSourceController::DataSourceControllerPrivate {
             public:

gui/CMakeLists.txt 0 -1

             # ========================
             find_package(sciqlop-core)
-            message("Librairies inclues dans APP: ${SCIQLOP-CORE_LIBRARIES}")
             SET(LIBRARIES ${SCIQLOP-CORE_LIBRARIES})
             INCLUDE_DIRECTORIES(${SCIQLOP-CORE_INCLUDE_DIR})

gui/include/SqpApplication.h +1 0

              * 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:

gui/src/SqpApplication.cpp +1 -2

             class SqpApplication::SqpApplicationPrivate {
             public:
                 SqpApplicationPrivate() {}
-                ~SqpApplicationPrivate()
+                virtual ~SqpApplicationPrivate()
                 {
                     qCInfo(LOG_SqpApplication()) << tr("Desctruction du SqpApplicationPrivate");
                     m_DataSourceControllerThread.quit();
                     m_DataSourceControllerThread.wait();
                 }

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages