From 0952f28a1eb9a947768170208839cd2c6bb472ac Mon Sep 17 00:00:00 2001
From: Mika Laitio <lamikr@pilppa.org>
Date: Tue, 1 Mar 2011 00:42:05 +0200
Subject: [PATCH] Started cleaning up public headers from the private headers
 that are not wanted to install.

Signed-off-by: Mika Laitio <lamikr@pilppa.org>
---
 src/Makefile.am         |  3 ++-
 src/plpbus/BusServer.cc | 24 +++++++++++++++++-------
 src/plpbus/BusServer.hh |  4 ++--
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 7e26785..515e06a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,5 +18,6 @@ libplpbusincludedir=$(includedir)/plp/bus
 libplpbusinclude_HEADERS =   \
 	plpbus/BusServer.hh \
 	plpbus/BusClient.hh \
-	plpbus/BusMessage.hh
+	plpbus/BusMessage.hh \
+	plpbus/IServerListener.hh 
 
diff --git a/src/plpbus/BusServer.cc b/src/plpbus/BusServer.cc
index 44281ed..993c995 100644
--- a/src/plpbus/BusServer.cc
+++ b/src/plpbus/BusServer.cc
@@ -1,4 +1,5 @@
 #include "BusServer.hh"
+#include "OrbServerImpl.hh"
 
 using namespace std;
 using namespace plpbus;
@@ -14,30 +15,39 @@ BusServer::~BusServer()
 }
 
 int BusServer::init() {
-	int	retVal;
+	int		retVal;
+	OrbServerImpl	*impl;
 
 	retVal	= 0;
-	orbServer->init();
+	impl	= (OrbServerImpl *)orbServer;
+	impl->init();
 	return retVal;
 }
 
 int BusServer::launch(const char *server_name)
 {
-	int	retVal;
+	int		retVal;
+	OrbServerImpl	*impl;
 
-	retVal	= orbServer->launch(server_name);
+	impl	= (OrbServerImpl *)orbServer;
+	retVal	= impl->launch(server_name);
 	return retVal;
 }
 
 int BusServer::add_server_listener(IServerListener *listener_param)
 {
-	int	retVal;
+	int		retVal;
+	OrbServerImpl	*impl;
 
-	retVal		= orbServer->add_server_listener(listener_param);
+	impl	= (OrbServerImpl *)orbServer;
+	retVal	= impl->add_server_listener(listener_param);
 	return retVal;
 }
 
 void BusServer::shutdown()
 {
-	orbServer->shutdown();
+	OrbServerImpl	*impl;
+
+	impl	= (OrbServerImpl *)orbServer;
+	impl->shutdown();
 }
diff --git a/src/plpbus/BusServer.hh b/src/plpbus/BusServer.hh
index 734ba65..8244e73 100644
--- a/src/plpbus/BusServer.hh
+++ b/src/plpbus/BusServer.hh
@@ -6,7 +6,7 @@
 
 #include "RequestResponseBus.hh"
 #include "IServerListener.hh"
-#include "OrbServerImpl.hh"
+//#include "OrbServerImpl.hh"
 
 namespace plpbus {
 	class BusServer {
@@ -18,7 +18,7 @@ namespace plpbus {
 			virtual int add_server_listener(IServerListener *listener_param);
 			virtual void shutdown();
 		private:
-			OrbServerImpl	*orbServer;
+			void	*orbServer;
 	};
 }
 
-- 
2.41.0