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/ParameterHandle.cpp | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'parameter/ParameterHandle.cpp') diff --git a/parameter/ParameterHandle.cpp b/parameter/ParameterHandle.cpp index 230a2f1..b513972 100644 --- a/parameter/ParameterHandle.cpp +++ b/parameter/ParameterHandle.cpp @@ -35,6 +35,8 @@ #include "ParameterMgr.h" #include "AutoLock.h" +using std::string; + CParameterHandle::CParameterHandle(const CBaseParameter* pParameter, CParameterMgr* pParameterMgr) : _pBaseParameter(pParameter), _pParameterMgr(pParameterMgr), _bBigEndianSubsystem(pParameter->getBelongingSubsystem()->isBigEndian()) { @@ -108,7 +110,7 @@ bool CParameterHandle::getAsBoolean(bool& bValue, string& strError) const return _pBaseParameter->accessAsBoolean(bValue, false, parameterAccessContext); } -bool CParameterHandle::setAsBooleanArray(const vector& abValues, string& strError) +bool CParameterHandle::setAsBooleanArray(const std::vector& abValues, string& strError) { // Check operation validity if (!checkAccessValidity(true, abValues.size(), strError)) { @@ -128,12 +130,12 @@ bool CParameterHandle::setAsBooleanArray(const vector& abValues, string& s CParameterAccessContext parameterAccessContext(strError, _bBigEndianSubsystem, _pParameterMgr->getParameterBlackboard()); // Copy values for type adaptation - vector abUserValues = abValues; + std::vector abUserValues = abValues; return _pBaseParameter->accessAsBooleanArray(abUserValues, true, parameterAccessContext); } -bool CParameterHandle::getAsBooleanArray(vector& abValues, string& strError) const +bool CParameterHandle::getAsBooleanArray(std::vector& abValues, string& strError) const { // Check operation validity if (!checkAccessValidity(false, -1, strError)) { @@ -188,7 +190,7 @@ bool CParameterHandle::getAsInteger(uint32_t& uiValue, string& strError) const return _pBaseParameter->accessAsInteger(uiValue, false, parameterAccessContext); } -bool CParameterHandle::setAsIntegerArray(const vector& auiValues, string& strError) +bool CParameterHandle::setAsIntegerArray(const std::vector& auiValues, string& strError) { // Check operation validity if (!checkAccessValidity(true, auiValues.size(), strError)) { @@ -208,12 +210,12 @@ bool CParameterHandle::setAsIntegerArray(const vector& auiValues, stri CParameterAccessContext parameterAccessContext(strError, _bBigEndianSubsystem, _pParameterMgr->getParameterBlackboard()); // Copy values for type adaptation - vector auiUserValues = auiValues; + std::vector auiUserValues = auiValues; return _pBaseParameter->accessAsIntegerArray(auiUserValues, true, parameterAccessContext); } -bool CParameterHandle::getAsIntegerArray(vector& auiValues, string& strError) const +bool CParameterHandle::getAsIntegerArray(std::vector& auiValues, string& strError) const { // Check operation validity if (!checkAccessValidity(false, -1, strError)) { @@ -268,7 +270,7 @@ bool CParameterHandle::getAsSignedInteger(int32_t& iValue, string& strError) con return _pBaseParameter->accessAsSignedInteger(iValue, false, parameterAccessContext); } -bool CParameterHandle::setAsSignedIntegerArray(const vector& aiValues, string& strError) +bool CParameterHandle::setAsSignedIntegerArray(const std::vector& aiValues, string& strError) { // Check operation validity if (!checkAccessValidity(true, aiValues.size(), strError)) { @@ -288,12 +290,12 @@ bool CParameterHandle::setAsSignedIntegerArray(const vector& aiValues, CParameterAccessContext parameterAccessContext(strError, _bBigEndianSubsystem, _pParameterMgr->getParameterBlackboard()); // Copy values for type adaptation - vector aiUserValues = aiValues; + std::vector aiUserValues = aiValues; return _pBaseParameter->accessAsSignedIntegerArray(aiUserValues, true, parameterAccessContext); } -bool CParameterHandle::getAsSignedIntegerArray(vector& aiValues, string& strError) const +bool CParameterHandle::getAsSignedIntegerArray(std::vector& aiValues, string& strError) const { // Check operation validity if (!checkAccessValidity(false, -1, strError)) { @@ -348,7 +350,7 @@ bool CParameterHandle::getAsDouble(double& dValue, string& strError) const return _pBaseParameter->accessAsDouble(dValue, false, parameterAccessContext); } -bool CParameterHandle::setAsDoubleArray(const vector& adValues, string& strError) +bool CParameterHandle::setAsDoubleArray(const std::vector& adValues, string& strError) { // Check operation validity if (!checkAccessValidity(true, adValues.size(), strError)) { @@ -368,12 +370,12 @@ bool CParameterHandle::setAsDoubleArray(const vector& adValues, string& CParameterAccessContext parameterAccessContext(strError, _bBigEndianSubsystem, _pParameterMgr->getParameterBlackboard()); // Copy values for type adaptation - vector adUserValues = adValues; + std::vector adUserValues = adValues; return _pBaseParameter->accessAsDoubleArray(adUserValues, true, parameterAccessContext); } -bool CParameterHandle::getAsDoubleArray(vector& adValues, string& strError) const +bool CParameterHandle::getAsDoubleArray(std::vector& adValues, string& strError) const { // Check operation validity if (!checkAccessValidity(false, -1, strError)) { @@ -431,7 +433,7 @@ bool CParameterHandle::getAsString(string& strValue, string& strError) const return _pBaseParameter->accessAsString(strValue, false, parameterAccessContext); } -bool CParameterHandle::setAsStringArray(const vector& astrValues, string& strError) +bool CParameterHandle::setAsStringArray(const std::vector& astrValues, string& strError) { // Check operation validity if (!checkAccessValidity(true, astrValues.size(), strError)) { @@ -451,12 +453,12 @@ bool CParameterHandle::setAsStringArray(const vector& astrValues, string CParameterAccessContext parameterAccessContext(strError, _bBigEndianSubsystem, _pParameterMgr->getParameterBlackboard()); // Copy values for type adaptation - vector astrUserValues = astrValues; + std::vector astrUserValues = astrValues; return _pBaseParameter->accessAsStringArray(astrUserValues, true, parameterAccessContext); } -bool CParameterHandle::getAsStringArray(vector& astrValues, string& strError) const +bool CParameterHandle::getAsStringArray(std::vector& astrValues, string& strError) const { // Check operation validity if (!checkAccessValidity(false, -1, strError)) { -- cgit v1.1