Move OnStats from the core to a cross-module event.

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

diff --git a/include/inspircd.h b/include/inspircd.h
index 7e9007a1dc3687061ba0c4b02b35e4c047f1393f..0f73f192fe2e5540d8761b561d51dc91a90a80e3 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -88,6 +88,7 @@ struct fakederef
 #include "socketengine.h"
 #include "snomasks.h"
 #include "filelogger.h"
+#include "message.h"
 #include "modules.h"
 #include "threadengine.h"
 #include "configreader.h"
@@ -374,7 +375,7 @@ class CoreExport InspIRCd
 
        /** Determines whether a channel name is valid according to the RFC 1459 rules.
         * This is the default function for InspIRCd::IsChannel.
-        * @param nick The channel name to validate.
+        * @param channel The channel name to validate.
         * @return True if the channel name is valid according to RFC 1459 rules; otherwise, false.
        */
        static bool DefaultIsChannel(const std::string& channel);
@@ -402,18 +403,13 @@ class CoreExport InspIRCd
         */
        void Exit(int status);
 
-       /** Causes the server to exit immediately with exit code 0.
-        * The status code is required for signal handlers, and ignored.
-        */
-       static void QuickExit(int status);
-
        /** Formats the input string with the specified arguments.
        * @param formatString The string to format
        * @param ... A variable number of format arguments.
        * @return The formatted string
        */
-       static const char* Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
-       static const char* Format(va_list &vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
+       static std::string Format(const char* formatString, ...) CUSTOM_PRINTF(1, 2);
+       static std::string Format(va_list& vaList, const char* formatString) CUSTOM_PRINTF(2, 0);
 
        /** Determines whether a nickname is valid. */
        TR1NS::function<bool(const std::string&)> IsNick;
@@ -430,7 +426,7 @@ class CoreExport InspIRCd
 
        /** Determines whether a ident is valid according to the RFC 1459 rules.
         * This is the default function for InspIRCd::IsIdent.
-        * @param nick The ident to validate.
+        * @param ident The ident to validate.
         * @return True if the ident is valid according to RFC 1459 rules; otherwise, false.
        */
        static bool DefaultIsIdent(const std::string& ident);
@@ -582,4 +578,3 @@ inline void stdalgo::culldeleter::operator()(classbase* item)
 
 #include "numericbuilder.h"
 #include "modules/whois.h"
-#include "modules/stats.h"