1 files changed, 12 insertions, 12 deletions
diff --git a/src/Common/UserLists/UserList.cpp b/src/Common/UserLists/UserList.cpp
index a14111d..2fb47cd 100644
--- a/src/Common/UserLists/UserList.cpp
+++ b/src/Common/UserLists/UserList.cpp
@@ -23,7 +23,7 @@ namespace Mad {
 namespace Common {
 namespace UserLists {
 
-std::list<UserListEntry>::iterator UserList::findEntry(const std::string &name) {
+std::list<UserListEntry>::iterator UserList::findEntry(const Core::String &name) {
   for(std::list<UserListEntry>::iterator it = list.begin(); it != list.end(); ++it) {
     if(it->getName() == name) {
       return it;
@@ -33,7 +33,7 @@ std::list<UserListEntry>::iterator UserList::findEntry(const std::string &name)
   return list.end();
 }
 
-std::list<UserListEntry>::const_iterator UserList::findEntry(const std::string &name) const {
+std::list<UserListEntry>::const_iterator UserList::findEntry(const Core::String &name) const {
   for(std::list<UserListEntry>::const_iterator it = list.begin(); it != list.end(); ++it) {
     if(it->getName() == name) {
       return it;
@@ -43,14 +43,14 @@ std::list<UserListEntry>::const_iterator UserList::findEntry(const std::string &
   return list.end();
 }
 
-UserList::iterator UserList::find(const std::string &name) {
+UserList::iterator UserList::find(const Core::String &name) {
   if(!names.count(name))
     return end();
 
   return iterator(findEntry(name));
 }
 
-UserList::const_iterator UserList::find(const std::string &name) const {
+UserList::const_iterator UserList::find(const Core::String &name) const {
   if(!names.count(name))
     return end();
 
@@ -58,22 +58,22 @@ UserList::const_iterator UserList::find(const std::string &name) const {
 }
 
 void UserList::registerEntry(const UserListEntry &entry) {
-  std::set<std::string> details = entry.getDetailList();
+  std::set<Core::String> details = entry.getDetailList();
 
-  for(std::set<std::string>::iterator detail = details.begin(); detail != details.end(); ++detail) {
-    std::map<std::string, unsigned>::iterator it = detailCounts.find(*detail);
+  for(std::set<Core::String>::iterator detail = details.begin(); detail != details.end(); ++detail) {
+    std::map<Core::String, unsigned>::iterator it = detailCounts.find(*detail);
     if(it == detailCounts.end())
-      detailCounts.insert(make_pair(*detail, 1));
+      detailCounts.insert(std::make_pair(*detail, 1));
     else
       ++it->second;
   }
 }
 
 void UserList::unregisterEntry(const UserListEntry &entry) {
-  std::set<std::string> details = entry.getDetailList();
+  std::set<Core::String> details = entry.getDetailList();
 
-  for(std::set<std::string>::iterator detail = details.begin(); detail != details.end(); ++detail) {
-    std::map<std::string, unsigned>::iterator it = detailCounts.find(*detail);
+  for(std::set<Core::String>::iterator detail = details.begin(); detail != details.end(); ++detail) {
+    std::map<Core::String, unsigned>::iterator it = detailCounts.find(*detail);
     // TODO Assert
     if(it == detailCounts.end())
       continue;
@@ -99,7 +99,7 @@ bool UserList::insertUser(const UserListEntry &entry, iterator after) {
   return true;
 }
 
-bool UserList::removeUser(const std::string &name) {
+bool UserList::removeUser(const Core::String &name) {
   if(!names.erase(name))
     return false;