X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=cf5dd1a3e899b7da05cc0cd8c88d9492d1ad948a;hb=21eba8e86b3d7361bc9334b4e15e968ba095db76;hp=07c7a09f51cde8d24431f3f879cc858a9e13e15a;hpb=954786c678c411bd28016dcbc2b4d68ca861fb58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 07c7a09f5..cf5dd1a3e 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -21,8 +21,7 @@
  */
 
 
-#ifndef INSPIRCD_CONFIGREADER
-#define INSPIRCD_CONFIGREADER
+#pragma once
 
 #include <sstream>
 #include <string>
@@ -102,21 +101,6 @@ class ServerLimits
 	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12), MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200)
 	{
 	}
-
-	/** Finalises the settings by adding one. This allows for them to be used as-is
-	 * without a 'value+1' when using the std::string assignment methods etc.
-	 */
-	void Finalise()
-	{
-		NickMax++;
-		ChanMax++;
-		IdentMax++;
-		MaxQuit++;
-		MaxTopic++;
-		MaxKick++;
-		MaxGecos++;
-		MaxAway++;
-	}
 };
 
 struct CommandLineConf
@@ -186,11 +170,6 @@ class CoreExport OperInfo : public refcountbase
 	/** Get a configuration item, searching in the oper, type, and class blocks (in that order) */
 	std::string getConfig(const std::string& key);
 	void init();
-
-	inline const char* NameStr()
-	{
-		return irc::Spacify(name.c_str());
-	}
 };
 
 /** This class holds the bulk of the runtime configuration for the ircd.
@@ -255,19 +234,6 @@ class CoreExport ServerConfig
 	 */
 	int c_ipv6_range;
 
-	/** Max number of WhoWas entries per user.
-	 */
-	int WhoWasGroupSize;
-
-	/** Max number of cumulative user-entries in WhoWas.
-	 *  When max reached and added to, push out oldest entry FIFO style.
-	 */
-	int WhoWasMaxGroups;
-
-	/** Max seconds a user is kept in WhoWas before being pruned.
-	 */
-	int WhoWasMaxKeep;
-
 	/** Holds the server name of the local server
 	 * as defined by the administrator.
 	 */
@@ -349,10 +315,6 @@ class CoreExport ServerConfig
 	 */
 	std::string FixedPart;
 
-	/** The DNS server to use for DNS queries
-	 */
-	std::string DNSServer;
-
 	/** Pretend disabled commands don't exist.
 	 */
 	bool DisabledDontExist;
@@ -460,16 +422,6 @@ class CoreExport ServerConfig
 	 */
 	ClassVector Classes;
 
-	/** The 005 tokens of this server (ISUPPORT)
-	 * populated/repopulated upon loading or unloading
-	 * modules.
-	 */
-	std::string data005;
-
-	/** isupport strings
-	 */
-	std::vector<std::string> isupport;
-
 	/** STATS characters in this list are available
 	 * only to operators.
 	 */
@@ -487,14 +439,6 @@ class CoreExport ServerConfig
 	 */
 	std::map<irc::string, bool> ulines;
 
-	/** Max banlist sizes for channels (the std::string is a glob)
-	 */
-	std::map<std::string, int> maxbans;
-
-	/** If set to true, no user DNS lookups are to be performed
-	 */
-	bool NoUserDns;
-
 	/** If set to true, provide syntax hints for unknown commands
 	 */
 	bool SyntaxHints;
@@ -547,14 +491,6 @@ class CoreExport ServerConfig
 	 */
 	const std::string& GetSID();
 
-	/** Update the 005 vector
-	 */
-	void Update005();
-
-	/** Send the 005 numerics (ISUPPORT) to a user
-	 */
-	void Send005(User* user);
-
 	/** Read the entire configuration into memory
 	 * and initialize this class. All other methods
 	 * should be used only by the core.
@@ -593,11 +529,6 @@ class CoreExport ServerConfig
 	/** If this value is true, snotices will not stack when repeats are sent
 	 */
 	bool NoSnoticeStack;
-
-	/** If true, a "Welcome to <networkname>!" NOTICE will be sent to
-	 * connecting users
-	 */
-	bool WelcomeNotice;
 };
 
 /** The background thread for config reading, so that reading from executable includes
@@ -624,5 +555,3 @@ class CoreExport ConfigReaderThread : public Thread
 	void Finish();
 	bool IsDone() { return done; }
 };
-
-#endif