1 files changed, 12 insertions, 12 deletions

diff --git a/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp b/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp
index bb18194..cfe2a28 100644
--- a/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp
+++ b/src/Server/RequestHandlers/UserListRequestHandlerGroup.cpp
@@ -31,12 +31,12 @@ void UserListRequestHandlerGroup::handleUserListListRequest(boost::shared_ptr<co
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  const std::set<std::string> &userLists = application->getUserListManager()->getUserLists();
+  const std::set<Core::String> &userLists = application->getUserListManager()->getUserLists();
 
   ret->setType("OK");
   Common::XmlData::List *list = ret->createList("userLists");
 
-  for(std::set<std::string>::const_iterator userList = userLists.begin(); userList != userLists.end(); ++userList) {
+  for(std::set<Core::String>::const_iterator userList = userLists.begin(); userList != userLists.end(); ++userList) {
     Common::XmlData::List::iterator entry = list->addEntry();
 
     entry->set("name", *userList);
@@ -48,7 +48,7 @@ void UserListRequestHandlerGroup::handleUserListDownloadRequest(boost::shared_pt
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  boost::shared_ptr<Common::UserLists::UserList> userList = application->getUserListManager()->loadUserList(packet->get<const std::string&>("name"));
+  boost::shared_ptr<Common::UserLists::UserList> userList = application->getUserListManager()->loadUserList(packet->get<const Core::String&>("name"));
   if(!userList)
     throw(Core::Exception(Core::Exception::NOT_FOUND));
 
@@ -60,7 +60,7 @@ void UserListRequestHandlerGroup::handleUserListCopyRequest(boost::shared_ptr<co
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->copyUserList(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+  application->getUserListManager()->copyUserList(packet->get<const Core::String&>("fromName"), packet->get<const Core::String&>("toName"));
 
   ret->setType("OK");
 }
@@ -69,7 +69,7 @@ void UserListRequestHandlerGroup::handleUserListRenameRequest(boost::shared_ptr<
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->renameUserList(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+  application->getUserListManager()->renameUserList(packet->get<const Core::String&>("fromName"), packet->get<const Core::String&>("toName"));
 
   ret->setType("OK");
 }
@@ -78,7 +78,7 @@ void UserListRequestHandlerGroup::handleUserListRemoveRequest(boost::shared_ptr<
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->removeUserList(packet->get<const std::string&>("name"));
+  application->getUserListManager()->removeUserList(packet->get<const Core::String&>("name"));
 
   ret->setType("OK");
 }
@@ -88,12 +88,12 @@ void UserListRequestHandlerGroup::handleUserListDiffListRequest(boost::shared_pt
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  const std::set<std::string> &userListDiffs = application->getUserListManager()->getUserListDiffs();
+  const std::set<Core::String> &userListDiffs = application->getUserListManager()->getUserListDiffs();
 
   ret->setType("OK");
   Common::XmlData::List *list = ret->createList("userListDiffs");
 
-  for(std::set<std::string>::const_iterator diff = userListDiffs.begin(); diff != userListDiffs.end(); ++diff) {
+  for(std::set<Core::String>::const_iterator diff = userListDiffs.begin(); diff != userListDiffs.end(); ++diff) {
     Common::XmlData::List::iterator entry = list->addEntry();
 
     entry->set("name", *diff);
@@ -105,7 +105,7 @@ void UserListRequestHandlerGroup::handleUserListDiffDownloadRequest(boost::share
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  boost::shared_ptr<Common::UserLists::UserListDiff> diff = application->getUserListManager()->loadUserListDiff(packet->get<const std::string&>("name"));
+  boost::shared_ptr<Common::UserLists::UserListDiff> diff = application->getUserListManager()->loadUserListDiff(packet->get<const Core::String&>("name"));
   if(!diff)
     throw(Core::Exception(Core::Exception::NOT_FOUND));
 
@@ -117,7 +117,7 @@ void UserListRequestHandlerGroup::handleUserListDiffCopyRequest(boost::shared_pt
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->copyUserListDiff(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+  application->getUserListManager()->copyUserListDiff(packet->get<const Core::String&>("fromName"), packet->get<const Core::String&>("toName"));
 
   ret->setType("OK");
 }
@@ -126,7 +126,7 @@ void UserListRequestHandlerGroup::handleUserListDiffRenameRequest(boost::shared_
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->renameUserListDiff(packet->get<const std::string&>("fromName"), packet->get<const std::string&>("toName"));
+  application->getUserListManager()->renameUserListDiff(packet->get<const Core::String&>("fromName"), packet->get<const Core::String&>("toName"));
 
   ret->setType("OK");
 }
@@ -135,7 +135,7 @@ void UserListRequestHandlerGroup::handleUserListDiffRemoveRequest(boost::shared_
   if(!connection->isAuthenticated())
     throw(Core::Exception(Core::Exception::PERMISSION));
 
-  application->getUserListManager()->removeUserListDiff(packet->get<const std::string&>("name"));
+  application->getUserListManager()->removeUserListDiff(packet->get<const Core::String&>("name"));
 
   ret->setType("OK");
 }