From 9bb64c7c90e6481ed3689a2b9380496da4ce09ff Mon Sep 17 00:00:00 2001 From: Matthias Schiffer 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 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Server') 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 > getUserGroups(unsigned long uid _UNUSED_PARAMETER_) throw(Net::Exception) { + virtual boost::shared_ptr > 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 > getGroupUsers(unsigned long gid _UNUSED_PARAMETER_) throw(Net::Exception) { + virtual boost::shared_ptr > 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 UserManager::getUserInfoByName(const std::st throw e; } -boost::shared_ptr > UserManager::getUserGroups(unsigned long uid) throw(Net::Exception) { +boost::shared_ptr > UserManager::getUserGroupList(unsigned long uid) throw(Net::Exception) { Net::Exception e(Net::Exception::NOT_IMPLEMENTED); for(std::set >::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 > UserManager::getGroupUsers(unsigned long gid) throw(Net::Exception) { +boost::shared_ptr > UserManager::getGroupUserList(unsigned long gid) throw(Net::Exception) { Net::Exception e(Net::Exception::NOT_IMPLEMENTED); for(std::set >::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 > getUserList() throw(Net::Exception); boost::shared_ptr getUserInfo(unsigned long uid) throw(Net::Exception); boost::shared_ptr getUserInfoByName(const std::string &name) throw(Net::Exception); - boost::shared_ptr > getUserGroups(unsigned long uid) throw(Net::Exception); + boost::shared_ptr > getUserGroupList(unsigned long uid) throw(Net::Exception); boost::shared_ptr > 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 > getGroupUsers(unsigned long gid) throw(Net::Exception); + boost::shared_ptr > getGroupUserList(unsigned long gid) throw(Net::Exception); void setPassword(unsigned long uid, const std::string &password) throw(Net::Exception); -- cgit v1.2.3