1 files changed, 8 insertions, 8 deletions
diff --git a/src/Server/ConnectionManager.h b/src/Server/ConnectionManager.h
index 8c989b9..dab1892 100644
--- a/src/Server/ConnectionManager.h
+++ b/src/Server/ConnectionManager.h
@@ -99,8 +99,8 @@ class MAD_SERVER_EXPORT ConnectionManager : public Core::Configurable, private b
           return (authContext.get() != 0 && authContext->isAuthenticated());
         }
 
-        boost::shared_ptr<const Common::AuthContext> authenticate(const std::string &method, const std::string &subMethod,
-            const std::string &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response);
+        boost::shared_ptr<const Common::AuthContext> authenticate(const Core::String &method, const Core::String &subMethod,
+            const Core::String &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response);
     };
 
     friend class Application;
@@ -114,7 +114,7 @@ class MAD_SERVER_EXPORT ConnectionManager : public Core::Configurable, private b
 
     std::set<boost::shared_ptr<ServerConnection> > connections;
 
-    std::map<std::string, Common::HostInfo> daemonInfo;
+    std::map<Core::String, Common::HostInfo> daemonInfo;
 
     boost::shared_ptr<Common::RequestHandlerGroup> connectionRequestHandlerGroup;
     boost::shared_ptr<Common::RequestHandlerGroup> daemonRequestHandlerGroup;
@@ -135,13 +135,13 @@ class MAD_SERVER_EXPORT ConnectionManager : public Core::Configurable, private b
     virtual void configFinished();
 
   public:
-    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);
+    boost::shared_ptr<Common::Connection> getDaemonConnection(const Core::String &name) const throw (Core::Exception);
+    Core::String getDaemonName(const Common::Connection *con) const throw (Core::Exception);
 
-    void identifyDaemonConnection(Common::Connection *con, const std::string &name) throw (Core::Exception);
+    void identifyDaemonConnection(Common::Connection *con, const Core::String &name) throw (Core::Exception);
 
-    boost::shared_ptr<const Common::AuthContext> authenticateConnection(Common::Connection *con, const std::string &method, const std::string &subMethod,
-        const std::string &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response);
+    boost::shared_ptr<const Common::AuthContext> authenticateConnection(Common::Connection *con, const Core::String &method, const Core::String &subMethod,
+        const Core::String &user, const std::vector<boost::uint8_t> &data, std::vector<boost::uint8_t> &response);
 
     std::vector<Common::HostInfo> getDaemonList() const;
 };