commit d9526499d6ab53b7d13d1434f748f6f2161c2e0a
author Sebastien Gonzalve <oznog@zarb.org> Thu Feb 20 22:28:03 2014 +0100
committer David Wagner <david.wagner@intel.com> Thu Sep 11 14:25:02 2014 +0200
tree 8d2e2db275800821d4bf8873fc16b686bca60b2d
parent ffbf43b383bb8693741430b02c24dbc9b127f7f7

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/InstanceConfigurableElement.cpp

diff --git a/parameter/InstanceConfigurableElement.cpp b/parameter/InstanceConfigurableElement.cpp
index 003a606..bfa011c 100644
--- a/parameter/InstanceConfigurableElement.cpp
+++ b/parameter/InstanceConfigurableElement.cpp
@@ -37,11 +37,11 @@
 
 #define base CConfigurableElementWithMapping
 
-CInstanceConfigurableElement::CInstanceConfigurableElement(const string& strName, const CTypeElement* pTypeElement) : base(strName), _pTypeElement(pTypeElement), _pSyncer(NULL)
+CInstanceConfigurableElement::CInstanceConfigurableElement(const std::string& strName, const CTypeElement* pTypeElement) : base(strName), _pTypeElement(pTypeElement), _pSyncer(NULL)
 {
 }
 
-string CInstanceConfigurableElement::getKind() const
+std::string CInstanceConfigurableElement::getKind() const
 {
     // Delegate
     return _pTypeElement->getKind();
@@ -54,20 +54,20 @@
 }
 
 // Mapping
-bool CInstanceConfigurableElement::getMappingData(const string& strKey, const string*& pStrValue) const
+bool CInstanceConfigurableElement::getMappingData(const std::string& strKey, const std::string*& pStrValue) const
 {
     // Delegate
     return getTypeElement()->getMappingData(strKey, pStrValue);
 }
 
 // Returns the formatted mapping
-string CInstanceConfigurableElement::getFormattedMapping() const
+std::string CInstanceConfigurableElement::getFormattedMapping() const
 {
     // Delegate
     return getTypeElement()->getFormattedMapping();
 }
 
-bool CInstanceConfigurableElement::map(IMapper& mapper, string& strError)
+bool CInstanceConfigurableElement::map(IMapper& mapper, std::string& strError)
 {
     bool bHasMappingData = getTypeElement()->hasMappingData();
     bool bKeepDiving = true;
@@ -106,7 +106,7 @@
 }
 
 void CInstanceConfigurableElement::getListOfElementsWithMapping(
-        list<const CConfigurableElement*>& configurableElementPath) const
+        std::list<const CConfigurableElement*>& configurableElementPath) const
 {
     const CTypeElement* pTypeElement = getTypeElement();
 
@@ -119,7 +119,7 @@
 }
 
 // Element properties
-void CInstanceConfigurableElement::showProperties(string& strResult) const
+void CInstanceConfigurableElement::showProperties(std::string& strResult) const
 {
     base::showProperties(strResult);
 
@@ -191,7 +191,7 @@
 
         return false;
     }
-    string strError;
+    std::string strError;
 
     if (!pSyncer->sync(*parameterAccessContext.getParameterBlackboard(), false, strError)) {
 
@@ -205,7 +205,7 @@
 // Check parameter access path well formed for leaf elements
 bool CInstanceConfigurableElement::checkPathExhausted(CPathNavigator& pathNavigator, CErrorContext& errorContext)
 {
-    string* pStrChildName = pathNavigator.next();
+    std::string* pStrChildName = pathNavigator.next();
 
     if (pStrChildName) {