diff options
author | Patrick Benavoli <patrickx.benavoli@intel.com> | 2012-02-02 17:12:41 +0100 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-02-10 17:15:02 +0100 |
commit | 68808c650fc95660c9eb0d8f0bf97701b8076eb8 (patch) | |
tree | 57fa617254a8895609a9c17608141b83f263bc2d /parameter/EnumParameterType.h | |
parent | 0bd50546a8d06a6865d32c695adf8893fa71250a (diff) | |
download | external_parameter-framework-68808c650fc95660c9eb0d8f0bf97701b8076eb8.zip external_parameter-framework-68808c650fc95660c9eb0d8f0bf97701b8076eb8.tar.gz external_parameter-framework-68808c650fc95660c9eb0d8f0bf97701b8076eb8.tar.bz2 |
PFW: Enum parameter mapping
BZ: 22125
Enum parameter types are now fully parsed as any other types, which allow
Mapping attributes to be correctly interpreted.
Now inner structure of enum parameter types is based on automatically
created objects: ValuePair
Slight adaptation of to ICS environment in Android.mk files and
XmlComposer (time.h).
More explicit error statement issued in case of plugin load failure in
SystemClass.cpp.
Added a log for Alsa mixer elements accesses.
Change-Id: Ia71fd854e639a288c5dae79260b1e2a0eb1a7ac2
Signed-off-by: Patrick Benavoli <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/33756
Reviewed-by: Barthes, FabienX <fabienx.barthes@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/EnumParameterType.h')
-rw-r--r-- | parameter/EnumParameterType.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/parameter/EnumParameterType.h b/parameter/EnumParameterType.h index 9ef6343..a195fea 100644 --- a/parameter/EnumParameterType.h +++ b/parameter/EnumParameterType.h @@ -36,15 +36,6 @@ class CEnumParameterType : public CParameterType { - // Value pairs - struct SValuePair - { - SValuePair(const string& strLiteral, int32_t iNumerical) : _strLiteral(strLiteral), _iNumerical(iNumerical) {} - - string _strLiteral; - int32_t _iNumerical; - }; - typedef list<SValuePair>::const_iterator ValuePairListIterator; public: CEnumParameterType(const string& strName); @@ -68,6 +59,8 @@ public: // CElement virtual string getKind() const; private: + // Returns true if children dynamic creation is to be dealt with + virtual bool childrenAreDynamic() const; // Check string is a number static bool isNumber(const string& strValue); @@ -77,7 +70,4 @@ private: // Numerical validity bool isValid(int32_t iNumerical) const; - - // Value pairs - list<SValuePair> _valuePairList; }; |