diff --git a/Core/Parametrization/INode.cpp b/Core/Parametrization/INode.cpp index b6df577283833628bac1305dfa814a057f7281f6..128afa7b373e47189f04a452fc6d7cca84c457d3 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 a4d0ea1b33e09db9f84ceefe0e959566511e297c..2db6def172a34c29760ed58c468d6fa2797fe407 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 7e310220f860df5d9c9da0c406d7da45b4ded93f..48ab0ba5f168d41afb8c2181ec7aa6ebeb8a9d41 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; }