diff options
| author | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-10-24 17:41:58 +0200 |
| commit | d9ad02e2a322fff355cd113c5bb98ff4667a95f2 (patch) | |
| tree | 7bfbb4fd253ffa8abb98f03887a4e76f1f26caaa /parameter/ConfigurableDomains.cpp | |
| parent | a022e315ecfede7bb37ab17382482eb794b33f00 (diff) | |
| parent | d9526499d6ab53b7d13d1434f748f6f2161c2e0a (diff) | |
| download | external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.zip external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.gz external_parameter-framework-d9ad02e2a322fff355cd113c5bb98ff4667a95f2.tar.bz2 | |
Merge pull request #13 from 01org/OznOg-bis
some C++ cleanup
Diffstat (limited to 'parameter/ConfigurableDomains.cpp')
| -rw-r--r-- | parameter/ConfigurableDomains.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
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); |