Se eliminan los namespaces en los cuerpos de las definiones de los metodos que

[z.facultad/75.42/plaqui.git] / Server / include / plaqui / server / controlserver.h

diff --git a/Server/include/plaqui/server/controlserver.h b/Server/include/plaqui/server/controlserver.h
index 99f8dead3e641de46438f98d2a9ade21afd9472f..f269e4b92427e5b87de7a5fa02675491b3f9ac19 100644 (file)
--- a/Server/include/plaqui/server/controlserver.h
+++ b/Server/include/plaqui/server/controlserver.h
@@ -28,13 +28,15 @@
 #ifndef PLAQUI_CONTROLSERVER_H
 #define PLAQUI_CONTROLSERVER_H
 
 #ifndef PLAQUI_CONTROLSERVER_H
 #define PLAQUI_CONTROLSERVER_H
 

-#include "plaqui/server/connection.h"
+#include "plaqui/server/serverconnection.h"

 #include <socket++/sockinet.h>
 
 #include <socket++/sockinet.h>
 

-namespace Plaqui {
+namespace PlaQui {
+
+namespace Server {

 
        /// Conexión para recibir comandos de control para una planta.
 
        /// Conexión para recibir comandos de control para una planta.

-       class ControlServer: public Connection {
+       class ControlServer: public ServerConnection {

 
                protected:
 
 
                protected:
 


@@ -48,7 +50,7 @@ namespace Plaqui {
                        /**
                         * Destructor.
                         */
                        /**
                         * Destructor.
                         */

-                       virtual ~ControlServer(void) {}
+                       virtual ~ControlServer(void);

 
                        /**
                         * Constructor.
 
                        /**
                         * Constructor.


@@ -61,5 +63,6 @@ namespace Plaqui {
 
 }
 
 
 }
 

+}

 
 #endif // PLAQUI_CONTROLSERVER_H
 
 #endif // PLAQUI_CONTROLSERVER_H