Renamed Server to RemoteServer for obviousness.

Change-Id: Ia935a97fe57eb1259c3426f0414bec7362f2e8cf

5 files changed, 26 insertions, 26 deletions

diff --git a/sd/source/ui/inc/Server.hxx b/sd/source/ui/inc/RemoteServer.hxx
index f3595ad227f8..37fba7552038 100644
--- a/sd/source/ui/inc/Server.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -37,7 +37,7 @@ namespace sd
     class Listener;
     class ImagePreparer;
 
-    class Server : public salhelper::Thread
+    class RemoteServer : public salhelper::Thread
     {
         public:
             static void setup();
@@ -46,9 +46,9 @@ namespace sd
             static void presentationStopped();
             void informListenerDestroyed();
         private:
-            Server();
-            ~Server();
-            static Server *spServer;
+            RemoteServer();
+            ~RemoteServer();
+            static RemoteServer *spServer;
             osl::AcceptorSocket mSocket;
             osl::StreamSocket mStreamSocket;
             void listenThread();
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 2aac478b742d..016becb08b51 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -22,7 +22,7 @@ using rtl::OString;
 using rtl::OStringBuffer;
 
 
-Listener::Listener( const ::rtl::Reference<Server>& rServer, sd::Transmitter *aTransmitter  )
+Listener::Listener( const ::rtl::Reference<RemoteServer>& rServer, sd::Transmitter *aTransmitter  )
     : ::cppu::WeakComponentImplHelper1< XSlideShowListener >( m_aMutex ),
       mServer( rServer ),
       pTransmitter( NULL ),
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index 1fc411d08c64..1a1226db82f9 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -19,7 +19,7 @@
 #include <osl/socket.hxx>
 #include <rtl/ref.hxx>
 
-#include "Server.hxx"
+#include "RemoteServer.hxx"
 #include "Transmitter.hxx"
 #include "ImagePreparer.hxx"
 
@@ -35,7 +35,7 @@ class Listener
       public ::cppu::WeakComponentImplHelper1< css::presentation::XSlideShowListener >
 {
 public:
-    Listener( const ::rtl::Reference<Server>& rServer, sd::Transmitter *aTransmitter );
+    Listener( const ::rtl::Reference<RemoteServer>& rServer, sd::Transmitter *aTransmitter );
     ~Listener();
     void init( const css::uno::Reference< css::presentation::XSlideShowController >& aController );
 
@@ -65,7 +65,7 @@ public:
     throw (com::sun::star::uno::RuntimeException);
 
 private:
-    rtl::Reference<Server> mServer;
+    rtl::Reference<RemoteServer> mServer;
     sd::Transmitter *pTransmitter;
     css::uno::Reference< css::presentation::XSlideShowController > mController;
     rtl::Reference<sd::ImagePreparer> mPreparer;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 2f67d178cc4b..3b896feda594 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -17,24 +17,24 @@
 #include "ImagePreparer.hxx"
 #include "Listener.hxx"
 #include "Receiver.hxx"
-#include "Server.hxx"
+#include "RemoteServer.hxx"
 
 using namespace std;
 using namespace sd;
 using namespace ::com::sun::star;
 using rtl::OString;
 
-Server::Server()
-:  Thread( "ServerThread" ), mSocket()
+RemoteServer::RemoteServer()
+:  Thread( "RemoteServerThread" ), mSocket()
 {
 }
 
-Server::~Server()
+RemoteServer::~RemoteServer()
 {
 }
 
 // Run as a thread
-void Server::listenThread()
+void RemoteServer::listenThread()
 {
     pTransmitter = new Transmitter( mStreamSocket );
     pTransmitter->launch();
@@ -98,7 +98,7 @@ void Server::listenThread()
 }
 
 
-void Server::execute()
+void RemoteServer::execute()
 {
     osl::SocketAddr aAddr( "0", PORT );
     if ( !mSocket.bind( aAddr ) )
@@ -120,12 +120,12 @@ void Server::execute()
 
 }
 
-void Server::informListenerDestroyed()
+void RemoteServer::informListenerDestroyed()
 {
     mListener.clear();
 }
 
-void Server::presentationStarted( const css::uno::Reference<
+void RemoteServer::presentationStarted( const css::uno::Reference<
      css::presentation::XSlideShowController > &rController )
 {
     if ( pTransmitter )
@@ -135,7 +135,7 @@ void Server::presentationStarted( const css::uno::Reference<
     }
 }
 
-void Server::presentationStopped()
+void RemoteServer::presentationStopped()
 {
     if ( mListener.is() )
     {
@@ -144,23 +144,23 @@ void Server::presentationStopped()
     }
 }
 
-Server *sd::Server::spServer = NULL;
-Transmitter *sd::Server::pTransmitter = NULL;
-rtl::Reference<Listener> sd::Server::mListener = NULL;
+RemoteServer *sd::RemoteServer::spServer = NULL;
+Transmitter *sd::RemoteServer::pTransmitter = NULL;
+rtl::Reference<Listener> sd::RemoteServer::mListener = NULL;
 
-void Server::setup()
+void RemoteServer::setup()
 {
   if (spServer)
     return;
 
-  spServer = new Server();
+  spServer = new RemoteServer();
   spServer->launch();
 }
 
 void SdDLL::RegisterRemotes()
 {
   fprintf( stderr, "Register our remote control goodness\n" );
-  sd::Server::setup();
+  sd::RemoteServer::setup();
 
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d904b41374d0..ed7f21564665 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -79,7 +79,7 @@
 #include "canvas/elapsedtime.hxx"
 #include "avmedia/mediawindow.hxx"
 #include  "svtools/colrdlg.hxx"
-#include "Server.hxx"
+#include "RemoteServer.hxx"
 #include <boost/bind.hpp>
 
 using ::rtl::OUString;
@@ -609,7 +609,7 @@ SlideshowImpl::~SlideshowImpl()
 
 void SAL_CALL SlideshowImpl::disposing()
 {
-    Server::presentationStopped();
+    RemoteServer::presentationStopped();
     if( mxShow.is() && mpDoc )
         NotifyDocumentEvent( mpDoc, "OnEndPresentation" );
 
@@ -1509,7 +1509,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
-    Server::presentationStarted( this );
+    RemoteServer::presentationStarted( this );
 }
 
 // ---------------------------------------------------------