diff --git a/external/TimeSeries b/external/TimeSeries index 16093a6..1429ee8 160000 --- a/external/TimeSeries +++ b/external/TimeSeries @@ -1 +1 @@ -Subproject commit 16093a64038da071e4dac879fc3fd2ec9fc21c5d +Subproject commit 1429ee8c3a60f059d192904cd4e857e8196c8347 diff --git a/include/Data/IDataProvider.h b/include/Data/IDataProvider.h index b63db75..ccae57e 100644 --- a/include/Data/IDataProvider.h +++ b/include/Data/IDataProvider.h @@ -30,8 +30,8 @@ class SCIQLOP_CORE_EXPORT IDataProvider : public QObject { Q_OBJECT public: - virtual ~IDataProvider() noexcept = default; - virtual std::shared_ptr clone() const = 0; + virtual ~IDataProvider() noexcept = default; + // virtual std::shared_ptr clone() const = 0; // Synchronous call -> asyncGetData may be written for asynchronous get virtual TimeSeries::ITimeSerie* diff --git a/meson.build b/meson.build index c00514e..55e5ac1 100644 --- a/meson.build +++ b/meson.build @@ -46,8 +46,7 @@ core_moc_headers = [ './include/Variable/VariableController2.h', './include/Variable/Variable2.h', './include/Variable/VariableSynchronizationGroup2.h', - './include/Variable/private/VCTransaction.h', - './include/Visualization/VisualizationController.h'] + './include/Variable/private/VCTransaction.h'] @@ -74,8 +73,7 @@ core_sources = ['./src/Common/MimeTypesDef.cpp', './src/Variable/VariableSynchronizationGroup2.cpp', './src/Variable/Variable2.cpp', './src/Variable/VariableController2.cpp', - './src/Variable/VariableModel2.cpp', - './src/Visualization/VisualizationController.cpp'] + './src/Variable/VariableModel2.cpp'] core_inc = include_directories(['include', 'include/Plugin']) diff --git a/tests/TestUtils/TestProviders.h b/tests/TestUtils/TestProviders.h index 7a48d0e..237fc92 100644 --- a/tests/TestUtils/TestProviders.h +++ b/tests/TestUtils/TestProviders.h @@ -20,10 +20,10 @@ public: SimpleRange() = default; int callCounter = 0; - std::shared_ptr clone() const override - { - return std::make_shared(); - } + // std::shared_ptr clone() const override + // { + // return std::make_shared(); + // } TimeSeries::ITimeSerie* getData(const DataProviderParameters& parameters) override