X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/fc388ed8c2016ad44f83d20859bf864562f731a1..2686d511ecfa9bdd0693fc3e1c8320e52188beb4:/Server/src/server.cpp

diff --git a/Server/src/server.cpp b/Server/src/server.cpp
index 8f33449..134bcf5 100644
--- a/Server/src/server.cpp
+++ b/Server/src/server.cpp
@@ -40,7 +40,7 @@ PlaQui::Server::Server::~Server(void) {
 }
 
 PlaQui::Server::Server::Server(int port):
-		PlaQui::Server::TCPServer(port) {
+		TCPServer(port) {
 #ifdef DEBUG
 	std::cerr << __FILE__ <<  ": port = " << port << std::endl;
 #endif // DEBUG
@@ -56,19 +56,18 @@ bool PlaQui::Server::Server::start_transmission(std::string host, int port) {
 	return false;
 }
 			
-PlaQui::Server::Connection*
-PlaQui::Server::Server::new_connection(const sockbuf::sockdesc& sd) {
+PlaQui::Server::Connection* PlaQui::Server::Server::new_connection(
+		const sockbuf::sockdesc& sd) {
 #ifdef DEBUG
 	std::cerr << __FILE__ <<  ": new_connection(sd = " << sd.sock << ")"
 		<< std::endl;
 #endif // DEBUG
-	PlaQui::Server::ControlServer* conn = new PlaQui::Server::ControlServer(sd);
+	ControlServer* connection = new ControlServer(sd);
 	// TODO verificar si el new se hace bien? no creo.
-	conn->signal_command_received().connect(
-			SigC::slot_class(*this,
-				&PlaQui::Server::Server::on_control_command_received));
+	connection->signal_command_received().connect(
+			SigC::slot_class(*this, &Server::on_control_command_received));
 	// TODO: 
-	return conn;
+	return connection;
 }
 
 /// \todo Implementar.