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/DomainConfiguration.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'parameter/DomainConfiguration.cpp') diff --git a/parameter/DomainConfiguration.cpp b/parameter/DomainConfiguration.cpp index fae22f2..41ffeef 100644 --- a/parameter/DomainConfiguration.cpp +++ b/parameter/DomainConfiguration.cpp @@ -39,6 +39,8 @@ #define base CBinarySerializableElement +using std::string; + CDomainConfiguration::CDomainConfiguration(const string& strName) : base(strName) { } @@ -72,7 +74,7 @@ bool CDomainConfiguration::parseSettings(CXmlElement& xmlConfigurationSettingsEl CXmlDomainSerializingContext& xmlDomainSerializingContext = static_cast(serializingContext); // Take care of configurable elements / area configurations ranks - list areaConfigurationList; + std::list areaConfigurationList; // Parse configurable element's configuration settings CXmlElement::CChildIterator it(xmlConfigurationSettingsElement); @@ -228,10 +230,10 @@ void CDomainConfiguration::removeConfigurableElement(const CConfigurableElement* } // Sequence management -bool CDomainConfiguration::setElementSequence(const vector& astrNewElementSequence, string& strError) +bool CDomainConfiguration::setElementSequence(const std::vector& astrNewElementSequence, string& strError) { // Build a new list of AreaConfiguration objects - list areaConfigurationList; + std::list areaConfigurationList; uint32_t uiConfigurableElement; @@ -369,7 +371,7 @@ void CDomainConfiguration::save(const CParameterBlackboard* pMainBlackboard) } // Apply data to current -bool CDomainConfiguration::restore(CParameterBlackboard* pMainBlackboard, bool bSync, list* plstrError) const +bool CDomainConfiguration::restore(CParameterBlackboard* pMainBlackboard, bool bSync, std::list* plstrError) const { bool bSuccess = true; @@ -514,7 +516,7 @@ CAreaConfiguration* CDomainConfiguration::findAreaConfiguration(const string& st } // AreaConfiguration retrieval from given area configuration list -CAreaConfiguration* CDomainConfiguration::findAreaConfiguration(const string& strConfigurableElementPath, const list& areaConfigurationList) const +CAreaConfiguration* CDomainConfiguration::findAreaConfiguration(const string& strConfigurableElementPath, const std::list& areaConfigurationList) const { AreaConfigurationListIterator it; @@ -533,7 +535,7 @@ CAreaConfiguration* CDomainConfiguration::findAreaConfiguration(const string& st } // Area configuration ordering -void CDomainConfiguration::reorderAreaConfigurations(const list& areaConfigurationList) +void CDomainConfiguration::reorderAreaConfigurations(const std::list& areaConfigurationList) { // Ensure elements in provided list appear first and ordered the same way in internal one -- cgit v1.1