m_spanningtree Replace #defines with references in DoCollision()

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 585abd0c7372e2192ebd827ca8eb00d1df26415b..403ba535502281b6672ec5c21d624a908cf13b36 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -109,8 +109,8 @@ void InspIRCd::Cleanup()
        ports.clear();
 
        /* Close all client sockets, or the new process inherits them */
-       LocalUserList& list = Users->local_users;
-       for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
+       const UserManager::LocalList& list = Users.GetLocalUsers();
+       for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
                Users->QuitUser(*i, "Server shutdown");
 
        GlobalCulls.Apply();
@@ -124,10 +124,7 @@ void InspIRCd::Cleanup()
                FakeClient->cull();
        }
        DeleteZero(this->FakeClient);
-       DeleteZero(this->Users);
        DeleteZero(this->XLines);
-       DeleteZero(this->Modules);
-       DeleteZero(this->SNO);
        DeleteZero(this->Config);
        SocketEngine::Deinit();
        Logs->CloseLogs();
@@ -249,10 +246,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
            do_nolog = 0, do_root = 0;
 
        // Initialize so that if we exit before proper initialization they're not deleted
-       this->Users = 0;
        this->Config = 0;
-       this->SNO = 0;
-       this->Modules = 0;
        this->XLines = 0;
        this->ConfigThread = NULL;
        this->FakeClient = NULL;
@@ -262,12 +256,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        SocketEngine::Init();
 
-       // Create base manager classes early, so nothing breaks
-       this->Users = new UserManager;
-
        this->Config = new ServerConfig;
-       this->SNO = new SnomaskManager;
-       this->Modules = new ModuleManager();
        dynamic_reference_base::reset_all();
        this->XLines = new XLineManager;