From ba9c50f6251736f1ee21a6071cb6d80ed267029f Mon Sep 17 00:00:00 2001 From: Micke Prag Date: Fri, 3 Feb 2012 17:32:54 +0100 Subject: [PATCH] Fix missing namespace in Events on Windows and Mac OS X --- telldus-core/common/EventHandler_win.cpp | 2 ++ telldus-core/common/Event_win.cpp | 2 ++ telldus-core/service/ConnectionListener_win.cpp | 4 ++-- telldus-core/service/TellStick_ftd2xx.cpp | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/telldus-core/common/EventHandler_win.cpp b/telldus-core/common/EventHandler_win.cpp index f44fe8c7..9c8b4be5 100644 --- a/telldus-core/common/EventHandler_win.cpp +++ b/telldus-core/common/EventHandler_win.cpp @@ -5,6 +5,8 @@ #include #include +using namespace TelldusCore; + class EventHandler::PrivateData { public: HANDLE *eventArray; diff --git a/telldus-core/common/Event_win.cpp b/telldus-core/common/Event_win.cpp index c40a37d5..7a9e9fb5 100644 --- a/telldus-core/common/Event_win.cpp +++ b/telldus-core/common/Event_win.cpp @@ -1,6 +1,8 @@ #include "Event.h" #include "Thread.h" +using namespace TelldusCore; + class Event::PrivateData { public: EVENT_T event; diff --git a/telldus-core/service/ConnectionListener_win.cpp b/telldus-core/service/ConnectionListener_win.cpp index f88bac48..ec10d8bd 100644 --- a/telldus-core/service/ConnectionListener_win.cpp +++ b/telldus-core/service/ConnectionListener_win.cpp @@ -14,10 +14,10 @@ public: SECURITY_ATTRIBUTES sa; HANDLE hEvent; bool running; - EventRef waitEvent; + TelldusCore::EventRef waitEvent; }; -ConnectionListener::ConnectionListener(const std::wstring &name, EventRef waitEvent) +ConnectionListener::ConnectionListener(const std::wstring &name, TelldusCore::EventRef waitEvent) { d = new PrivateData; d->hEvent = 0; diff --git a/telldus-core/service/TellStick_ftd2xx.cpp b/telldus-core/service/TellStick_ftd2xx.cpp index 05ac6c10..25fdc866 100644 --- a/telldus-core/service/TellStick_ftd2xx.cpp +++ b/telldus-core/service/TellStick_ftd2xx.cpp @@ -40,7 +40,7 @@ public: #endif }; -TellStick::TellStick(int controllerId, Event *event, const TellStickDescriptor &td ) +TellStick::TellStick(int controllerId, TelldusCore::Event *event, const TellStickDescriptor &td ) :Controller(controllerId, event) { d = new PrivateData;