@@ -19,7 +19,7 | |||||
19 | /*-- Author : Alexis Jeandet |
|
19 | /*-- Author : Alexis Jeandet | |
20 | -- Mail : alexis.jeandet@member.fsf.org |
|
20 | -- Mail : alexis.jeandet@member.fsf.org | |
21 | ----------------------------------------------------------------------------*/ |
|
21 | ----------------------------------------------------------------------------*/ | |
22 |
#include " |
|
22 | #include "MainWindow.h" | |
23 | #include <QProcessEnvironment> |
|
23 | #include <QProcessEnvironment> | |
24 | #include <QThread> |
|
24 | #include <QThread> | |
25 | #include <SqpApplication.h> |
|
25 | #include <SqpApplication.h> |
@@ -97,8 +97,10 IF(BUILD_TESTS) | |||||
97 |
|
97 | |||
98 | SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES}) |
|
98 | SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES}) | |
99 | set(Coverage_NAME ${testName}) |
|
99 | set(Coverage_NAME ${testName}) | |
100 | SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName}) |
|
100 | if(UNIX) | |
101 | LIST( APPEND TARGETS_COV ${testName}_coverage) |
|
101 | SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName}) | |
|
102 | LIST( APPEND TARGETS_COV ${testName}_coverage) | |||
|
103 | endif(UNIX) | |||
102 |
|
104 | |||
103 | ENDFOREACH( testFile ) |
|
105 | ENDFOREACH( testFile ) | |
104 |
|
106 |
@@ -89,9 +89,8 using default_copier_t = typename default_copier<T>::type; | |||||
89 |
|
89 | |||
90 | template <class T, class D, class C> |
|
90 | template <class T, class D, class C> | |
91 | struct is_default_manageable |
|
91 | struct is_default_manageable | |
92 | : public std::integral_constant<bool, |
|
92 | : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value | |
93 |
std::is_same< |
|
93 | && std::is_same<C, default_copier_t<T> >::value> { | |
94 | && std::is_same<C, default_copier_t<T> >::value> { |
|
|||
95 | }; |
|
94 | }; | |
96 | } |
|
95 | } | |
97 |
|
96 | |||
@@ -132,11 +131,10 public: | |||||
132 | } |
|
131 | } | |
133 |
|
132 | |||
134 | template <class U> |
|
133 | template <class U> | |
135 | impl_ptr(U *u, |
|
134 | impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value | |
136 | typename std::enable_if<std::is_convertible<U *, pointer>::value |
|
135 | && is_default_manageable::value, | |
137 |
|
|
136 | dummy_t_>::type | |
138 | dummy_t_>::type |
|
137 | = dummy_t_()) SPIMPL_NOEXCEPT | |
139 | = dummy_t_()) SPIMPL_NOEXCEPT |
|
|||
140 | : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>) |
|
138 | : impl_ptr(u, &details::default_delete<T>, &details::default_copy<T>) | |
141 | { |
|
139 | { | |
142 | } |
|
140 | } | |
@@ -153,12 +151,12 public: | |||||
153 |
|
151 | |||
154 | #ifdef SPIMPL_HAS_AUTO_PTR |
|
152 | #ifdef SPIMPL_HAS_AUTO_PTR | |
155 | template <class U> |
|
153 | template <class U> | |
156 | impl_ptr(std::auto_ptr<U> &&u, |
|
154 | impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value | |
157 | typename std::enable_if<std::is_convertible<U *, pointer>::value |
|
155 | && is_default_manageable::value, | |
158 |
|
|
156 | dummy_t_>::type | |
159 |
|
|
157 | = dummy_t_()) SPIMPL_NOEXCEPT | |
160 |
|
|
158 | : ptr_(u.release(), &details::default_delete<T>), | |
161 |
|
|
159 | copier_(&details::default_copy<T>) | |
162 | { |
|
160 | { | |
163 | } |
|
161 | } | |
164 | #endif |
|
162 | #endif |
@@ -21,14 +21,14 public: | |||||
21 | DataSourceController::DataSourceController(QObject *parent) |
|
21 | DataSourceController::DataSourceController(QObject *parent) | |
22 | : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()} |
|
22 | : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()} | |
23 | { |
|
23 | { | |
24 | qCDebug(LOG_DataSourceController()) |
|
24 | qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction") | |
25 | << tr("DataSourceController construction") << QThread::currentThread(); |
|
25 | << QThread::currentThread(); | |
26 | } |
|
26 | } | |
27 |
|
27 | |||
28 | DataSourceController::~DataSourceController() |
|
28 | DataSourceController::~DataSourceController() | |
29 | { |
|
29 | { | |
30 | qCDebug(LOG_DataSourceController()) |
|
30 | qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction") | |
31 | << tr("DataSourceController destruction") << QThread::currentThread(); |
|
31 | << QThread::currentThread(); | |
32 | this->waitForFinish(); |
|
32 | this->waitForFinish(); | |
33 | } |
|
33 | } | |
34 |
|
34 | |||
@@ -61,8 +61,8 void DataSourceController::setDataSourceItem( | |||||
61 |
|
61 | |||
62 | void DataSourceController::initialize() |
|
62 | void DataSourceController::initialize() | |
63 | { |
|
63 | { | |
64 | qCDebug(LOG_DataSourceController()) |
|
64 | qCDebug(LOG_DataSourceController()) << tr("DataSourceController init") | |
65 | << tr("DataSourceController init") << QThread::currentThread(); |
|
65 | << QThread::currentThread(); | |
66 | impl->m_WorkingMutex.lock(); |
|
66 | impl->m_WorkingMutex.lock(); | |
67 | qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END"); |
|
67 | qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END"); | |
68 | } |
|
68 | } |
@@ -16,21 +16,21 public: | |||||
16 | VisualizationController::VisualizationController(QObject *parent) |
|
16 | VisualizationController::VisualizationController(QObject *parent) | |
17 | : impl{spimpl::make_unique_impl<VisualizationControllerPrivate>()} |
|
17 | : impl{spimpl::make_unique_impl<VisualizationControllerPrivate>()} | |
18 | { |
|
18 | { | |
19 | qCDebug(LOG_VisualizationController()) |
|
19 | qCDebug(LOG_VisualizationController()) << tr("VisualizationController construction") | |
20 | << tr("VisualizationController construction") << QThread::currentThread(); |
|
20 | << QThread::currentThread(); | |
21 | } |
|
21 | } | |
22 |
|
22 | |||
23 | VisualizationController::~VisualizationController() |
|
23 | VisualizationController::~VisualizationController() | |
24 | { |
|
24 | { | |
25 | qCDebug(LOG_VisualizationController()) |
|
25 | qCDebug(LOG_VisualizationController()) << tr("VisualizationController destruction") | |
26 | << tr("VisualizationController destruction") << QThread::currentThread(); |
|
26 | << QThread::currentThread(); | |
27 | this->waitForFinish(); |
|
27 | this->waitForFinish(); | |
28 | } |
|
28 | } | |
29 |
|
29 | |||
30 | void VisualizationController::initialize() |
|
30 | void VisualizationController::initialize() | |
31 | { |
|
31 | { | |
32 | qCDebug(LOG_VisualizationController()) |
|
32 | qCDebug(LOG_VisualizationController()) << tr("VisualizationController init") | |
33 | << tr("VisualizationController init") << QThread::currentThread(); |
|
33 | << QThread::currentThread(); | |
34 | impl->m_WorkingMutex.lock(); |
|
34 | impl->m_WorkingMutex.lock(); | |
35 | qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END"); |
|
35 | qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END"); | |
36 | } |
|
36 | } |
General Comments 0
You need to be logged in to leave comments.
Login now