From 41c52147cd25b5e8c35405c1e2087dc0f4f65288 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 13 Jan 2015 21:17:02 +0100 Subject: [PATCH] [DEV] replace duplacate by clone --- ejson/Array.cpp | 4 ++-- ejson/Array.h | 2 +- ejson/Boolean.cpp | 2 +- ejson/Boolean.h | 2 +- ejson/Null.cpp | 2 +- ejson/Null.h | 2 +- ejson/Number.cpp | 2 +- ejson/Number.h | 2 +- ejson/Object.cpp | 4 ++-- ejson/Object.h | 2 +- ejson/String.cpp | 2 +- ejson/String.h | 2 +- ejson/Value.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ejson/Array.cpp b/ejson/Array.cpp index a92430f..95543ef 100644 --- a/ejson/Array.cpp +++ b/ejson/Array.cpp @@ -240,7 +240,7 @@ bool ejson::Array::transfertIn(std::shared_ptr _obj) { } // TODO : Manage error ... -std::shared_ptr ejson::Array::duplicate() const { +std::shared_ptr ejson::Array::clone() const { std::shared_ptr output = ejson::Array::create(); if (output == nullptr) { JSON_ERROR("Allocation error ..."); @@ -251,7 +251,7 @@ std::shared_ptr ejson::Array::duplicate() const { if (val == nullptr) { continue; } - output->add(val->duplicate()); + output->add(val->clone()); } return output; } diff --git a/ejson/Array.h b/ejson/Array.h index 1c92290..ca05e06 100644 --- a/ejson/Array.h +++ b/ejson/Array.h @@ -167,7 +167,7 @@ namespace ejson { virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual void clear(); virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/Boolean.cpp b/ejson/Boolean.cpp index 7e57d9f..aa9afea 100644 --- a/ejson/Boolean.cpp +++ b/ejson/Boolean.cpp @@ -73,7 +73,7 @@ bool ejson::Boolean::transfertIn(std::shared_ptr _obj) { return true; } -std::shared_ptr ejson::Boolean::duplicate() const { +std::shared_ptr ejson::Boolean::clone() const { std::shared_ptr output = ejson::Boolean::create(m_value); if (output == nullptr) { JSON_ERROR("Allocation error ..."); diff --git a/ejson/Boolean.h b/ejson/Boolean.h index 1622689..ceb5e87 100644 --- a/ejson/Boolean.h +++ b/ejson/Boolean.h @@ -51,7 +51,7 @@ namespace ejson { virtual bool iParse(const std::string& _data, size_t& _pos, ejson::filePos& _filePos, ejson::Document& _doc); virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/Null.cpp b/ejson/Null.cpp index 0c73597..156d50a 100644 --- a/ejson/Null.cpp +++ b/ejson/Null.cpp @@ -57,7 +57,7 @@ bool ejson::Null::transfertIn(std::shared_ptr _obj) { return true; } -std::shared_ptr ejson::Null::duplicate() const { +std::shared_ptr ejson::Null::clone() const { std::shared_ptr output = ejson::Null::create(); if (output == nullptr) { JSON_ERROR("Allocation error ..."); diff --git a/ejson/Null.h b/ejson/Null.h index 569ee26..ce81b2c 100644 --- a/ejson/Null.h +++ b/ejson/Null.h @@ -29,7 +29,7 @@ namespace ejson { virtual bool iParse(const std::string& _data, size_t& _pos, ejson::filePos& _filePos, ejson::Document& _doc); virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/Number.cpp b/ejson/Number.cpp index 36a2128..56e7689 100644 --- a/ejson/Number.cpp +++ b/ejson/Number.cpp @@ -69,7 +69,7 @@ bool ejson::Number::transfertIn(std::shared_ptr _obj) { return true; } -std::shared_ptr ejson::Number::duplicate() const { +std::shared_ptr ejson::Number::clone() const { std::shared_ptr output = ejson::Number::create(m_value); if (output == nullptr) { JSON_ERROR("Allocation error ..."); diff --git a/ejson/Number.h b/ejson/Number.h index 613f44f..0f1b89d 100644 --- a/ejson/Number.h +++ b/ejson/Number.h @@ -63,7 +63,7 @@ namespace ejson { virtual bool iParse(const std::string& _data, size_t& _pos, ejson::filePos& _filePos, ejson::Document& _doc); virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/Object.cpp b/ejson/Object.cpp index aebada9..7b04c7c 100644 --- a/ejson/Object.cpp +++ b/ejson/Object.cpp @@ -472,7 +472,7 @@ bool ejson::Object::transfertIn(std::shared_ptr _obj) { } // TODO : Manage error ... -std::shared_ptr ejson::Object::duplicate() const { +std::shared_ptr ejson::Object::clone() const { std::shared_ptr output = ejson::Object::create(); if (output == nullptr) { JSON_ERROR("Allocation error ..."); @@ -484,7 +484,7 @@ std::shared_ptr ejson::Object::duplicate() const { if (val == nullptr) { continue; } - output->add(key, val->duplicate()); + output->add(key, val->clone()); } return output; } diff --git a/ejson/Object.h b/ejson/Object.h index 7b49177..dd5e598 100644 --- a/ejson/Object.h +++ b/ejson/Object.h @@ -210,7 +210,7 @@ namespace ejson { virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual void clear(); virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/String.cpp b/ejson/String.cpp index 2a137b6..f4eed40 100644 --- a/ejson/String.cpp +++ b/ejson/String.cpp @@ -67,7 +67,7 @@ bool ejson::String::transfertIn(std::shared_ptr _obj) { return true; } -std::shared_ptr ejson::String::duplicate() const { +std::shared_ptr ejson::String::clone() const { std::shared_ptr output = ejson::String::create(m_value); if (output == nullptr) { JSON_ERROR("Allocation error ..."); diff --git a/ejson/String.h b/ejson/String.h index 68d9f8c..5805653 100644 --- a/ejson/String.h +++ b/ejson/String.h @@ -49,7 +49,7 @@ namespace ejson { virtual bool iParse(const std::string& _data, size_t& _pos, ejson::filePos& _filePos, ejson::Document& _doc); virtual bool iGenerate(std::string& _data, size_t _indent) const; virtual bool transfertIn(std::shared_ptr _obj); - virtual std::shared_ptr duplicate() const; + virtual std::shared_ptr clone() const; }; }; diff --git a/ejson/Value.h b/ejson/Value.h index e936239..11f7e0d 100644 --- a/ejson/Value.h +++ b/ejson/Value.h @@ -292,7 +292,7 @@ namespace ejson { * @brief Copy the curent node and all the child in the curent one. * @return nullptr in an error occured, the pointer on the element otherwise */ - virtual std::shared_ptr duplicate() const { + virtual std::shared_ptr clone() const { return nullptr; }; protected: