From c47776703ef551ed8eeee336d21da73aae020103 Mon Sep 17 00:00:00 2001 From: om Date: Sun, 9 Jul 2006 12:09:52 +0000 Subject: DELETE()'s in destructors *fwap* git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4203 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_banexception.cpp | 5 +++++ src/modules/m_blockcaps.cpp | 1 + src/modules/m_blockcolor.cpp | 1 + src/modules/m_botmode.cpp | 1 + src/modules/m_censor.cpp | 5 ++--- src/modules/m_chanfilter.cpp | 1 + src/modules/m_chanprotect.cpp | 16 ++++------------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 113af0b6b..862a6e21c 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -92,6 +92,11 @@ public: { return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR); } + + virtual ~ModuleBanException() + { + DELETE(be); + } }; class ModuleBanExceptionFactory : public ModuleFactory diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp index 017217073..a15cc67c5 100644 --- a/src/modules/m_blockcaps.cpp +++ b/src/modules/m_blockcaps.cpp @@ -104,6 +104,7 @@ public: virtual ~ModuleBlockCAPS() { + DELETE(bc); } virtual Version GetVersion() diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp index f517ba215..4f3e04106 100644 --- a/src/modules/m_blockcolor.cpp +++ b/src/modules/m_blockcolor.cpp @@ -112,6 +112,7 @@ class ModuleBlockColour : public Module virtual ~ModuleBlockColour() { + DELETE(bc); } virtual Version GetVersion() diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 7120c36c7..806240e4e 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -72,6 +72,7 @@ class ModuleBotMode : public Module virtual ~ModuleBotMode() { + DELETE(bm); } virtual Version GetVersion() diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp index 246079c10..d1e864419 100644 --- a/src/modules/m_censor.cpp +++ b/src/modules/m_censor.cpp @@ -137,8 +137,8 @@ class ModuleCensor : public Module virtual ~ModuleCensor() { - delete cu; - delete cc; + DELETE(cu); + DELETE(cc); } virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace) @@ -249,4 +249,3 @@ extern "C" void * init_module( void ) { return new ModuleCensorFactory; } - diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp index 0ceac7318..3c278ac44 100644 --- a/src/modules/m_chanfilter.cpp +++ b/src/modules/m_chanfilter.cpp @@ -148,6 +148,7 @@ class ModuleChanFilter : public Module virtual ~ModuleChanFilter() { + DELETE(cf); } }; diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 0839a48e4..dca0b53d2 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -14,9 +14,6 @@ * --------------------------------------------------- */ -using namespace std; - -#include #include "users.h" #include "channels.h" #include "modules.h" @@ -24,7 +21,7 @@ using namespace std; /* $ModDesc: Provides channel modes +a and +q */ -char fakevalue[] = "on"; +const char fakevalue* = "on"; class ModuleChanProtect : public Module { @@ -35,13 +32,9 @@ class ModuleChanProtect : public Module public: ModuleChanProtect(Server* Me) - : Module::Module(Me) - { - - // here we initialise our module. Use new to create new instances of the required - // classes. - - Srv = Me; + : Module::Module(Me), Srv(Me) + { + /* Initialise module variables */ Conf = new ConfigReader; // set up our modes. We're using listmodes and not normal extmodes here. @@ -372,4 +365,3 @@ extern "C" void * init_module( void ) { return new ModuleChanProtectFactory; } - -- cgit v1.2.3