GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r75:6f69134168e5

Remove coverage from windows build...

perrinel -

r75:6f69134168e5

parent child

Context file:

r75:6f69134168e5

app/src/Main.cpp ~~app/src/main.cpp~~ renamed +1 -1

             /*-- Author : Alexis Jeandet
             -- Mail : alexis.jeandet@member.fsf.org
             ----------------------------------------------------------------------------*/
-            #include "mainwindow.h"
+            #include "MainWindow.h"
             #include <QProcessEnvironment>
             #include <QThread>
             #include <SqpApplication.h>

core/CMakeLists.txt +2 0

                             SCIQLOP_COPY_TO_TARGET(RUNTIME ${testName} ${EXTERN_SHARED_LIBRARIES})
                             set(Coverage_NAME ${testName})
+                            if(UNIX)
                                 SETUP_TARGET_FOR_COVERAGE(TARGET ${testName}_coverage OUTPUT ${testFile}-path NAME ${testFile} EXECUTABLE ${testName})
                                 LIST( APPEND TARGETS_COV ${testName}_coverage)
+                            endif(UNIX)
                     ENDFOREACH( testFile )

core/include/Common/spimpl.h +5 -7

             template <class T, class D, class C>
             struct is_default_manageable
-                : public std::integral_constant<bool,
+                : public std::integral_constant<bool, std::is_same<D, default_deleter_t<T> >::value
-                                                std::is_same<D, default_deleter_t<T> >::value
                                                           && std::is_same<C, default_copier_t<T> >::value> {
             };
             }
                 }
                 template <class U>
-                impl_ptr(U *u,
+                impl_ptr(U *u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                         typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                            && is_default_manageable::value,
                                                        dummy_t_>::type
                                = dummy_t_()) SPIMPL_NOEXCEPT
             #ifdef SPIMPL_HAS_AUTO_PTR
                 template <class U>
-                impl_ptr(std::auto_ptr<U> &&u,
+                impl_ptr(std::auto_ptr<U> &&u, typename std::enable_if<std::is_convertible<U *, pointer>::value
-                         typename std::enable_if<std::is_convertible<U *, pointer>::value
                                                                            && is_default_manageable::value,
                                                                        dummy_t_>::type
-                         = dummy_t_()) SPIMPL_NOEXCEPT : ptr_(u.release(), &details::default_delete<T>),
+                                               = dummy_t_()) SPIMPL_NOEXCEPT
+                    : ptr_(u.release(), &details::default_delete<T>),
                       copier_(&details::default_copy<T>)
                 {
                 }

core/src/DataSource/DataSourceController.cpp +6 -6

             DataSourceController::DataSourceController(QObject *parent)
                     : impl{spimpl::make_unique_impl<DataSourceControllerPrivate>()}
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController construction")
-                    << tr("DataSourceController construction") << QThread::currentThread();
+                                                    << QThread::currentThread();
             }
             DataSourceController::~DataSourceController()
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController destruction")
-                    << tr("DataSourceController destruction") << QThread::currentThread();
+                                                    << QThread::currentThread();
                 this->waitForFinish();
             }
             void DataSourceController::initialize()
             {
-                qCDebug(LOG_DataSourceController())
+                qCDebug(LOG_DataSourceController()) << tr("DataSourceController init")
-                    << tr("DataSourceController init") << QThread::currentThread();
+                                                    << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_DataSourceController()) << tr("DataSourceController init END");
             }

core/src/Visualization/VisualizationController.cpp +6 -6

             VisualizationController::VisualizationController(QObject *parent)
                     : impl{spimpl::make_unique_impl<VisualizationControllerPrivate>()}
             {
-                qCDebug(LOG_VisualizationController())
+                qCDebug(LOG_VisualizationController()) << tr("VisualizationController construction")
-                    << tr("VisualizationController construction") << QThread::currentThread();
+                                                       << QThread::currentThread();
             }
             VisualizationController::~VisualizationController()
             {
-                qCDebug(LOG_VisualizationController())
+                qCDebug(LOG_VisualizationController()) << tr("VisualizationController destruction")
-                    << tr("VisualizationController destruction") << QThread::currentThread();
+                                                       << QThread::currentThread();
                 this->waitForFinish();
             }
             void VisualizationController::initialize()
             {
-                qCDebug(LOG_VisualizationController())
+                qCDebug(LOG_VisualizationController()) << tr("VisualizationController init")
-                    << tr("VisualizationController init") << QThread::currentThread();
+                                                       << QThread::currentThread();
                 impl->m_WorkingMutex.lock();
                 qCDebug(LOG_VisualizationController()) << tr("VisualizationController init END");
             }

General Comments 5

perrinel

|

Auto status change to "Under Review"

perrinel

|

Pull request updated. Auto status change to "Under Review"

Changed commits:
  * 6 added
  * 3 removed

Changed files:
  * A gui/src/Visualization/VisualizationWidget.cpp
  * A gui/include/SidePane/SqpSidePane.h
  * A gui/include/Visualization/VisualizationGraphWidget.h
  * A gui/include/Visualization/VisualizationTabWidget.h
  * A gui/include/Visualization/VisualizationWidget.h
  * A gui/include/Visualization/VisualizationZoneWidget.h
  * A gui/include/Visualization/qcustomplot.h
  * A gui/src/SidePane/SqpSidePane.cpp
  * A gui/src/Visualization/VisualizationGraphWidget.cpp
  * A gui/src/Visualization/VisualizationTabWidget.cpp
  * A gui/src/Visualization/VisualizationZoneWidget.cpp
  * A gui/src/Visualization/qcustomplot.cpp
  * M gui/include/DataSource/DataSourceWidget.h
  * M gui/src/DataSource/DataSourceTreeWidgetItem.cpp
  * M gui/src/DataSource/DataSourceWidget.cpp
  * M app/src/Main.cpp
  * M app/src/MainWindow.cpp
  * M app/ui/MainWindow.ui
  * M core/include/DataSource/DataSourceController.h
  * M core/src/DataSource/DataSourceController.cpp
  * M core/tests/DataSource/TestDataSourceController.cpp
  * M gui/ui/visualization/VisualizationWidget.ui
  * M gui/vera-exclusions/exclusions.txt
  * M gui/src/visualization/VisualizationWidget.cpp
  * R cmake/sciqlop_package_qt.cmake
  * R core/include/Plugin/PluginManager.h
  * R core/include/Visualization/VisualizationController.h
  * R core/src/Plugin/PluginManager.cpp
  * R core/src/Visualization/VisualizationController.cpp
  * R gui/include/sidepane/SqpSidePane.h
  * R gui/include/visualization/VisualizationGraphWidget.h
  * R gui/include/visualization/VisualizationTabWidget.h
  * R gui/include/visualization/VisualizationWidget.h
  * R gui/include/visualization/VisualizationZoneWidget.h
  * R gui/include/visualization/qcustomplot.h
  * R gui/src/sidepane/SqpSidePane.cpp
  * R gui/src/visualization/VisualizationGraphWidget.cpp
  * R gui/src/visualization/VisualizationTabWidget.cpp
  * R gui/src/visualization/VisualizationZoneWidget.cpp
  * R gui/src/visualization/qcustomplot.cpp
  * R gui/ui/sidepane/SqpSidePane.ui
  * R gui/ui/visualization/VisualizationGraphWidget.ui
  * R gui/ui/visualization/VisualizationTabWidget.ui
  * R gui/ui/visualization/VisualizationZoneWidget.ui
  * R plugin/CMakeLists.txt
  * R plugin/cmake/Findsciqlop-plugin.cmake
  * R plugin/include/Plugin/IPlugin.h
  * R app/CMakeLists.txt
  * R app/include/MainWindow.h
  * R app/vera-exclusions/exclusions.txt
  * R cmake/sciqlop_applications.cmake
  * R core/CMakeLists.txt
  * R core/include/Common/spimpl.h
  * R gui/CMakeLists.txt
  * R gui/include/SqpApplication.h
  * R gui/src/SqpApplication.cpp
  * R app/src/mainwindow.ui

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

		Status change > Approved
		Pull request updated. Auto status change to \|under_review\|...
		Pull request merged and closed
		Auto status change to \|new_status\|...
		Auto status change to \|new_status\|...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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