Globale Variablen durch Application-Klasse ersetzt

1 files changed, 3 insertions, 6 deletions

diff --git a/src/Server/UserManager.h b/src/Server/UserManager.h
index 31f50d5..6d3c034 100644
--- a/src/Server/UserManager.h
+++ b/src/Server/UserManager.h
@@ -34,16 +34,17 @@
 namespace Mad {
 namespace Server {
 
+class Application;
 class UserBackend;
 
 class UserManager : boost::noncopyable {
   private:
+    friend class Application;
+
     struct Compare {
       bool operator() (boost::shared_ptr<UserBackend> b1, boost::shared_ptr<UserBackend> b2);
     };
 
-    static UserManager userManager;
-
     std::set<boost::shared_ptr<UserBackend>, Compare> backends;
 
     UserManager() {}
@@ -70,10 +71,6 @@ class UserManager : boost::noncopyable {
     void setPassword(unsigned long uid, const std::string &password) throw(Core::Exception);
 
     void addUser(const Common::UserInfo &userInfo) throw(Core::Exception);
-
-    static UserManager *get() {
-      return &userManager;
-    }
 };
 
 }