Moved Screen class into synergy namespace

src/lib/server/PrimaryClient.cpp

@@ -26,7 +26,7 @@
 // PrimaryClient
 //
 
-PrimaryClient::PrimaryClient(const String& name, Screen* screen) :
+PrimaryClient::PrimaryClient(const String& name, synergy::Screen* screen) :
 	BaseClientProxy(name),
 	m_screen(screen),
 	m_fakeInputCount(0)

src/lib/server/PrimaryClient.h

@@ -21,7 +21,7 @@
 #include "server/BaseClientProxy.h"
 #include "synergy/protocol_types.h"
 
-class Screen;
+namespace synergy { class Screen; }
 
 //! Primary screen as pseudo-client
 /*!
@@ -34,7 +34,7 @@ public:
 	/*!
 	\c name is the name of the server and \p screen is primary screen.
 	*/
-	PrimaryClient(const String& name, Screen* screen);
+	PrimaryClient(const String& name, synergy::Screen* screen);
 	~PrimaryClient();
 
 #ifdef TEST_ENV
@@ -147,7 +147,7 @@ public:
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 
 private:
-	Screen*			m_screen;
+	synergy::Screen*	m_screen;
 	bool				m_clipboardDirty[kClipboardEnd];
 	SInt32				m_fakeInputCount;
 };

src/lib/server/Server.cpp

@@ -53,7 +53,7 @@
 Server::Server(
 		Config& config,
 		PrimaryClient* primaryClient,
-		Screen* screen,
+		synergy::Screen* screen,
 		IEventQueue* events,
 		bool enableDragDrop) :
 	m_mock(false),

src/lib/server/Server.h

@@ -36,7 +36,7 @@ class BaseClientProxy;
 class EventQueueTimer;
 class PrimaryClient;
 class InputFilter;
-class Screen;
+namespace synergy { class Screen; }
 class IEventQueue;
 class Thread;
 
@@ -104,7 +104,8 @@ public:
 	client (local screen) \p primaryClient.  The client retains
 	ownership of \p primaryClient.
 	*/
-	Server(Config& config, PrimaryClient* primaryClient, Screen* screen, IEventQueue* events, bool enableDragDrop);
+	Server(Config& config, PrimaryClient* primaryClient,
+		synergy::Screen* screen, IEventQueue* events, bool enableDragDrop);
 	~Server();
 
 #ifdef TEST_ENV
@@ -457,7 +458,7 @@ private:
 	bool				m_lockedToScreen;
 
 	// server screen
-	Screen*			m_screen;
+	synergy::Screen*			m_screen;
 
 	IEventQueue*		m_events;