From b71ccf75a1b2c718543783b277bb9c104c97e490 Mon Sep 17 00:00:00 2001 From: Patrick Benavoli Date: Tue, 13 Sep 2011 14:15:52 +0200 Subject: parameter-framework: Changed criterion interface BZ: 9561 - separated selection criterion change event indication form configuration application requests in different APIs - added a way to retrieve selection criterion from its name - updated version number 0.2.1 Change-Id: Icf4560fe67001655a171401f106296b9aa09afb3 Orig-Change-Id: I8dfb05ba1e704888c5c1ff9268a2a2e9a46af9bb Signed-off-by: Patrick Benavoli Reviewed-on: http://android.intel.com:8080/20208 Reviewed-by: Barthes, FabienX Tested-by: Barthes, FabienX Reviewed-by: buildbot Tested-by: buildbot --- parameter/ParameterMgr.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'parameter/ParameterMgr.h') diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h index 74440f8..4596843 100644 --- a/parameter/ParameterMgr.h +++ b/parameter/ParameterMgr.h @@ -36,7 +36,6 @@ #include "SelectionCriterionType.h" #include "SelectionCriterion.h" #include "Element.h" -#include "SelectionCriterionObserver.h" #include #include @@ -52,7 +51,7 @@ class CConfigurableDomains; class IRemoteProcessorServerInterface; class CBackSynchronizer; -class CParameterMgr : private CElement, private IRemoteCommandHandler, private ISelectionCriterionObserver +class CParameterMgr : private CElement, private IRemoteCommandHandler { enum ChildElement { EFrameworkConfiguration, @@ -94,7 +93,7 @@ class CParameterMgr : private CElement, private IRemoteCommandHandler, private I // Version static const uint32_t guiEditionMajor = 0x0; - static const uint32_t guiEditionMinor = 0x1; + static const uint32_t guiEditionMinor = 0x2; static const uint32_t guiRevision = 0x1; public: // Logger interface @@ -118,6 +117,11 @@ public: // Selection Criteria CSelectionCriterionType* createSelectionCriterionType(bool bIsInclusive); CSelectionCriterion* createSelectionCriterion(const string& strName, const CSelectionCriterionType* pSelectionCriterionType); + // Selection criterion retrieval + CSelectionCriterion* getSelectionCriterion(const string& strName); + + // Configuration application + bool applyConfigurations(string& strError); //////////// Tuning ///////////// // Tuning mode @@ -176,9 +180,6 @@ private: virtual void nestLog() const; virtual void unnestLog() const; - // From ISelectionCriterionObserver: selection criteria changed event - virtual void selectionCriterionChanged(const CSelectionCriterion* pSelectionCriterion); - // From IRemoteCommandHandler: return true on success, fill result in any cases virtual bool remoteCommandProcess(const IRemoteCommand& remoteCommand, string& strResult); -- cgit v1.1