diff options
author | Sebastien Gonzalve <oznog@zarb.org> | 2014-02-20 22:28:03 +0100 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-09-11 14:25:02 +0200 |
commit | d9526499d6ab53b7d13d1434f748f6f2161c2e0a (patch) | |
tree | 8d2e2db275800821d4bf8873fc16b686bca60b2d /parameter/IntegerParameterType.h | |
parent | ffbf43b383bb8693741430b02c24dbc9b127f7f7 (diff) | |
download | external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.zip external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.gz external_parameter-framework-d9526499d6ab53b7d13d1434f748f6f2161c2e0a.tar.bz2 |
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.
Diffstat (limited to 'parameter/IntegerParameterType.h')
-rwxr-xr-x | parameter/IntegerParameterType.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/parameter/IntegerParameterType.h b/parameter/IntegerParameterType.h index 3e551ef..53bd4a8 100755 --- a/parameter/IntegerParameterType.h +++ b/parameter/IntegerParameterType.h @@ -31,12 +31,14 @@ #include "ParameterType.h" +#include <string> + class CParameterAdaptation; class CIntegerParameterType : public CParameterType { public: - CIntegerParameterType(const string& strName); + CIntegerParameterType(const std::string& strName); // From IXmlSink virtual bool fromXml(const CXmlElement& xmlElement, CXmlSerializingContext& serializingContext); @@ -46,8 +48,8 @@ public: /// Conversion // String - virtual bool toBlackboard(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; - virtual bool fromBlackboard(string& strValue, const uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; + virtual bool toBlackboard(const std::string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; + virtual bool fromBlackboard(std::string& strValue, const uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; // Integer virtual bool toBlackboard(uint32_t uiUserValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const; virtual bool fromBlackboard(uint32_t& uiUserValue, uint32_t uiValue, CParameterAccessContext& parameterAccessContext) const; @@ -62,23 +64,23 @@ public: virtual uint32_t getDefaultValue() const; // Element properties - virtual void showProperties(string& strResult) const; + virtual void showProperties(std::string& strResult) const; // Integer conversion virtual int toPlainInteger(int iSizeOptimizedData) const; // CElement - virtual string getKind() const; + virtual std::string getKind() const; private: // Returns true if children dynamic creation is to be dealt with virtual bool childrenAreDynamic() const; - // Conversion from string - bool convertValueFromString(const string& strValue, int64_t& iData, CParameterAccessContext& parameterAccessContext) const; + // Conversion from std::string + bool convertValueFromString(const std::string& strValue, int64_t& iData, CParameterAccessContext& parameterAccessContext) const; // Range checking - template <typename type> bool checkValueAgainstRange(const string& strValue, type value, type minValue, type maxValue, CParameterAccessContext& parameterAccessContext, bool bHexaValue) const; + template <typename type> bool checkValueAgainstRange(const std::string& strValue, type value, type minValue, type maxValue, CParameterAccessContext& parameterAccessContext, bool bHexaValue) const; // Adaptation element retrieval const CParameterAdaptation* getParameterAdaptation() const; |