Merge branch 'insp3' into master

1 files changed, 2 insertions, 17 deletions

diff --git a/include/configreader.h b/include/configreader.h
index 4360b8661..511bedbee 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -332,18 +332,6 @@ class CoreExport ServerConfig
 	 */
 	std::string ServerDesc;
 
-	/** Pretend disabled commands don't exist.
-	 */
-	bool DisabledDontExist;
-
-	/** This variable identifies which usermodes have been diabled.
-	 */
-	std::bitset<64> DisabledUModes;
-
-	/** This variable identifies which chanmodes have been disabled.
-	 */
-	std::bitset<64> DisabledCModes;
-
 	/** How to treat a user in a channel who is banned. */
 	BannedUserTreatment RestrictBannedUsers;
 
@@ -379,8 +367,8 @@ class CoreExport ServerConfig
 	/** The number of seconds that the server clock can skip by before server operators are warned. */
 	time_t TimeSkipWarn;
 
-	/** True if we're going to hide ban reasons for non-opers (e.g. G-Lines,
-	 * K-Lines, Z-Lines)
+	/** True if we're going to hide ban reasons for non-opers (e.g. G-lines,
+	 * K-lines, Z-lines)
 	 */
 	bool HideBans;
 
@@ -466,9 +454,6 @@ class CoreExport ServerConfig
 
 	void Fill();
 
-	/** Disables the commands specified in <disabled:commands>. */
-	bool ApplyDisabledCommands();
-
 	/** Escapes a value for storage in a configuration key.
 	 * @param str The string to escape.
 	 * @param xml Are we using the XML config format?