Move the event system into common to be used by our threads

telldus-core/common/CMakeLists.txt

@@ -4,6 +4,7 @@ ENDIF(COMMAND cmake_policy)
 
 ######## Non configurable options  ########
 SET( telldus-common_SRCS
+	Event.cpp
 	Message.cpp
 	Mutex.cpp
 	Strings.cpp
@@ -12,6 +13,8 @@ SET( telldus-common_SRCS
 
 SET( telldus-common_HDRS
 	common.h
+	Event.h
+	EventHandler.h
 	Message.h
 	Mutex.h
 	Socket.h
@@ -29,6 +32,8 @@ IF (APPLE)
 	FIND_LIBRARY(ICONV_LIBRARY iconv)
 	ADD_DEFINITIONS( -D_MACOSX )
 	LIST(APPEND  telldus-common_SRCS
+		Event_unix.cpp
+		EventHandler_unix.cpp
 		Socket_unix.cpp
 		stdlibc_workaround.cpp #Remove this when we drop support for 10.5
 	)
@@ -41,6 +46,8 @@ ELSEIF (WIN32)
 	ADD_DEFINITIONS( /Zc:wchar_t- ) # Treat wchar_t as Built-in Type' = No
 	ADD_DEFINITIONS( -D_WINDOWS )
 	LIST(APPEND  telldus-common_SRCS
+		Event_win.cpp
+		EventHandler_win.cpp
 		Socket_win.cpp
 	)
 ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -48,6 +55,8 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 	FIND_LIBRARY(ICONV_LIBRARY iconv)
 	ADD_DEFINITIONS( -D_FREEBSD )
 	LIST(APPEND  telldus-common_SRCS
+		Event_unix.cpp
+		EventHandler_unix.cpp
 		Socket_unix.cpp
 	)
 	LIST(APPEND telldus-common_LIBRARIES

telldus-core/service/CMakeLists.txt

@@ -18,7 +18,6 @@ SET( telldus-service_SRCS
 	ControllerMessage.cpp
 	Device.cpp
 	DeviceManager.cpp
-	Event.cpp
 	Log.cpp
 	Sensor.cpp
 	Settings.cpp
@@ -78,8 +77,6 @@ SET( telldus-service_HDRS
 	ControllerMessage.h
 	Device.h
 	DeviceManager.h
-	Event.h
-	EventHandler.h
 	EventUpdateManager.h
 	Log.h
 	Sensor.h
@@ -116,8 +113,6 @@ IF (APPLE) #### Mac OS X ####
 		main_mac.cpp
 		ConnectionListener_unix.cpp
 		ControllerListener_mac.cpp
-		Event_unix.cpp
-		EventHandler_unix.cpp
 		SettingsCoreFoundationPreferences.cpp
 	)
 
@@ -134,8 +129,6 @@ ELSEIF (WIN32) #### Windows ####
 	)
 	LIST(APPEND telldus-service_SRCS
 		ConnectionListener_win.cpp
-		Event_win.cpp
-		EventHandler_win.cpp
 		main_win.cpp
 		SettingsWinRegistry.cpp
 		TelldusWinService_win.cpp
@@ -164,8 +157,6 @@ ELSE (APPLE) #### Linux ####
 	SET( telldus-service_TARGET	telldusd )
 	LIST(APPEND telldus-service_SRCS
 		ConnectionListener_unix.cpp
-		Event_unix.cpp
-		EventHandler_unix.cpp
 		main_unix.cpp
 		SettingsConfuse.cpp
 	)