aboutsummaryrefslogtreecommitdiffstats
path: root/parameter/TypeElement.cpp
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2014-10-24 17:41:58 +0200
committerDavid Wagner <david.wagner@intel.com>2014-10-24 17:41:58 +0200
commitd9ad02e2a322fff355cd113c5bb98ff4667a95f2 (patch)
tree7bfbb4fd253ffa8abb98f03887a4e76f1f26caaa /parameter/TypeElement.cpp
parenta022e315ecfede7bb37ab17382482eb794b33f00 (diff)
parentd9526499d6ab53b7d13d1434f748f6f2161c2e0a (diff)
downloadexternal_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/TypeElement.cpp')
-rwxr-xr-xparameter/TypeElement.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/parameter/TypeElement.cpp b/parameter/TypeElement.cpp
index 6e1c9aa..7e58c75 100755
--- a/parameter/TypeElement.cpp
+++ b/parameter/TypeElement.cpp
@@ -35,7 +35,7 @@
#define base CElement
-CTypeElement::CTypeElement(const string& strName) : base(strName), _uiArrayLength(0), _pMappingData(NULL)
+CTypeElement::CTypeElement(const std::string& strName) : base(strName), _uiArrayLength(0), _pMappingData(NULL)
{
}
@@ -59,7 +59,7 @@ int CTypeElement::toPlainInteger(int iSizeOptimizedData) const
return iSizeOptimizedData;
}
-bool CTypeElement::getMappingData(const string& strKey, const string*& pStrValue) const
+bool CTypeElement::getMappingData(const std::string& strKey, const std::string*& pStrValue) const
{
if (_pMappingData) {
@@ -74,7 +74,7 @@ bool CTypeElement::hasMappingData() const
}
// Element properties
-void CTypeElement::showProperties(string& strResult) const
+void CTypeElement::showProperties(std::string& strResult) const
{
(void)strResult;
// Prevent base from being called in that context!
@@ -136,7 +136,7 @@ CMappingData* CTypeElement::getMappingData()
return _pMappingData;
}
-string CTypeElement::getFormattedMapping() const
+std::string CTypeElement::getFormattedMapping() const
{
if (_pMappingData) {