Moved files and removed 'Telldus'-prefix from the settings class

driver/libtelldus-core/CMakeLists.txt

@@ -1,10 +1,15 @@
+FIND_PACKAGE( Qt4 REQUIRED )
+SET( QT_DONT_USE_QTGUI TRUE )
+INCLUDE( ${QT_USE_FILE} )
+
 SET( telldus-core_SRCS
+	Controller.cpp
 	Device.cpp
 	DeviceIkea.cpp
 	DeviceNexa.cpp
 	DeviceSartano.cpp
 	DeviceWaveman.cpp
-	settings/TelldusSettings.cpp
+	Settings.cpp
 	telldus-core.cpp
 	)
 
@@ -13,21 +18,21 @@ SET( telldus-core_HDRS
 )
 	
 IF (APPLE)
-	SET( telldus-core_TARGET	TelldusCore )
+	SET( telldus-core_TARGET	TelldusCore )
 	SET( telldus-core_SRCS
 		${telldus-core_SRCS}
 		win/Device.cpp
-		settings/TelldusSettingsCoreFoundationPreferences.cpp
+		SettingsCoreFoundationPreferences.cpp
 	)
 	ADD_DEFINITIONS(
 		-D_MACOSX
 	)
-ELSE (APPLE)
+ELSE (APPLE)
 	SET( telldus-core_TARGET	telldus-core )
 	SET( telldus-core_SRCS
 		${telldus-core_SRCS}
 		linux/Device.cpp
-		settings/TelldusSettingsConfuse.cpp
+		SettingsConfuse.cpp
 	)
 	ADD_DEFINITIONS(
 		-D_LINUX
@@ -51,6 +56,7 @@ IF (APPLE)
 
 	TARGET_LINK_LIBRARIES(${telldus-core_TARGET}
 		${COREFOUNDATION_LIBRARY}
+		${QT_LIBRARIES}
 		${FTD2XX_LIBRARY}
 	)
 	SET_PROPERTY(TARGET	${telldus-core_TARGET}
@@ -59,6 +65,7 @@ IF (APPLE)
 
 ELSE (APPLE)
 	TARGET_LINK_LIBRARIES(${telldus-core_TARGET}
+		${QT_LIBRARIES}
 		confuse
 	)
 ENDIF (APPLE)

driver/libtelldus-core/Settings.cpp

@@ -21,26 +21,26 @@ Device* TelldusSettings::getDevice(int intDeviceId){
 		}
 
 		//each new brand must be added here
-		if (strcmp(protocol, "Nexa") == 0){
+		if (strcasecmp(protocol, "arctech") == 0){
 			char *strHouse = getDeviceParameter(intDeviceId, "nexa_house");
 			char *strCode = getDeviceParameter(intDeviceId, "nexa_unit");
 			dev = new DeviceNexa(strHouse, strCode);
 			free(strHouse);
 			free(strCode);
 		
-		} else if (strcmp(protocol, "Waveman") == 0) {
+		} else if (strcasecmp(protocol, "Waveman") == 0) {
 			char *strHouse = getDeviceParameter(intDeviceId, "nexa_house");
 			char *strCode = getDeviceParameter(intDeviceId, "nexa_unit");
 			dev = new DeviceWaveman(strHouse, strCode);
 			free(strHouse);
 			free(strCode);
 
-		} else if (strcmp(protocol, "Sartano") == 0) {
+		} else if (strcasecmp(protocol, "Sartano") == 0) {
 			char *strCode = getDeviceParameter(intDeviceId, "sartano_code");
 			dev = new DeviceSartano(strCode);
 			free(strCode);
 
-		} else if (strcmp(protocol, "Ikea") == 0) {
+		} else if (strcasecmp(protocol, "Ikea") == 0) {
 			char *strSystem = getDeviceParameter(intDeviceId, "ikea_system");
 			char *strUnits = getDeviceParameter(intDeviceId, "ikea_units");
 			char *strFade = getDeviceParameter(intDeviceId, "ikea_fade");

driver/libtelldus-core/SettingsConfuse.cpp

@@ -229,7 +229,11 @@ bool TelldusSettings::setIntSetting(int intDeviceId, const char* name, int value
 
 
 bool readConfig(cfg_t **cfg) {
-	cfg_opt_t parameter_opts[] = {
+	cfg_opt_t controller_opts[] = {
+		CFG_INT("id", -1, CFGF_NONE),
+	};
+	
+	cfg_opt_t device_parameter_opts[] = {
 		//Nexa
 		CFG_STR("nexa_house", 0, CFGF_NONE),
 		CFG_STR("nexa_unit", 0, CFGF_NONE),
@@ -248,9 +252,10 @@ bool readConfig(cfg_t **cfg) {
 	cfg_opt_t device_opts[] = {
 		CFG_INT("id", -1, CFGF_NONE),
 		CFG_STR("name", "Unnamed", CFGF_NONE),
-		CFG_STR("protocol", "Nexa", CFGF_NONE),
+		CFG_INT("controller", 0, CFGF_NONE),
+		CFG_STR("protocol", "arctech", CFGF_NONE),
 		CFG_INT("model", 1, CFGF_NONE),
-		CFG_SEC("parameters", parameter_opts, CFGF_NONE),
+		CFG_SEC("parameters", device_parameter_opts, CFGF_NONE),
 		CFG_END()
 	};