From 31067e760153fa2d5243185935f6c8566af69ed8 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 10 Apr 2015 17:05:13 +0200 Subject: [PATCH 1/3] Remove unused CElement::getLastChild method Signed-off-by: David Wagner --- parameter/Element.cpp | 9 --------- parameter/Element.h | 1 - 2 files changed, 10 deletions(-) diff --git a/parameter/Element.cpp b/parameter/Element.cpp index f01217f5b..9641e9230 100644 --- a/parameter/Element.cpp +++ b/parameter/Element.cpp @@ -401,15 +401,6 @@ const CElement* CElement::getChild(size_t uiIndex) const return _childArray[uiIndex]; } -CElement* CElement::getLastChild() -{ - size_t uiNbChildren = getNbChildren(); - - assert(uiNbChildren); - - return _childArray[uiNbChildren - 1]; -} - CElement* CElement::createChild(const CXmlElement& childElement, CXmlSerializingContext& serializingContext) { diff --git a/parameter/Element.h b/parameter/Element.h index c93e2c413..ebb33a3ec 100644 --- a/parameter/Element.h +++ b/parameter/Element.h @@ -151,7 +151,6 @@ class CElement : public IXmlSink, public IXmlSource static void appendTitle(std::string& strTo, const std::string& strTitle); // Hierarchy - CElement* getLastChild(); CElement* getParent(); CElement* findAscendantOfKind(const std::string& strKind); From 466e0ea882eabacbd838c3863ab976f6c78ac975 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 10 Apr 2015 17:09:17 +0200 Subject: [PATCH 2/3] Remove unsued CElement::findAscendantOfKind method Signed-off-by: David Wagner --- parameter/Element.cpp | 14 -------------- parameter/Element.h | 1 - 2 files changed, 15 deletions(-) diff --git a/parameter/Element.cpp b/parameter/Element.cpp index 9641e9230..cacf49b6c 100644 --- a/parameter/Element.cpp +++ b/parameter/Element.cpp @@ -591,20 +591,6 @@ bool CElement::isDescendantOf(const CElement* pCandidateAscendant) const return _pParent->isDescendantOf(pCandidateAscendant); } -CElement* CElement::findAscendantOfKind(const string& strKind) -{ - if (!_pParent) { - - return NULL; - } - - if (_pParent->getKind() == strKind) { - - return _pParent; - } - return _pParent->findAscendantOfKind(strKind); -} - CElement* CElement::findChild(const string& strName) { uint32_t uiIndex; diff --git a/parameter/Element.h b/parameter/Element.h index ebb33a3ec..8423e32be 100644 --- a/parameter/Element.h +++ b/parameter/Element.h @@ -152,7 +152,6 @@ class CElement : public IXmlSink, public IXmlSource // Hierarchy CElement* getParent(); - CElement* findAscendantOfKind(const std::string& strKind); /** * Creates a child CElement from a child XML Element From 8b1804389b577caf18ed4b836b10833cce980d18 Mon Sep 17 00:00:00 2001 From: David Wagner Date: Fri, 10 Apr 2015 18:17:05 +0200 Subject: [PATCH 3/3] Remove unused CXmlElement::setComment method Signed-off-by: David Wagner --- xmlserializer/XmlElement.cpp | 5 ----- xmlserializer/XmlElement.h | 1 - 2 files changed, 6 deletions(-) diff --git a/xmlserializer/XmlElement.cpp b/xmlserializer/XmlElement.cpp index 8f86c770e..425e04104 100644 --- a/xmlserializer/XmlElement.cpp +++ b/xmlserializer/XmlElement.cpp @@ -238,11 +238,6 @@ void CXmlElement::setTextContent(const string& strContent) xmlAddChild(_pXmlElement, xmlNewText(BAD_CAST strContent.c_str())); } -void CXmlElement::setComment(const string& strComment) -{ - xmlAddChild(_pXmlElement, xmlNewComment(BAD_CAST strComment.c_str())); -} - // Child creation void CXmlElement::createChild(CXmlElement& childElement, const string& strType) { diff --git a/xmlserializer/XmlElement.h b/xmlserializer/XmlElement.h index 4673be4ff..afa84386f 100644 --- a/xmlserializer/XmlElement.h +++ b/xmlserializer/XmlElement.h @@ -69,7 +69,6 @@ class CXmlElement void setAttributeString(const std::string& strAttributeName, const std::string& strValue); void setNameAttribute(const std::string& strValue); void setTextContent(const std::string& strContent); - void setComment(const std::string& strComment); void setAttributeInteger(const std::string& strAttributeName, uint32_t uiValue); /** * Set attribute with signed integer