Move stuff around a bit:

[user/henk/code/inspircd.git] / include / inspircd.h

diff --git a/include/inspircd.h b/include/inspircd.h
index 790e2a0ff69578776f868bd0e76b166ef2e6f6d1..e02a5deb54b52a277493736ad8ecc7ac75b6cd6c 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -54,6 +54,7 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "caller.h"
 #include "cull_list.h"
 #include "extensible.h"
+#include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
 #include "users.h"
@@ -245,7 +246,6 @@ DEFINE_HANDLER1(IsNickHandler, bool, const std::string&);
 DEFINE_HANDLER2(GenRandomHandler, void, char*, size_t);
 DEFINE_HANDLER1(IsIdentHandler, bool, const std::string&);
 DEFINE_HANDLER1(IsChannelHandler, bool, const std::string&);
-DEFINE_HANDLER1(RehashHandler, void, const std::string&);
 DEFINE_HANDLER3(OnCheckExemptionHandler, ModResult, User*, Channel*, const std::string&);
 
 /** The main class of the irc server.
@@ -296,7 +296,6 @@ class CoreExport InspIRCd
        IsIdentHandler HandleIsIdent;
        OnCheckExemptionHandler HandleOnCheckExemption;
        IsChannelHandler HandleIsChannel;
-       RehashHandler HandleRehash;
        GenRandomHandler HandleGenRandom;
 
        /** Globally accessible fake user record. This is used to force mode changes etc across s2s, etc.. bit ugly, but.. better than how this was done in 1.1
@@ -402,7 +401,7 @@ class CoreExport InspIRCd
 
        /** Holds extensible for user operquit
         */
-       LocalStringExt OperQuit;
+       StringExtItem OperQuit;
 
        /** Manages the generation and transmission of ISUPPORT. */
        ISupportManager ISupport;
@@ -483,10 +482,6 @@ class CoreExport InspIRCd
         */
        static bool IsSID(const std::string& sid);
 
-       /** Rehash the local server
-        */
-       caller1<void, const std::string&> Rehash;
-
        /** Handles incoming signals after being set
         * @param signal the signal recieved
         */
@@ -583,8 +578,9 @@ class CoreExport InspIRCd
        static void ProcessColors(file_cache& input);
 
        /** Rehash the local server
+        * @param uuid The uuid of the user who started the rehash, can be empty
         */
-       void RehashServer();
+       void Rehash(const std::string& uuid = "");
 
        /** Check if the given nickmask matches too many users, send errors to the given user
         * @param nick A nickmask to match against
@@ -714,11 +710,6 @@ class CommandModule : public Module
        {
        }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(cmd);
-       }
-
        Version GetVersion()
        {
                return Version(cmd.name, VF_VENDOR|VF_CORE);