1 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/UserManager.cpp b/src/Common/UserManager.cpp
index f14dbcc..5fb5d15 100644
--- a/src/Common/UserManager.cpp
+++ b/src/Common/UserManager.cpp
@@ -98,7 +98,7 @@ bool UserManager::handleConfigEntry(const Core::ConfigEntry &entry, bool /*handl
 void UserManager::registerBackend(boost::shared_ptr<UserDBBackend> backend) {
   boost::lock_guard<boost::shared_mutex> lock(mutex);
 
-  const std::string &name = backend->getName();
+  const Core::String &name = backend->getName();
 
   dbBackends.insert(std::make_pair(backend, std::make_pair(backend, name)));
   dbBackendNames.insert(std::make_pair(name, backend));
@@ -110,7 +110,7 @@ void UserManager::registerBackend(boost::shared_ptr<UserDBBackend> backend) {
 void UserManager::registerBackendCached(boost::shared_ptr<UserDBBackend> backend) {
   boost::lock_guard<boost::shared_mutex> lock(mutex);
 
-  const std::string &name = backend->getName();
+  const Core::String &name = backend->getName();
 
   boost::shared_ptr<UserCache> cache(new UserCache(application, backend));
 
@@ -140,7 +140,7 @@ boost::shared_ptr<const UserInfo> UserManager::getUserInfo(unsigned long uid, bo
   return dbBackend->getUserInfo(uid, timestamp);
 }
 
-boost::shared_ptr<const UserInfo> UserManager::getUserInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception) {
+boost::shared_ptr<const UserInfo> UserManager::getUserInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception) {
   boost::shared_lock<boost::shared_mutex> lock(mutex);
 
   if(!dbBackend)
@@ -176,7 +176,7 @@ boost::shared_ptr<const GroupInfo> UserManager::getGroupInfo(unsigned long gid,
   return dbBackend->getGroupInfo(gid, timestamp);
 }
 
-boost::shared_ptr<const GroupInfo> UserManager::getGroupInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception) {
+boost::shared_ptr<const GroupInfo> UserManager::getGroupInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception) {
   boost::shared_lock<boost::shared_mutex> lock(mutex);
 
   if(!dbBackend)
@@ -418,7 +418,7 @@ void UserManager::deleteUserFromGroup(unsigned long uid, unsigned long gid) thro
   }
 }
 
-void UserManager::setPassword(unsigned long uid, const std::string &password) throw(Core::Exception) {
+void UserManager::setPassword(unsigned long uid, const Core::String &password) throw(Core::Exception) {
   boost::lock_guard<boost::shared_mutex> lock(mutex);
 
   if(!dbBackend)