From d9526499d6ab53b7d13d1434f748f6f2161c2e0a Mon Sep 17 00:00:00 2001
From: Sebastien Gonzalve <oznog@zarb.org>
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/ConfigurableDomains.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'parameter/ConfigurableDomains.cpp')

diff --git a/parameter/ConfigurableDomains.cpp b/parameter/ConfigurableDomains.cpp
index 48975d6..f11a155 100644
--- a/parameter/ConfigurableDomains.cpp
+++ b/parameter/ConfigurableDomains.cpp
@@ -36,6 +36,8 @@
 
 #define base CBinarySerializableElement
 
+using std::string;
+
 CConfigurableDomains::CConfigurableDomains()
 {
 }
@@ -284,13 +286,13 @@ void CConfigurableDomains::listAssociatedElements(string& strResult) const
 {
     strResult = "\n";
 
-    set<const CConfigurableElement*> configurableElementSet;
+    std::set<const CConfigurableElement*> configurableElementSet;
 
     // Get all owned configurable elements
     gatherAllOwnedConfigurableElements(configurableElementSet);
 
     // Fill result
-    set<const CConfigurableElement*>::const_iterator it;
+    std::set<const CConfigurableElement*>::const_iterator it;
 
     for (it = configurableElementSet.begin(); it != configurableElementSet.end(); ++it) {
 
@@ -308,13 +310,13 @@ void CConfigurableDomains::listConflictingElements(string& strResult) const
 {
     strResult = "\n";
 
-    set<const CConfigurableElement*> configurableElementSet;
+    std::set<const CConfigurableElement*> configurableElementSet;
 
     // Get all owned configurable elements
     gatherAllOwnedConfigurableElements(configurableElementSet);
 
     // Fill result
-    set<const CConfigurableElement*>::const_iterator it;
+    std::set<const CConfigurableElement*>::const_iterator it;
 
     for (it = configurableElementSet.begin(); it != configurableElementSet.end(); ++it) {
 
@@ -356,7 +358,7 @@ void CConfigurableDomains::listDomains(string& strResult) const
 }
 
 // Gather configurable elements owned by any domain
-void CConfigurableDomains::gatherAllOwnedConfigurableElements(set<const CConfigurableElement*>& configurableElementSet) const
+void CConfigurableDomains::gatherAllOwnedConfigurableElements(std::set<const CConfigurableElement*>& configurableElementSet) const
 {
     // Delegate to domains
     uint32_t uiChild;
@@ -371,7 +373,7 @@ void CConfigurableDomains::gatherAllOwnedConfigurableElements(set<const CConfigu
 }
 
 // Config restore
-bool CConfigurableDomains::restoreConfiguration(const string& strDomain, const string& strConfiguration, CParameterBlackboard* pMainBlackboard, bool bAutoSync, list<string>& lstrError) const
+bool CConfigurableDomains::restoreConfiguration(const string& strDomain, const string& strConfiguration, CParameterBlackboard* pMainBlackboard, bool bAutoSync, std::list<string>& lstrError) const
 {
     string strError;
     // Find domain
@@ -400,7 +402,7 @@ bool CConfigurableDomains::saveConfiguration(const string& strDomain, const stri
     return pConfigurableDomain->saveConfiguration(strConfiguration, pMainBlackboard, strError);
 }
 
-bool CConfigurableDomains::setElementSequence(const string& strDomain, const string& strConfiguration, const vector<string>& astrNewElementSequence, string& strError)
+bool CConfigurableDomains::setElementSequence(const string& strDomain, const string& strConfiguration, const std::vector<string>& astrNewElementSequence, string& strError)
 {
     // Find domain
     CConfigurableDomain* pConfigurableDomain = findConfigurableDomain(strDomain, strError);
-- 
cgit v1.1