Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

Make CParameterMgr::init private #50

Merged
merged 1 commit into from
Feb 19, 2015
Merged

Make CParameterMgr::init private #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion parameter/ParameterMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion parameter/ParameterMgrFullConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down