Merge pull request #50 from dawagner/make_parametermgr_init_private

Make CParameterMgr::init private
intel · Feb 19, 2015 · 4f03c87 · 4f03c87
2 parents fe2f8a6 + ff3a60a
commit 4f03c87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/parameter/ParameterMgr.h b/parameter/ParameterMgr.h
@@ -118,7 +118,6 @@ class CParameterMgr : private CElement
       * @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 @@ class CParameterMgr : private CElement
     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
@@ -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)