Introduce Server class

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

diff --git a/include/inspircd.h b/include/inspircd.h
index e02a5deb54b52a277493736ad8ecc7ac75b6cd6c..a2815b8a536560b5fe970d94c8c30c585747aaba 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -57,6 +57,7 @@ CoreExport extern InspIRCd* ServerInstance;
 #include "fileutils.h"
 #include "numerics.h"
 #include "uid.h"
+#include "server.h"
 #include "users.h"
 #include "channels.h"
 #include "timer.h"
@@ -565,7 +566,7 @@ class CoreExport InspIRCd
         * @param mask A nick!user\@host masak to match against
         * @return True i the mask is valid
         */
-       bool IsValidMask(const std::string &mask);
+       static bool IsValidMask(const std::string& mask);
 
        /** Strips all color codes from the given string
         * @param sentence The string to strip from
@@ -621,18 +622,6 @@ class CoreExport InspIRCd
         */
        int PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype);
 
-       /** Check if a given server is a uline.
-        * An empty string returns true, this is by design.
-        * @param server The server to check for uline status
-        * @return True if the server is a uline OR the string is empty
-        */
-       bool ULine(const std::string& server);
-
-       /** Returns true if the uline is 'silent' (doesnt generate
-        * remote connect notices etc).
-        */
-       bool SilentULine(const std::string& server);
-
        /** Returns the full version string of this ircd
         * @return The version string
         */
@@ -685,7 +674,7 @@ class CoreExport InspIRCd
 
        /** Return a time_t as a human-readable string.
         */
-       std::string TimeString(time_t curtime);
+       static std::string TimeString(time_t curtime);
 
        /** Begin execution of the server.
         * NOTE: this function NEVER returns. Internally,