Move admin settings into core_info

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

diff --git a/include/configreader.h b/include/configreader.h
index a46f9cf95ce2bb5b370f0b85062bb2fa7538d069..3cb75ad3760017c402d787724e2d0222a794363d 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -83,8 +83,7 @@ class CoreExport ConfigTag : public refcountbase
        inline const std::vector<KeyVal>& getItems() const { return items; }
 
        /** Create a new ConfigTag, giving access to the private KeyVal item list */
-       static ConfigTag* create(const std::string& Tag, const std::string& file, int line,
-               std::vector<KeyVal>*&items);
+       static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
  private:
        ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -152,11 +151,6 @@ struct CommandLineConf
         */
        bool writelog;
 
-       /** True if we have been told to run the testsuite from the commandline,
-        * rather than entering the mainloop.
-        */
-       bool TestSuite;
-
        /** Saved argc from startup
         */
        int argc;
@@ -303,67 +297,6 @@ class CoreExport ServerConfig
         */
        std::string ServerDesc;
 
-       /** Holds the admin's name, for output in
-        * the /ADMIN command.
-        */
-       std::string AdminName;
-
-       /** Holds the email address of the admin,
-        * for output in the /ADMIN command.
-        */
-       std::string AdminEmail;
-
-       /** Holds the admin's nickname, for output
-        * in the /ADMIN command
-        */
-       std::string AdminNick;
-
-       /** The admin-configured /DIE password
-        */
-       std::string diepass;
-
-       /** The admin-configured /RESTART password
-        */
-       std::string restartpass;
-
-       /** The hash method for *BOTH* the die and restart passwords.
-        */
-       std::string powerhash;
-
-       /** The pathname and filename of the message of the
-        * day file, as defined by the administrator.
-        */
-       std::string motd;
-
-       /** The pathname and filename of the rules file,
-        * as defined by the administrator.
-        */
-       std::string rules;
-
-       /** The quit prefix in use, or an empty string
-        */
-       std::string PrefixQuit;
-
-       /** The quit suffix in use, or an empty string
-        */
-       std::string SuffixQuit;
-
-       /** The fixed quit message in use, or an empty string
-        */
-       std::string FixedQuit;
-
-       /** The part prefix in use, or an empty string
-        */
-       std::string PrefixPart;
-
-       /** The part suffix in use, or an empty string
-        */
-       std::string SuffixPart;
-
-       /** The fixed part message in use, or an empty string
-        */
-       std::string FixedPart;
-
        /** Pretend disabled commands don't exist.
         */
        bool DisabledDontExist;
@@ -484,10 +417,6 @@ class CoreExport ServerConfig
         */
        std::string CustomVersion;
 
-       /** List of u-lined servers
-        */
-       std::map<irc::string, bool> ulines;
-
        /** If set to true, provide syntax hints for unknown commands
         */
        bool SyntaxHints;