Remove libircclient from client (pokerth_game no longer depends on it).

src/net/servermanager.h

@@ -22,8 +22,6 @@
 #define _SERVERMANAGER_H_
 
 #include <boost/asio.hpp>
-#include <net/serveradminbot.h>
-#include <net/serverlobbybot.h>
 #include <string>
 #include <list>
 
@@ -31,7 +29,6 @@
 #include <gui/guiinterface.h>
 
 class ServerLobbyThread;
-class IrcThread;
 class ServerAcceptInterface;
 class SenderThread;
 class ConfigFile;
@@ -40,39 +37,39 @@ class AvatarManager;
 class ServerManager
 {
 public:
-	ServerManager(GuiInterface &gui, ConfigFile &config, AvatarManager &avatarManager);
+	ServerManager(ConfigFile &config, GuiInterface &gui);
+	ServerManager(ConfigFile &config, GuiInterface &gui, ServerMode mode, AvatarManager &avatarManager);
 	virtual ~ServerManager();
 
 	// Set the parameters.
-	void Init(unsigned serverPort, bool ipv6, ServerTransportProtocol proto, ServerMode mode, const std::string &logDir, boost::shared_ptr<IrcThread> ircAdminThread, boost::shared_ptr<IrcThread> ircLobbyThread);
+	virtual void Init(unsigned serverPort, bool ipv6, ServerTransportProtocol proto, const std::string &logDir);
 
 	// Main start function.
-	void RunAll();
+	virtual void RunAll();
 
 	// Let the server manager perform processing.
-	void Process();
+	virtual void Process();
 
-	void SignalTerminationAll();
-	bool JoinAll(bool wait);
-
-	GuiInterface &GetGui();
-	ServerAdminBot &GetAdminBot();
-	ServerLobbyBot &GetLobbyBot();
+	virtual void SignalTerminationAll();
+	virtual bool JoinAll(bool wait);
 
 protected:
 	typedef std::list<boost::shared_ptr<ServerAcceptInterface> > AcceptHelperList;
 
 	ServerLobbyThread &GetLobbyThread();
-
-private:
-	GuiInterface &m_gui;
-	ConfigFile &m_playerConfig;
-	AvatarManager &m_avatarManager;
-
+	ConfigFile &GetConfig() {
+		return m_playerConfig;
+	}
+	GuiInterface &GetGui() {
+		return m_gui;
+	}
 	boost::shared_ptr<boost::asio::io_service> m_ioService;
 	boost::shared_ptr<ServerLobbyThread> m_lobbyThread;
-	boost::shared_ptr<ServerAdminBot> m_adminBot;
-	boost::shared_ptr<ServerLobbyBot> m_lobbyBot;
+
+private:
+	ConfigFile &m_playerConfig;
+	GuiInterface &m_gui;
+
 	AcceptHelperList m_acceptHelperPool;
 };