summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2015-02-19 11:27:12 +0100
committerDavid Wagner <david.wagner@intel.com>2015-02-19 11:27:12 +0100
commit4f03c87b6eedf3c4e38c55a4a831ef3c1f63ebc8 (patch)
tree71fdc58021dc2b197316f559bf4f78790630532a
parentfe2f8a65feef9d3f695d6e3e2ffbe660729f982c (diff)
parentff3a60aaaeaa5bf316e0f498306d287710edd98b (diff)
downloadexternal_parameter-framework-4f03c87b6eedf3c4e38c55a4a831ef3c1f63ebc8.zip
external_parameter-framework-4f03c87b6eedf3c4e38c55a4a831ef3c1f63ebc8.tar.gz
external_parameter-framework-4f03c87b6eedf3c4e38c55a4a831ef3c1f63ebc8.tar.bz2
Merge pull request #50 from dawagner/make_parametermgr_init_private
Make CParameterMgr::init private
-rw-r--r--parameter/ParameterMgr.h4
-rw-r--r--parameter/ParameterMgrFullConnector.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
index 6a3ecb8..4ae6fda 100644
--- a/parameter/ParameterMgr.h
+++ b/parameter/ParameterMgr.h
@@ -118,7 +118,6 @@ public:
* @return true if no error occurred, false otherwise.
*/
bool load(std::string& strError);
- virtual bool init(std::string& strError);
// Selection Criteria
CSelectionCriterionType* createSelectionCriterionType(bool bIsInclusive);
@@ -359,6 +358,9 @@ private:
CParameterMgr(const CParameterMgr&);
CParameterMgr& operator=(const CParameterMgr&);
+ // Init
+ virtual bool init(std::string& strError);
+
// Logging (done by root)
virtual void doLog(bool bIsWarning, const std::string& strLog) const;
virtual void nestLog() const;
diff --git a/parameter/ParameterMgrFullConnector.cpp b/parameter/ParameterMgrFullConnector.cpp
index 30f31e9..0991475 100644
--- a/parameter/ParameterMgrFullConnector.cpp
+++ b/parameter/ParameterMgrFullConnector.cpp
@@ -52,7 +52,7 @@ CParameterMgrFullConnector::~CParameterMgrFullConnector()
bool CParameterMgrFullConnector::start(string& strError)
{
// Create data structure & Init flow
- return _pParameterMgr->load(strError) && _pParameterMgr->init(strError);
+ return _pParameterMgr->load(strError);
}
void CParameterMgrFullConnector::setLogger(CParameterMgrFullConnector::ILogger* pLogger)