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/BaseParameter.h | |
| 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/BaseParameter.h')
| -rw-r--r-- | parameter/BaseParameter.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/parameter/BaseParameter.h b/parameter/BaseParameter.h index 3b1296e..848d638 100644 --- a/parameter/BaseParameter.h +++ b/parameter/BaseParameter.h @@ -40,7 +40,7 @@ class CConfigurationAccessContext; class CBaseParameter : public CInstanceConfigurableElement { public: - CBaseParameter(const string& strName, const CTypeElement* pTypeElement); + CBaseParameter(const std::string& strName, const CTypeElement* pTypeElement); // XML configuration settings parsing/composing virtual bool serializeXmlSettings(CXmlElement& xmlConfigurationSettingsElementContent, CConfigurationAccessContext& configurationAccessContext) const; @@ -51,35 +51,35 @@ public: /// Value access // Boolean access virtual bool accessAsBoolean(bool& bValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual bool accessAsBooleanArray(vector<bool>& abValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual bool accessAsBooleanArray(std::vector<bool>& abValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; // Integer Access virtual bool accessAsInteger(uint32_t& uiValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual bool accessAsIntegerArray(vector<uint32_t>& auiValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual bool accessAsIntegerArray(std::vector<uint32_t>& auiValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; // Signed Integer Access virtual bool accessAsSignedInteger(int32_t& iValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual bool accessAsSignedIntegerArray(vector<int32_t>& aiValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual bool accessAsSignedIntegerArray(std::vector<int32_t>& aiValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; // Double Access virtual bool accessAsDouble(double& dValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual bool accessAsDoubleArray(vector<double>& adValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual bool accessAsDoubleArray(std::vector<double>& adValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; // String Access - bool accessAsString(string& strValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual bool accessAsStringArray(vector<string>& astrValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; + bool accessAsString(std::string& strValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual bool accessAsStringArray(std::vector<std::string>& astrValues, bool bSet, CParameterAccessContext& parameterAccessContext) const; // From IXmlSource virtual void toXml(CXmlElement& xmlElement, CXmlSerializingContext& serializingContext) const; protected: // Parameter Access - virtual bool accessValue(CPathNavigator& pathNavigator, string& strValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; - virtual void logValue(string& strValue, CErrorContext& errorContext) const; + virtual bool accessValue(CPathNavigator& pathNavigator, std::string& strValue, bool bSet, CParameterAccessContext& parameterAccessContext) const; + virtual void logValue(std::string& strValue, CErrorContext& errorContext) const; // Actual value access (to be implemented by derived) - virtual bool doSetValue(const string& strValue, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const = 0; - virtual void doGetValue(string& strValue, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const = 0; + virtual bool doSetValue(const std::string& strValue, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const = 0; + virtual void doGetValue(std::string& strValue, uint32_t uiOffset, CParameterAccessContext& parameterAccessContext) const = 0; /** * Append the parameter path to the error. |