From 68808c650fc95660c9eb0d8f0bf97701b8076eb8 Mon Sep 17 00:00:00 2001 From: Patrick Benavoli Date: Thu, 2 Feb 2012 17:12:41 +0100 Subject: 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 Reviewed-on: http://android.intel.com:8080/33756 Reviewed-by: Barthes, FabienX Tested-by: Barthes, FabienX Reviewed-by: buildbot Tested-by: buildbot --- parameter/EnumParameterType.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'parameter/EnumParameterType.h') 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::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 _valuePairList; }; -- cgit v1.1