From 1b3a914d5fdf5a578e24754845c6350c59c0b523 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Tue, 29 Sep 2009 18:12:59 +0200
Subject: Fixed some UserListManager-related bugs

---
 src/Server/UserListManager.h | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'src/Server/UserListManager.h')

diff --git a/src/Server/UserListManager.h b/src/Server/UserListManager.h
index bb5b4e3..0c2ef69 100644
--- a/src/Server/UserListManager.h
+++ b/src/Server/UserListManager.h
@@ -22,7 +22,6 @@
 
 #include "export.h"
 
-#include <Core/Configurable.h>
 #include <Core/String.h>
 
 #include <boost/noncopyable.hpp>
@@ -47,28 +46,17 @@ namespace RequestHandlers {
 class UserListRequestHandlerGroup;
 }
 
-class MAD_SERVER_EXPORT UserListManager : private Core::Configurable, private boost::noncopyable {
+class MAD_SERVER_EXPORT UserListManager : private boost::noncopyable {
   private:
     Application *application;
 
     boost::shared_ptr<RequestHandlers::UserListRequestHandlerGroup> requestHandlerGroup;
 
-    std::set<Core::String> userLists;
-    std::set<Core::String> userListDiffs;
-
-  protected:
-    virtual void configure();
-
   public:
-    virtual int getPriority() const {return -1;}
-
     UserListManager(Application *application0);
     virtual ~UserListManager();
 
-    const std::set<Core::String>& getUserLists() const {
-      return userLists;
-    }
-
+    std::set<Core::String> getUserLists();
     bool existsUserList(const Core::String &name);
     boost::shared_ptr<Common::UserLists::UserList> loadUserList(const Core::String &name);
     void storeUserList(const Core::String &name, const Common::UserLists::UserList *list);
@@ -76,10 +64,7 @@ class MAD_SERVER_EXPORT UserListManager : private Core::Configurable, private bo
     void renameUserList(const Core::String &fromName, const Core::String &toName);
     void removeUserList(const Core::String &name);
 
-    const std::set<Core::String>& getUserListDiffs() const {
-      return userListDiffs;
-    }
-
+    std::set<Core::String> getUserListDiffs();
     bool existsUserListDiff(const Core::String &name);
     boost::shared_ptr<Common::UserLists::UserListDiff> loadUserListDiff(const Core::String &name);
     void storeUserListDiff(const Core::String &name, const Common::UserLists::UserListDiff *list);
-- 
cgit v1.2.3