From e8d4fbaff564afa2dd41eb0b32106aeb1a29ab26 Mon Sep 17 00:00:00 2001
From: Roland Jax <roland.jax@liwest.at>
Date: Tue, 11 Nov 2014 20:07:59 +0100
Subject: [PATCH] class Network: needless function 'addQueue' removed.

---
 src/ebusd/baseloop.cpp | 5 ++---
 src/ebusd/baseloop.h   | 4 ++--
 src/ebusd/network.cpp  | 5 +++--
 src/ebusd/network.h    | 6 ++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index af48fc1e..4e47de62 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -39,8 +39,7 @@ BaseLoop::BaseLoop()
 	m_ebusloop->start("ebusloop");
 
 	// create Network
-	m_network = new Network(A.getParam<bool>("p_localhost"));
-	m_network->addQueue(&m_queue);
+	m_network = new Network(A.getParam<bool>("p_localhost"), &m_msgQueue);
 	m_network->start("network");
 }
 
@@ -68,7 +67,7 @@ void BaseLoop::start()
 		std::string result;
 
 		// recv new message from client
-		Message* message = m_queue.remove();
+		Message* message = m_msgQueue.remove();
 		std::string data = message->getData();
 
 		data.erase(std::remove(data.begin(), data.end(), '\r'), data.end());
diff --git a/src/ebusd/baseloop.h b/src/ebusd/baseloop.h
index 9e68555c..1e59401d 100644
--- a/src/ebusd/baseloop.h
+++ b/src/ebusd/baseloop.h
@@ -36,14 +36,14 @@ public:
 
 	void start();
 
-	void addMessage(Message* message) { m_queue.add(message); }
+	void addMessage(Message* message) { m_msgQueue.add(message); }
 
 private:
 	Commands* m_commands;
 	EBusLoop* m_ebusloop;
 	Network* m_network;
 
-	WQueue<Message*> m_queue;
+	WQueue<Message*> m_msgQueue;
 
 	enum ClientCommand {
 	     get,       // get ebus data
diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp
index ee0a649b..79f44168 100644
--- a/src/ebusd/network.cpp
+++ b/src/ebusd/network.cpp
@@ -25,7 +25,8 @@ extern LogInstance& L;
 extern Appl& A;
 
 
-Network::Network(const bool localhost) : m_listening(false), m_running(false)
+Network::Network(const bool localhost, WQueue<Message*>* msgQueue)
+	: m_msgQueue(msgQueue), m_listening(false), m_running(false)
 {
 	if (localhost == true)
 		m_Server = new TCPServer(A.getParam<int>("p_port"), "127.0.0.1");
@@ -100,7 +101,7 @@ void* Network::run()
 			if (socket == NULL)
 				continue;
 
-			Connection* connection = new Connection(socket, m_queue);
+			Connection* connection = new Connection(socket, m_msgQueue);
 			if (connection == NULL)
 				continue;
 
diff --git a/src/ebusd/network.h b/src/ebusd/network.h
index fc04ffc7..6a633a65 100644
--- a/src/ebusd/network.h
+++ b/src/ebusd/network.h
@@ -26,17 +26,15 @@ class Network : public Thread
 {
 
 public:
-	Network(const bool localhost);
+	Network(const bool localhost, WQueue<Message*>* msgQueue);
 	~Network();
 
-	void addQueue(WQueue<Message*>* queue) { m_queue = queue; }
-
 	void* run();
 	void stop() const { m_notify.notify(); usleep(100000); }
 
 private:
 	std::list<Connection*> m_connections;
-	WQueue<Message*>* m_queue;
+	WQueue<Message*>* m_msgQueue;
 	TCPServer* m_Server;
 	Notify m_notify;
 	bool m_listening;