From 5c7b64cc9008c01256a91db5bd46073f55fc15f7 Mon Sep 17 00:00:00 2001
From: Dmitry Yurov <d.yurov@fz-juelich.de>
Date: Tue, 30 Jan 2018 16:21:15 +0100
Subject: [PATCH] Revert "creation of parameter tree relatively to a given
node"
This reverts commit 5018d27b1586c099fd0b44c1ff2debe0bb2c358b.
---
Core/Parametrization/INode.cpp | 4 ++--
Core/Parametrization/INode.h | 6 +-----
Core/Parametrization/IParameterized.h | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Core/Parametrization/INode.cpp b/Core/Parametrization/INode.cpp
index b6df5772838..128afa7b373 100644
--- a/Core/Parametrization/INode.cpp
+++ b/Core/Parametrization/INode.cpp
@@ -88,7 +88,7 @@ std::string INode::displayName() const
return result;
}
-ParameterPool* INode::createParameterTree(const INode* node) const
+ParameterPool* INode::createParameterTree() const
{
std::unique_ptr<ParameterPool> result(new ParameterPool);
@@ -96,7 +96,7 @@ ParameterPool* INode::createParameterTree(const INode* node) const
it.first();
while (!it.isDone()) {
const INode *child = it.getCurrent();
- const std::string path = NodeUtils::nodePath(*child, node) + "/";
+ const std::string path = NodeUtils::nodePath(*child, this->parent()) + "/";
child->parameterPool()->copyToExternalPool(path, result.get());
it.next();
}
diff --git a/Core/Parametrization/INode.h b/Core/Parametrization/INode.h
index a4d0ea1b33e..2db6def172a 100644
--- a/Core/Parametrization/INode.h
+++ b/Core/Parametrization/INode.h
@@ -51,11 +51,7 @@ public:
std::string displayName() const;
//! Creates new parameter pool, with all local parameters and those of its children.
- ParameterPool* createParameterTree() const override {return createParameterTree(this->parent());}
-
- //! Creates new parameter pool, with all local parameters and those of its children.
- //! Parameter names are derived relatively to the given _node_.
- ParameterPool* createParameterTree(const INode* node) const;
+ ParameterPool* createParameterTree() const;
private:
const INode* m_parent;
diff --git a/Core/Parametrization/IParameterized.h b/Core/Parametrization/IParameterized.h
index 7e310220f86..48ab0ba5f16 100644
--- a/Core/Parametrization/IParameterized.h
+++ b/Core/Parametrization/IParameterized.h
@@ -33,7 +33,7 @@ public:
IParameterized(const IParameterized& other);
~IParameterized();
- IParameterized& operator=(const IParameterized& other) = delete;
+ IParameterized operator=(const IParameterized& other) = delete;
//! Returns pointer to the parameter pool.
ParameterPool* parameterPool() const { return m_pool; }
--
GitLab