summaryrefslogtreecommitdiffstats
path: root/src/Common/UserLists
diff options
context:
space:
mode:
Diffstat (limited to 'src/Common/UserLists')
-rw-r--r--src/Common/UserLists/UserList.cpp24
-rw-r--r--src/Common/UserLists/UserList.h24
-rw-r--r--src/Common/UserLists/UserListEntry.h35
-rw-r--r--src/Common/UserLists/Util.cpp12
4 files changed, 48 insertions, 47 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;
diff --git a/src/Common/UserLists/UserList.h b/src/Common/UserLists/UserList.h
index 9c5985d..4e782bf 100644
--- a/src/Common/UserLists/UserList.h
+++ b/src/Common/UserLists/UserList.h
@@ -89,23 +89,23 @@ class MAD_COMMON_EXPORT UserList {
}
};
- std::set<std::string> names;
+ std::set<Core::String> names;
std::list<UserListEntry> list;
- std::map<std::string, unsigned> detailCounts;
+ std::map<Core::String, unsigned> detailCounts;
void registerEntry(const UserListEntry &entry);
void unregisterEntry(const UserListEntry &entry);
- std::list<UserListEntry>::iterator findEntry(const std::string &name);
- std::list<UserListEntry>::const_iterator findEntry(const std::string &name) const;
+ std::list<UserListEntry>::iterator findEntry(const Core::String &name);
+ std::list<UserListEntry>::const_iterator findEntry(const Core::String &name) const;
public:
typedef iterator_base<const UserListEntry, std::list<UserListEntry>::iterator> iterator;
typedef iterator_base<const UserListEntry, std::list<UserListEntry>::const_iterator> const_iterator;
- iterator find(const std::string &name);
- const_iterator find(const std::string &name) const;
+ iterator find(const Core::String &name);
+ const_iterator find(const Core::String &name) const;
iterator begin() {
return iterator(list.begin());
@@ -131,17 +131,17 @@ class MAD_COMMON_EXPORT UserList {
return list.size();
}
- std::set<std::string> getDetails() const {
- std::set<std::string> ret;
+ std::set<Core::String> getDetails() const {
+ std::set<Core::String> ret;
- for(std::map<std::string, unsigned>::const_iterator it = detailCounts.begin(); it != detailCounts.end(); ++it)
+ for(std::map<Core::String, unsigned>::const_iterator it = detailCounts.begin(); it != detailCounts.end(); ++it)
ret.insert(it->first);
return ret;
}
- unsigned getDetailUsage(const std::string &detail) const {
- std::map<std::string, unsigned>::const_iterator it = detailCounts.find(detail);
+ unsigned getDetailUsage(const Core::String &detail) const {
+ std::map<Core::String, unsigned>::const_iterator it = detailCounts.find(detail);
if(it == detailCounts.end())
return 0;
else
@@ -150,7 +150,7 @@ class MAD_COMMON_EXPORT UserList {
bool addUser(const UserListEntry &entry);
bool insertUser(const UserListEntry &entry, iterator after);
- bool removeUser(const std::string &name);
+ bool removeUser(const Core::String &name);
bool updateUser(const UserListEntry &entry);
UserList() {}
diff --git a/src/Common/UserLists/UserListEntry.h b/src/Common/UserLists/UserListEntry.h
index 8642275..acfe445 100644
--- a/src/Common/UserLists/UserListEntry.h
+++ b/src/Common/UserLists/UserListEntry.h
@@ -20,9 +20,10 @@
#ifndef MAD_COMMON_USERLISTS_USERLISTENTRY_H_
#define MAD_COMMON_USERLISTS_USERLISTENTRY_H_
+#include <Core/String.h>
+
#include <map>
#include <set>
-#include <string>
namespace Mad {
@@ -31,53 +32,53 @@ namespace UserLists {
class UserListEntry {
private:
- std::string name;
- std::string group;
+ Core::String name;
+ Core::String group;
- std::map<std::string, std::string> details;
+ std::map<Core::String, Core::String> details;
public:
- UserListEntry(const std::string &name0 = std::string(), const std::string &group0 = std::string()) : name(name0), group(group0) {}
+ UserListEntry(const Core::String &name0 = Core::String(), const Core::String &group0 = Core::String()) : name(name0), group(group0) {}
- const std::string& getName() const {
+ const Core::String& getName() const {
return name;
}
- void setName(const std::string &newName) {
+ void setName(const Core::String &newName) {
name = newName;
}
- const std::string& getGroup() const {
+ const Core::String& getGroup() const {
return group;
}
- void setGroup(const std::string &newGroup) {
+ void setGroup(const Core::String &newGroup) {
group = newGroup;
}
- std::set<std::string> getDetailList() const {
- std::set<std::string> ret;
+ std::set<Core::String> getDetailList() const {
+ std::set<Core::String> ret;
- for(std::map<std::string, std::string>::const_iterator it = details.begin(); it != details.end(); ++it)
+ for(std::map<Core::String, Core::String>::const_iterator it = details.begin(); it != details.end(); ++it)
ret.insert(it->first);
return ret;
}
- std::string getDetail(const std::string &name) const {
- std::map<std::string, std::string>::const_iterator it = details.find(name);
+ Core::String getDetail(const Core::String &name) const {
+ std::map<Core::String, Core::String>::const_iterator it = details.find(name);
if(it != details.end())
return it->second;
else
- return std::string();
+ return Core::String();
}
- void setDetail(const std::string &name, const std::string &value) {
+ void setDetail(const Core::String &name, const Core::String &value) {
details.erase(name);
details.insert(std::make_pair(name, value));
}
- void unsetDetail(const std::string &name) {
+ void unsetDetail(const Core::String &name) {
details.erase(name);
}
diff --git a/src/Common/UserLists/Util.cpp b/src/Common/UserLists/Util.cpp
index 3c15956..cf04218 100644
--- a/src/Common/UserLists/Util.cpp
+++ b/src/Common/UserLists/Util.cpp
@@ -26,8 +26,8 @@ namespace Common {
namespace UserLists {
void Util::serializeUserListEntry(const UserListEntry *user, XmlData::List::iterator entry) {
- std::set<std::string> details = user->getDetailList();
- for(std::set<std::string>::iterator detail = details.begin(); detail != details.end(); ++detail)
+ std::set<Core::String> details = user->getDetailList();
+ for(std::set<Core::String>::iterator detail = details.begin(); detail != details.end(); ++detail)
entry->set(*detail, user->getDetail(*detail));
entry->set("name", user->getName());
@@ -35,14 +35,14 @@ void Util::serializeUserListEntry(const UserListEntry *user, XmlData::List::iter
}
UserListEntry Util::deserializeUserListEntry(XmlData::List::const_iterator entry) {
- UserListEntry user(entry->get<const std::string&>("name"), entry->get<const std::string&>("group"));
+ UserListEntry user(entry->get<const Core::String&>("name"), entry->get<const Core::String&>("group"));
- std::set<std::string> details = entry->getChildren();
- for(std::set<std::string>::iterator detail = details.begin(); detail != details.end(); ++detail) {
+ std::set<Core::String> details = entry->getChildren();
+ for(std::set<Core::String>::iterator detail = details.begin(); detail != details.end(); ++detail) {
if(*detail == "name" || *detail == "group")
continue;
- user.setDetail(*detail, entry->get<const std::string&>(*detail));
+ user.setDetail(*detail, entry->get<const Core::String&>(*detail));
}
return user;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 22:30:03 +0200