X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FFactory.hh;h=5eccf31f12adb5ce63bc4e3d2d2ccb806212ff6e;hb=22f0b4dd0b81bce75ac7a842a72ca86eec02f7bc;hp=7c16d6f7b702cedd8243ce2b94c165daf4e2ccdd;hpb=da203ad44792ca37320768f4cbe68587c4806910;p=lib1wire.git

diff --git a/src/Factory.hh b/src/Factory.hh
index 7c16d6f..5eccf31 100644
--- a/src/Factory.hh
+++ b/src/Factory.hh
@@ -13,9 +13,9 @@
 
 #include <dirent.h>
 
-#include "DeviceConfig.hh"
-#include "DataReader.hh"
-#include "Device.hh"
+#include <plp/DeviceConfig.hh>
+#include <plp/DataReader.hh>
+#include <plp/Device.hh>
 
 #ifndef W1_SCAN_ROOTDIR
 	#define W1_SCAN_ROOTDIR		"/sys/bus/w1/devices"
@@ -27,15 +27,15 @@ namespace w1 {
 			Factory();
 			virtual ~Factory();
 			static std::list<plp::Device *> get_device_list();
-			static DeviceConfig *get_device_config(std::string device_id);
 		private:
-			//int parse_family_code(std::string folder_name);
-			static plp::Device *create_w1_device(int family_code, std::string device_id, dirent *direntry_param);
-			static plp::Device *create_w1_device(std::string device_type_param, std::string device_id_param);
-			static plp::Device *create_w1_device(dirent *direntry_param, int *err_code_param);
+			//int parse_family_code(string folder_name);
+			static plp::Device *create_device(int family_code_param, string device_type_param, string device_id_param, dirent *direntry_param);
+			static plp::Device *create_device(int family_code, string device_id, dirent *direntry_param);
+			static plp::Device *create_device(string device_type_param, string device_id_param);
+			static plp::Device *create_device(dirent *direntry_param, int *err_code_param);
 			static std::list<plp::DataReader *> get_data_reader_list();
-			static int get_family_code_by_device_type(std::string device_type_param);
-			static std::string get_device_type_by_family_code(int family_code_param);
+			static int get_family_code_by_device_type(string device_type_param);
+			static string get_device_type_by_family_code(int family_code_param);
 	};
 }