Make CParameterMgr::init private

Since 3adb785eb097028750fc1b4c5ecab3bebf1a9ae3, CParameterMgr::init should not
be called directly. However, it was kept public and CParameterMgrFullConnector
was using it.

Make it private and remove its use from CParameterMgrFullConnector.

Signed-off-by: Frederic Boisnard <frederic.boisnard@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>

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)