From 9bb64c7c90e6481ed3689a2b9380496da4ce09ff Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Thu, 28 May 2009 17:01:11 +0200
Subject: getUserGroups und getGroupUsers in getUserGroupList und
 getGroupUserList umbenannt

---
 src/Server/UserBackend.h                          | 4 ++--
 src/Server/UserManager.cpp                        | 8 ++++----
 src/Server/UserManager.h                          | 4 ++--
 src/modules/UserBackendMysql/UserBackendMysql.cpp | 4 ++--
 src/modules/UserBackendMysql/UserBackendMysql.h   | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Server/UserBackend.h b/src/Server/UserBackend.h
index 001ee49..00e63d3 100644
--- a/src/Server/UserBackend.h
+++ b/src/Server/UserBackend.h
@@ -57,7 +57,7 @@ class UserBackend {
       throw(Net::Exception(Net::Exception::NOT_IMPLEMENTED));
     }
 
-    virtual boost::shared_ptr<std::set<unsigned long> > getUserGroups(unsigned long uid _UNUSED_PARAMETER_) throw(Net::Exception) {
+    virtual boost::shared_ptr<std::set<unsigned long> > getUserGroupList(unsigned long uid _UNUSED_PARAMETER_) throw(Net::Exception) {
       throw(Net::Exception(Net::Exception::NOT_IMPLEMENTED));
     }
 
@@ -74,7 +74,7 @@ class UserBackend {
       throw(Net::Exception(Net::Exception::NOT_IMPLEMENTED));
     }
 
-    virtual boost::shared_ptr<std::set<unsigned long> > getGroupUsers(unsigned long gid _UNUSED_PARAMETER_) throw(Net::Exception) {
+    virtual boost::shared_ptr<std::set<unsigned long> > getGroupUserList(unsigned long gid _UNUSED_PARAMETER_) throw(Net::Exception) {
       throw(Net::Exception(Net::Exception::NOT_IMPLEMENTED));
     }
 
diff --git a/src/Server/UserManager.cpp b/src/Server/UserManager.cpp
index e38f458..5f30a6b 100644
--- a/src/Server/UserManager.cpp
+++ b/src/Server/UserManager.cpp
@@ -82,12 +82,12 @@ boost::shared_ptr<Common::UserInfo> UserManager::getUserInfoByName(const std::st
   throw e;
 }
 
-boost::shared_ptr<std::set<unsigned long> > UserManager::getUserGroups(unsigned long uid) throw(Net::Exception) {
+boost::shared_ptr<std::set<unsigned long> > UserManager::getUserGroupList(unsigned long uid) throw(Net::Exception) {
   Net::Exception e(Net::Exception::NOT_IMPLEMENTED);
 
   for(std::set<boost::shared_ptr<UserBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
     try {
-      return (*backend)->getUserGroups(uid);
+      return (*backend)->getUserGroupList(uid);
     }
     catch(Net::Exception e2) {
       if(e.getErrorCode() == Net::Exception::NOT_IMPLEMENTED && e2.getErrorCode() != Net::Exception::NOT_IMPLEMENTED)
@@ -146,12 +146,12 @@ unsigned long UserManager::getGroupId(const std::string &name) throw(Net::Except
   throw e;
 }
 
-boost::shared_ptr<std::set<unsigned long> > UserManager::getGroupUsers(unsigned long gid) throw(Net::Exception) {
+boost::shared_ptr<std::set<unsigned long> > UserManager::getGroupUserList(unsigned long gid) throw(Net::Exception) {
   Net::Exception e(Net::Exception::NOT_IMPLEMENTED);
 
   for(std::set<boost::shared_ptr<UserBackend> >::iterator backend = backends.begin(); backend != backends.end(); ++backend) {
     try {
-      return (*backend)->getGroupUsers(gid);
+      return (*backend)->getGroupUserList(gid);
     }
     catch(Net::Exception e2) {
       if(e.getErrorCode() == Net::Exception::NOT_IMPLEMENTED && e2.getErrorCode() != Net::Exception::NOT_IMPLEMENTED)
diff --git a/src/Server/UserManager.h b/src/Server/UserManager.h
index fe0ef3f..47c7318 100644
--- a/src/Server/UserManager.h
+++ b/src/Server/UserManager.h
@@ -60,12 +60,12 @@ class UserManager : boost::noncopyable {
     boost::shared_ptr<std::map<unsigned long, Common::UserInfo> > getUserList() throw(Net::Exception);
     boost::shared_ptr<Common::UserInfo> getUserInfo(unsigned long uid) throw(Net::Exception);
     boost::shared_ptr<Common::UserInfo> getUserInfoByName(const std::string &name) throw(Net::Exception);
-    boost::shared_ptr<std::set<unsigned long> > getUserGroups(unsigned long uid) throw(Net::Exception);
+    boost::shared_ptr<std::set<unsigned long> > getUserGroupList(unsigned long uid) throw(Net::Exception);
 
     boost::shared_ptr<std::map<unsigned long, Common::GroupInfo> > getGroupList() throw(Net::Exception);
     std::string getGroupName(unsigned long gid) throw(Net::Exception);
     unsigned long getGroupId(const std::string &name) throw(Net::Exception);
-    boost::shared_ptr<std::set<unsigned long> > getGroupUsers(unsigned long gid) throw(Net::Exception);
+    boost::shared_ptr<std::set<unsigned long> > getGroupUserList(unsigned long gid) throw(Net::Exception);
 
     void setPassword(unsigned long uid, const std::string &password) throw(Net::Exception);
 
diff --git a/src/modules/UserBackendMysql/UserBackendMysql.cpp b/src/modules/UserBackendMysql/UserBackendMysql.cpp
index 6cc5b2f..b020310 100644
--- a/src/modules/UserBackendMysql/UserBackendMysql.cpp
+++ b/src/modules/UserBackendMysql/UserBackendMysql.cpp
@@ -229,7 +229,7 @@ boost::shared_ptr<Common::UserInfo> UserBackendMysql::getUserInfoByName(const st
   throw Net::Exception(Net::Exception::NOT_AVAILABLE);
 }
 
-boost::shared_ptr<std::set<unsigned long> > UserBackendMysql::getUserGroups(unsigned long uid) throw(Net::Exception) {
+boost::shared_ptr<std::set<unsigned long> > UserBackendMysql::getUserGroupList(unsigned long uid) throw(Net::Exception) {
   Net::ThreadManager::get()->detach();
 
   if(mysql_ping(mysql))
@@ -335,7 +335,7 @@ unsigned long UserBackendMysql::getGroupId(const std::string &name) throw(Net::E
   throw Net::Exception(Net::Exception::NOT_AVAILABLE);
 }
 
-boost::shared_ptr<std::set<unsigned long> > UserBackendMysql::getGroupUsers(unsigned long gid) throw(Net::Exception) {
+boost::shared_ptr<std::set<unsigned long> > UserBackendMysql::getGroupUserList(unsigned long gid) throw(Net::Exception) {
   Net::ThreadManager::get()->detach();
 
   if(mysql_ping(mysql))
diff --git a/src/modules/UserBackendMysql/UserBackendMysql.h b/src/modules/UserBackendMysql/UserBackendMysql.h
index 71ee93f..26c7ef3 100644
--- a/src/modules/UserBackendMysql/UserBackendMysql.h
+++ b/src/modules/UserBackendMysql/UserBackendMysql.h
@@ -53,12 +53,12 @@ class UserBackendMysql : public Server::UserBackend, private Common::Configurabl
     virtual boost::shared_ptr<std::map<unsigned long, Common::UserInfo> > getUserList() throw(Net::Exception);
     virtual boost::shared_ptr<Common::UserInfo> getUserInfo(unsigned long uid) throw(Net::Exception);
     virtual boost::shared_ptr<Common::UserInfo> getUserInfoByName(const std::string &name) throw(Net::Exception);
-    virtual boost::shared_ptr<std::set<unsigned long> > getUserGroups(unsigned long uid) throw(Net::Exception);
+    virtual boost::shared_ptr<std::set<unsigned long> > getUserGroupList(unsigned long uid) throw(Net::Exception);
 
     virtual boost::shared_ptr<std::map<unsigned long, Common::GroupInfo> > getGroupList() throw(Net::Exception);
     virtual std::string getGroupName(unsigned long gid) throw(Net::Exception);
     virtual unsigned long getGroupId(const std::string &name) throw(Net::Exception);
-    virtual boost::shared_ptr<std::set<unsigned long> > getGroupUsers(unsigned long gid) throw(Net::Exception);
+    virtual boost::shared_ptr<std::set<unsigned long> > getGroupUserList(unsigned long gid) throw(Net::Exception);
 
   public:
     virtual ~UserBackendMysql() {
-- 
cgit v1.2.3