4 files changed, 0 insertions, 124 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 344e2a473..164b7c1e7 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -325,7 +325,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	 Rehash(&HandleRehash),
 	 IsNick(&HandleIsNick),
 	 IsIdent(&HandleIsIdent),
-	 FloodQuitUser(&HandleFloodQuitUser),
 	 OnCheckExemption(&HandleOnCheckExemption)
 {
 	ServerInstance = this;
diff --git a/src/modules.cpp b/src/modules.cpp
index b8a831c48..560fd6b2b 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -425,16 +425,6 @@ std::string& ModuleManager::LastError()
 	return LastModuleError;
 }
 
-CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
-{
-	return this->Parser->CallHandler(commandname, parameters, user);
-}
-
-bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user)
-{
-	return this->Parser->IsValidCommand(commandname, pcnt, user);
-}
-
 void ModuleManager::AddService(ServiceProvider& item)
 {
 	switch (item.service)
@@ -606,93 +596,6 @@ const std::vector<std::string> ModuleManager::GetAllModuleNames(int filter)
 	return retval;
 }
 
-ConfigReader::ConfigReader()
-{
-	this->error = 0;
-	ServerInstance->Logs->Log("MODULE", DEBUG, "ConfigReader is deprecated in 2.0; "
-		"use ServerInstance->Config->ConfValue(\"key\") or ->ConfTags(\"key\") instead");
-}
-
-
-ConfigReader::~ConfigReader()
-{
-}
-
-static ConfigTag* SlowGetTag(const std::string &tag, int index)
-{
-	ConfigTagList tags = ServerInstance->Config->ConfTags(tag);
-	while (tags.first != tags.second)
-	{
-		if (!index)
-			return tags.first->second;
-		tags.first++;
-		index--;
-	}
-	return NULL;
-}
-
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
-{
-	std::string result = default_value;
-	if (!SlowGetTag(tag, index)->readString(name, result, allow_linefeeds))
-	{
-		this->error = CONF_VALUE_NOT_FOUND;
-	}
-	return result;
-}
-
-std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, int index, bool allow_linefeeds)
-{
-	return ReadValue(tag, name, "", index, allow_linefeeds);
-}
-
-bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
-{
-	bool def = (default_value == "yes");
-	return SlowGetTag(tag, index)->getBool(name, def);
-}
-
-bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
-{
-	return ReadFlag(tag, name, "", index);
-}
-
-
-int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
-{
-	int v = atoi(default_value.c_str());
-	int result = SlowGetTag(tag, index)->getInt(name, v);
-
-	if ((need_positive) && (result < 0))
-	{
-		this->error = CONF_INT_NEGATIVE;
-		return 0;
-	}
-
-	return result;
-}
-
-int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, int index, bool need_positive)
-{
-	return ReadInteger(tag, name, "", index, need_positive);
-}
-
-long ConfigReader::GetError()
-{
-	long olderr = this->error;
-	this->error = 0;
-	return olderr;
-}
-
-int ConfigReader::Enumerate(const std::string &tag)
-{
-	ServerInstance->Logs->Log("MODULE", DEBUG, "Module is using ConfigReader::Enumerate on %s; this is slow!",
-		tag.c_str());
-	int i=0;
-	while (SlowGetTag(tag, i)) i++;
-	return i;
-}
-
 FileReader::FileReader(const std::string &filename)
 {
 	LoadFile(filename);
diff --git a/src/modules/u_listmode.h b/src/modules/u_listmode.h
index b370c86e8..b0a8f2505 100644
--- a/src/modules/u_listmode.h
+++ b/src/modules/u_listmode.h
@@ -367,14 +367,6 @@ class ListModeBase : public ModeHandler
 		}
 	}
 
-	/** Clean up module on unload
-	 * @param target_type Type of target to clean
-	 * @param item Item to clean
-	 */
-	virtual void DoCleanup(int, void*)
-	{
-	}
-
 	/** Validate parameters.
 	 * Overridden by implementing module.
 	 * @param source Source user adding the parameter
diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 9cc2e7df7..382f4ffa0 100644
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -28,24 +28,6 @@
 #include "socketengine.h"
 #include "command_parse.h"
 
-void FloodQuitUserHandler::Call(User* current)
-{
-	ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
-	ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
-			current->registered == REG_ALL ? current->nick.c_str() : "",
-			current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str());
-	ServerInstance->Users->QuitUser(current, "Excess flood");
-
-	if (current->registered != REG_ALL)
-	{
-		ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-		if (ServerInstance->XLines->AddLine(zl,NULL))
-			ServerInstance->XLines->ApplyLines();
-		else
-			delete zl;
-	}
-}
-
 /**
  * This function is called once a second from the mainloop.
  * It is intended to do background checking on all the user structs, e.g.