From d9526499d6ab53b7d13d1434f748f6f2161c2e0a Mon Sep 17 00:00:00 2001 From: Sebastien Gonzalve Date: Thu, 20 Feb 2014 22:28:03 +0100 Subject: Remove using std::XXX from headers This is a bad practice to have using in headers because it pollutes the namespace of any user of that header. --- parameter/ComponentType.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'parameter/ComponentType.cpp') diff --git a/parameter/ComponentType.cpp b/parameter/ComponentType.cpp index fd54c99..ee71596 100644 --- a/parameter/ComponentType.cpp +++ b/parameter/ComponentType.cpp @@ -35,11 +35,11 @@ #define base CTypeElement -CComponentType::CComponentType(const string& strName) : base(strName), _pExtendsComponentType(NULL) +CComponentType::CComponentType(const std::string& strName) : base(strName), _pExtendsComponentType(NULL) { } -string CComponentType::getKind() const +std::string CComponentType::getKind() const { return "ComponentType"; } @@ -49,7 +49,7 @@ bool CComponentType::childrenAreDynamic() const return true; } -bool CComponentType::getMappingData(const string& strKey, const string*& pStrValue) const +bool CComponentType::getMappingData(const std::string& strKey, const std::string*& pStrValue) const { // Try myself first then extended component type return base::getMappingData(strKey, pStrValue) || (_pExtendsComponentType && _pExtendsComponentType->getMappingData(strKey, pStrValue)); @@ -61,10 +61,10 @@ bool CComponentType::hasMappingData() const return base::hasMappingData() || (_pExtendsComponentType && _pExtendsComponentType->hasMappingData()); } -string CComponentType::getFormattedMapping() const +std::string CComponentType::getFormattedMapping() const { // Try myself first then associated component type - string strValue = base::getFormattedMapping(); + std::string strValue = base::getFormattedMapping(); if (_pExtendsComponentType) { strValue += _pExtendsComponentType->getFormattedMapping(); @@ -89,7 +89,7 @@ bool CComponentType::fromXml(const CXmlElement& xmlElement, CXmlSerializingConte // Check for Extends attribute (extensions will be populated after and not before) if (xmlElement.hasAttribute("Extends")) { - string strExtendsType = xmlElement.getAttributeString("Extends"); + std::string strExtendsType = xmlElement.getAttributeString("Extends"); _pExtendsComponentType = pComponentLibrary->getComponentType(strExtendsType); -- cgit v1.1