From 389960211861736ef321df82f6abcb59f6302897 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Wed, 17 Dec 2008 21:32:20 +0100
Subject: Sinnlose Klassen SharedPtr und SingletonPtr entfernt

---
 src/Core/ConnectionManager.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/Core/ConnectionManager.h')

diff --git a/src/Core/ConnectionManager.h b/src/Core/ConnectionManager.h
index fdc8a46..4623ab6 100644
--- a/src/Core/ConnectionManager.h
+++ b/src/Core/ConnectionManager.h
@@ -29,7 +29,6 @@
 #include <Common/HostInfo.h>
 #include <Common/Initializable.h>
 #include <Common/RequestManager.h>
-#include <Common/SingletonPtr.h>
 
 #include <Net/IPAddress.h>
 
@@ -46,7 +45,7 @@ namespace Core {
 
 class ConnectionManager : public Common::Configurable, public Common::Initializable {
   private:
-    static Common::SingletonPtr<ConnectionManager> connectionManager;
+    static ConnectionManager connectionManager;
 
     std::string x509TrustFile, x509CrlFile, x509CertFile, x509KeyFile;
 
@@ -67,16 +66,18 @@ class ConnectionManager : public Common::Configurable, public Common::Initializa
 
     void updateState(const std::string &name, Common::HostInfo::State state);
 
+    ConnectionManager() {}
+
   protected:
     virtual bool handleConfigEntry(const Common::ConfigEntry &entry, bool handled);
     virtual void configFinished();
 
-  public:
-    ConnectionManager();
-    virtual ~ConnectionManager();
+    virtual void doInit();
+    virtual void doDeinit();
 
+  public:
     static ConnectionManager* get() {
-      return connectionManager.get();
+      return &connectionManager;
     }
 
     void run();
-- 
cgit v1.2.3