src: decouple classes from Nlsr object
refs: #1952, #2803, #3960, #4288
Change-Id: Ibe3ac3820f11e8107ee4b13e510d53c27467a6cb
diff --git a/src/conf-file-processor.hpp b/src/conf-file-processor.hpp
index 0bcb7e8..65b9a16 100644
--- a/src/conf-file-processor.hpp
+++ b/src/conf-file-processor.hpp
@@ -22,7 +22,7 @@
#define NLSR_CONF_FILE_PROCESSOR_HPP
#include "common.hpp"
-#include "nlsr.hpp"
+#include "conf-parameter.hpp"
#include <boost/algorithm/string.hpp>
#include <boost/property_tree/info_parser.hpp>
@@ -46,11 +46,7 @@
class ConfFileProcessor
{
public:
- ConfFileProcessor(Nlsr& nlsr, const std::string& cfile)
- : m_confFileName(cfile)
- , m_nlsr(nlsr)
- {
- }
+ ConfFileProcessor(ConfParameter& confParam);
/*! \brief Load and parse the configuration file, then populate NLSR.
*
@@ -125,8 +121,8 @@
private:
/*! m_confFileName The full path of the configuration file to parse. */
std::string m_confFileName;
- /*! m_nlsr The NLSR object to configure upon successful parsing. */
- Nlsr& m_nlsr;
+ /*! m_confParam The ConfFileProcessor object to configure as parsing is done. */
+ ConfParameter& m_confParam;
/*! m_io For canonization of faceUri. */
boost::asio::io_service m_io;
};