diff options
Diffstat (limited to 'src/Server/ConnectionManager.h')
-rw-r--r-- | src/Server/ConnectionManager.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Server/ConnectionManager.h b/src/Server/ConnectionManager.h index 6573883..4cc12a5 100644 --- a/src/Server/ConnectionManager.h +++ b/src/Server/ConnectionManager.h @@ -20,9 +20,9 @@ #ifndef MAD_SERVER_CONNECTIONMANAGER_H_ #define MAD_SERVER_CONNECTIONMANAGER_H_ -#include <Common/Configurable.h> +#include <Core/Configurable.h> +#include <Core/Initializable.h> #include <Common/HostInfo.h> -#include <Common/Initializable.h> #include <Common/RequestManager.h> #include <list> @@ -42,7 +42,7 @@ class Packet; namespace Server { -class ConnectionManager : public Common::Configurable, public Common::Initializable, boost::noncopyable { +class ConnectionManager : public Core::Configurable, public Core::Initializable, boost::noncopyable { private: class ServerConnection : public Common::Connection { public: @@ -111,7 +111,7 @@ class ConnectionManager : public Common::Configurable, public Common::Initializa void handleDisconnect(boost::shared_ptr<ServerConnection> con); protected: - virtual bool handleConfigEntry(const Common::ConfigEntry &entry, bool handled); + virtual bool handleConfigEntry(const Core::ConfigEntry &entry, bool handled); virtual void configFinished(); virtual void doInit(); @@ -122,11 +122,11 @@ class ConnectionManager : public Common::Configurable, public Common::Initializa return &connectionManager; } - boost::shared_ptr<Common::Connection> getDaemonConnection(const std::string &name) const throw (Net::Exception&); - std::string getDaemonName(const Common::Connection *con) const throw (Net::Exception&); + boost::shared_ptr<Common::Connection> getDaemonConnection(const std::string &name) const throw (Core::Exception&); + std::string getDaemonName(const Common::Connection *con) const throw (Core::Exception&); - void identifyDaemonConnection(Common::Connection *con, const std::string &name) throw (Net::Exception&); - void identifyClientConnection(Common::Connection *con) throw (Net::Exception&); + void identifyDaemonConnection(Common::Connection *con, const std::string &name) throw (Core::Exception&); + void identifyClientConnection(Common::Connection *con) throw (Core::Exception&); std::vector<Common::HostInfo> getDaemonList() const; }; |