atria-soft/exml
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update to the new ememory interface (new sharedPtr implementation ==> add cnstness contamination)

Browse Source
This commit is contained in:
Edouard DUPIN 2016-07-15 00:01:26 +02:00
parent 6926e678c5
commit 233c303d93
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
exml/Attribute.cpp
View File

@ -53,7 +53,7 @@ const std::string& exml::Attribute::getName() const {
EXML_ERROR(" can not setName (nullptr) ..."); EXML_ERROR(" can not setName (nullptr) ...");
return errorValue; return errorValue;
} }
return static_cast<exml::internal::Attribute*>(m_data.get())->getName(); return static_cast<const exml::internal::Attribute*>(m_data.get())->getName();
} }
void exml::Attribute::clear() { void exml::Attribute::clear() {
@ -69,11 +69,11 @@ std::pair<std::string, std::string> exml::Attribute::getPair() const {
EXML_ERROR(" can not setName (nullptr) ..."); EXML_ERROR(" can not setName (nullptr) ...");
return std::pair<std::string, std::string>("",""); return std::pair<std::string, std::string>("","");
} }
return std::pair<std::string, std::string>(static_cast<exml::internal::Attribute*>(m_data.get())->getName(), return std::pair<std::string, std::string>(static_cast<const exml::internal::Attribute*>(m_data.get())->getName(),
static_cast<exml::internal::Attribute*>(m_data.get())->getValue()); static_cast<const exml::internal::Attribute*>(m_data.get())->getValue());
} }
ememory::SharedPtr<exml::internal::Attribute> exml::Attribute::getInternalAttribute() { ememory::SharedPtr<exml::internal::Attribute> exml::Attribute::getInternalAttribute() {
return std::static_pointer_cast<exml::internal::Attribute>(m_data); return ememory::staticPointerCast<exml::internal::Attribute>(m_data);
} }

2
exml/Document.cpp
View File

@ -87,7 +87,7 @@ bool exml::Document::getCaseSensitive() const {
EXML_ERROR("Can not getCaseSensitive (nullptr) ..."); EXML_ERROR("Can not getCaseSensitive (nullptr) ...");
return false; return false;
} }
return static_cast<exml::internal::Document*>(m_data.get())->getCaseSensitive(); return static_cast<const exml::internal::Document*>(m_data.get())->getCaseSensitive();
} }
void exml::Document::setDisplayError(bool _value){ void exml::Document::setDisplayError(bool _value){

10
exml/Element.cpp
View File

@ -65,7 +65,7 @@ size_t exml::ElementData::size() const {
EXML_ERROR(" can not get type ..."); EXML_ERROR(" can not get type ...");
return 0; return 0;
} }
return static_cast<exml::internal::Element*>(m_data->m_data.get())->size(); return static_cast<const exml::internal::Element*>(m_data->m_data.get())->size();
} }
enum exml::nodeType exml::ElementData::getType(int32_t _id) const { enum exml::nodeType exml::ElementData::getType(int32_t _id) const {
@ -73,7 +73,7 @@ enum exml::nodeType exml::ElementData::getType(int32_t _id) const {
EXML_ERROR(" can not get type ..."); EXML_ERROR(" can not get type ...");
return exml::nodeType::unknow; return exml::nodeType::unknow;
} }
return static_cast<exml::internal::Element*>(m_data->m_data.get())->getType(_id); return static_cast<const exml::internal::Element*>(m_data->m_data.get())->getType(_id);
} }
exml::Node exml::ElementData::operator[](int32_t _id) { exml::Node exml::ElementData::operator[](int32_t _id) {
@ -89,7 +89,7 @@ const exml::Node exml::ElementData::operator[](int32_t _id) const {
EXML_ERROR(" can not get type ..."); EXML_ERROR(" can not get type ...");
return exml::Node(); return exml::Node();
} }
return exml::Node(static_cast<exml::internal::Element*>(m_data->m_data.get())->getNode(_id)); return exml::Node(static_cast<const exml::internal::Element*>(m_data->m_data.get())->getNode(_id));
} }
exml::Element exml::ElementData::operator[](const std::string& _name) { exml::Element exml::ElementData::operator[](const std::string& _name) {
@ -105,7 +105,7 @@ const exml::Element exml::ElementData::operator[] (const std::string& _name) con
EXML_ERROR(" can not get type ..."); EXML_ERROR(" can not get type ...");
return exml::Element(); return exml::Element();
} }
return exml::Element(static_cast<exml::internal::Element*>(m_data->m_data.get())->getNamed(_name)); return exml::Element(static_cast<const exml::internal::Element*>(m_data->m_data.get())->getNamed(_name));
} }
void exml::ElementData::add(const exml::Node& _node) { void exml::ElementData::add(const exml::Node& _node) {
@ -129,7 +129,7 @@ std::string exml::Element::getText() const {
EXML_ERROR(" can not APPEND on null element ..."); EXML_ERROR(" can not APPEND on null element ...");
return ""; return "";
} }
return static_cast<exml::internal::Element*>(m_data.get())->getText(); return static_cast<const exml::internal::Element*>(m_data.get())->getText();
} }
void exml::Element::clear() { void exml::Element::clear() {

4
exml/internal/Attribute.h
View File

@ -53,10 +53,10 @@ namespace exml {
bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override; bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
ememory::SharedPtr<exml::internal::Attribute> toAttribute() override { ememory::SharedPtr<exml::internal::Attribute> toAttribute() override {
return std::static_pointer_cast<exml::internal::Attribute>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Attribute>(sharedFromThis());
}; };
ememory::SharedPtr<const exml::internal::Attribute> toAttribute() const override { ememory::SharedPtr<const exml::internal::Attribute> toAttribute() const override {
return std::static_pointer_cast<const exml::internal::Attribute>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Attribute>(sharedFromThis());
}; };
void clear() override; void clear() override;
}; };

4
exml/internal/Comment.h
View File

@ -36,10 +36,10 @@ namespace exml {
bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override; bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
ememory::SharedPtr<exml::internal::Comment> toComment() override { ememory::SharedPtr<exml::internal::Comment> toComment() override {
return std::static_pointer_cast<exml::internal::Comment>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Comment>(sharedFromThis());
} }
ememory::SharedPtr<const exml::internal::Comment> toComment() const override { ememory::SharedPtr<const exml::internal::Comment> toComment() const override {
return std::static_pointer_cast<const exml::internal::Comment>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Comment>(sharedFromThis());
} }
}; };
} }

4
exml/internal/Declaration.h
View File

@ -36,10 +36,10 @@ namespace exml {
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override; bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
ememory::SharedPtr<exml::internal::Declaration> toDeclaration() override { ememory::SharedPtr<exml::internal::Declaration> toDeclaration() override {
return std::static_pointer_cast<exml::internal::Declaration>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Declaration>(sharedFromThis());
}; };
ememory::SharedPtr<const exml::internal::Declaration> toDeclaration() const override { ememory::SharedPtr<const exml::internal::Declaration> toDeclaration() const override {
return std::static_pointer_cast<const exml::internal::Declaration>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Declaration>(sharedFromThis());
}; };
}; };
/** /**

4
exml/internal/Document.h
View File

@ -110,10 +110,10 @@ namespace exml {
} }
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
ememory::SharedPtr<exml::internal::Document> toDocument() override { ememory::SharedPtr<exml::internal::Document> toDocument() override {
return std::static_pointer_cast<exml::internal::Document>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Document>(sharedFromThis());
} }
ememory::SharedPtr<const exml::internal::Document> toDocument() const override { ememory::SharedPtr<const exml::internal::Document> toDocument() const override {
return std::static_pointer_cast<const exml::internal::Document>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Document>(sharedFromThis());
} }
}; };
} }

4
exml/internal/Element.h
View File

@ -127,10 +127,10 @@ namespace exml {
bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override; bool iParse(const std::string& _data, int32_t& _pos, bool _caseSensitive, exml::FilePos& _filePos, exml::internal::Document& _doc) override;
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
ememory::SharedPtr<exml::internal::Element> toElement() override { ememory::SharedPtr<exml::internal::Element> toElement() override {
return std::static_pointer_cast<exml::internal::Element>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Element>(sharedFromThis());
} }
ememory::SharedPtr<const exml::internal::Element> toElement() const override { ememory::SharedPtr<const exml::internal::Element> toElement() const override {
return std::static_pointer_cast<const exml::internal::Element>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Element>(sharedFromThis());
} }
void clear() override; void clear() override;
}; };

4
exml/internal/Text.h
View File

@ -47,10 +47,10 @@ namespace exml {
exml::internal::Document& _doc) override; exml::internal::Document& _doc) override;
bool iGenerate(std::string& _data, int32_t _indent) const override; bool iGenerate(std::string& _data, int32_t _indent) const override;
ememory::SharedPtr<exml::internal::Text> toText() override { ememory::SharedPtr<exml::internal::Text> toText() override {
return std::static_pointer_cast<exml::internal::Text>(shared_from_this()); return ememory::staticPointerCast<exml::internal::Text>(sharedFromThis());
}; };
ememory::SharedPtr<const exml::internal::Text> toText() const override { ememory::SharedPtr<const exml::internal::Text> toText() const override {
return std::static_pointer_cast<const exml::internal::Text>(shared_from_this()); return ememory::staticPointerCast<const exml::internal::Text>(sharedFromThis());
}; };
}; };
/** /**