X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Futils%2Fconfig-parser.hpp;h=3115e9bd953fef2dfbfa285909304562b6b167e3;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=2d504857c8a9d3aafb7172f41769ece33500e3ac;hpb=44d7237fde80af222939445055a94a0e50e82935;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/utils/config-parser.hpp b/CAN-binder/low-can-binding/utils/config-parser.hpp
index 2d504857..3115e9bd 100644
--- a/CAN-binder/low-can-binding/utils/config-parser.hpp
+++ b/CAN-binder/low-can-binding/utils/config-parser.hpp
@@ -17,14 +17,10 @@
 
 #pragma once
 
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <json-c/json.h>
-
 #include <string>
 #include <vector>
-#include "INIReader.h"
+#include <utility>
+#include "ini-config.hpp"
 
 namespace utils
 {
@@ -33,13 +29,16 @@ namespace utils
 	class config_parser_t
 	{
 	private:
-		INIReader config_content_; /*!< config_content_ - Parsed content of INI file.*/
+		const std::string filepath_; /*!< filepath_ - Path to the config file*/
+		ini_config config_content_; /*!< config_content_ - Parsed content of INI file.*/
 
 	public:
-		config_parser_t(int conf_file);
-		config_parser_t(std::string conf_file);
+		config_parser_t(config_parser_t&&) = default;
+		config_parser_t(const config_parser_t&) = default;
+		explicit config_parser_t(std::string conf_file);
 
+		const std::string& filepath() const;
 		bool check_conf();
-		const std::vector<std::string> get_devices_name();
+		const std::vector<std::pair<std::string, std::string> > get_devices_name();
 	};
 }