1 files changed, 6 insertions, 6 deletions
diff --git a/src/Common/UserManager.h b/src/Common/UserManager.h
index 6da5af4..0cf7fca 100644
--- a/src/Common/UserManager.h
+++ b/src/Common/UserManager.h
@@ -46,14 +46,14 @@ class MAD_COMMON_EXPORT UserManager : public Core::Configurable, private boost::
   private:
     friend class Application;
 
-    typedef std::map<boost::shared_ptr<UserDBBackend>, std::pair<boost::shared_ptr<UserDBBackend>, std::string> > BackendMap;
+    typedef std::map<boost::shared_ptr<UserDBBackend>, std::pair<boost::shared_ptr<UserDBBackend>, Core::String> > BackendMap;
 
     Application *application;
 
     std::set<boost::shared_ptr<UserConfigBackend> > configBackends;
 
     BackendMap dbBackends;
-    std::map<std::string, boost::shared_ptr<UserDBBackend> > dbBackendNames;
+    std::map<Core::String, boost::shared_ptr<UserDBBackend> > dbBackendNames;
 
     boost::shared_ptr<UserDBBackend> dbBackend;
 
@@ -80,7 +80,7 @@ class MAD_COMMON_EXPORT UserManager : public Core::Configurable, private boost::
 
       boost::shared_ptr<UserDBBackend> oldBackend = it->second.first;
 
-      std::map<std::string, boost::shared_ptr<UserDBBackend> >::iterator it2 = dbBackendNames.find(it->second.second);
+      std::map<Core::String, boost::shared_ptr<UserDBBackend> >::iterator it2 = dbBackendNames.find(it->second.second);
       if(it2->second == backend)
         dbBackendNames.erase(it2);
 
@@ -107,12 +107,12 @@ class MAD_COMMON_EXPORT UserManager : public Core::Configurable, private boost::
 
     boost::shared_ptr<const std::map<unsigned long, UserInfo> > getUserList(boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
     boost::shared_ptr<const UserInfo> getUserInfo(unsigned long uid, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
-    boost::shared_ptr<const UserInfo> getUserInfoByName(const std::string &name, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
+    boost::shared_ptr<const UserInfo> getUserInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
     boost::shared_ptr<const std::set<unsigned long> > getUserGroupList(unsigned long uid, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
 
     boost::shared_ptr<const std::map<unsigned long, GroupInfo> > getGroupList(boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
     boost::shared_ptr<const GroupInfo> getGroupInfo(unsigned long gid, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
-    boost::shared_ptr<const GroupInfo> getGroupInfoByName(const std::string &name, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
+    boost::shared_ptr<const GroupInfo> getGroupInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
     boost::shared_ptr<const std::set<unsigned long> > getGroupUserList(unsigned long gid, boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
 
     boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > getFullUserGroupList(boost::posix_time::ptime *timestamp = 0) throw(Core::Exception);
@@ -130,7 +130,7 @@ class MAD_COMMON_EXPORT UserManager : public Core::Configurable, private boost::
     void addUserToGroup(unsigned long uid, unsigned long gid) throw(Core::Exception);
     void deleteUserFromGroup(unsigned long uid, unsigned long gid) throw(Core::Exception);
 
-    void setPassword(unsigned long uid, const std::string &password) throw(Core::Exception);
+    void setPassword(unsigned long uid, const Core::String &password) throw(Core::Exception);
 };
 
 }