From ef79134812eb0f3ef024fe57519dce05ec4fb401 Mon Sep 17 00:00:00 2001
From: brain
Date: Thu, 1 May 2008 16:59:20 +0000
Subject: Some modules throw CoreException, this is wrong wrongitty wrong!
 Throw ModuleException instead.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9598 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/extra/m_rline.cpp | 2 +-
 src/modules/m_chanprotect.cpp | 6 +++---
 src/modules/m_cloaking.cpp    | 2 +-
 src/modules/m_randquote.cpp   | 6 ++----
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/extra/m_rline.cpp b/src/modules/extra/m_rline.cpp
index 146087ec0..1a030d38a 100644
--- a/src/modules/extra/m_rline.cpp
+++ b/src/modules/extra/m_rline.cpp
@@ -47,7 +47,7 @@ class CoreExport RLine : public XLine
 		if (!regex)
 		{
 			ServerInstance->SNO->WriteToSnoMask('x',"Error in regular expression: %s at offset %d: %s\n", regexs, erroffset, error);
-			throw CoreException("Bad regex pattern.");
+			throw ModuleException("Bad regex pattern.");
 		}
 	}
 
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 6df309cde..b15cd0d9f 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -354,13 +354,13 @@ class ModuleChanProtect : public Module
 		APrefix = apre.empty() ? 0 : apre[0];
 
 		if ((APrefix && QPrefix) && APrefix == QPrefix)
-			throw CoreException("What the smeg, why are both your +q and +a prefixes the same character?");
+			throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?");
 
 		if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp)
-			throw CoreException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
+			throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another.");
 
 		if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf)
-			throw CoreException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
+			throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
 
 		DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
 		DeprivOthers = Conf.ReadFlag("options","deprotectothers",0);
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index e5cf64988..7a500c1b3 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -274,7 +274,7 @@ class ModuleCloaking : public Module
 		{
 			OnRehash(NULL,"");
 		}
-		catch (CoreException &e)
+		catch (ModuleException &e)
 		{
 			delete cu;
 			throw e;
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 02572e7de..0353ae939 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -74,15 +74,13 @@ class ModuleRandQuote : public Module
 
 		if (q_file.empty())
 		{
-			CoreException e("m_randquote: Quotefile not specified - Please check your config.");
-			throw(e);
+			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
 		}
 
 		quotes = new FileReader(ServerInstance, q_file);
 		if(!quotes->Exists())
 		{
-			CoreException e("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-			throw(e);
+			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
 		}
 		else
 		{
-- 
cgit v1.3.1-10-gc9f91