Fix various warnings when building with LLVM 3.5.

[user/henk/code/inspircd.git] / src / modules / m_banexception.cpp

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 0cd915ef9dc5dfd5a3938bb5c72f57f5014a0fd9..1811f743de59e5dd7fc64124b1d66ba5ccb9cb32 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -31,7 +41,7 @@
 class BanException : public ListModeBase
 {
  public:
-       BanException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'e', "End of Channel Exception List", 348, 349, true) { }
+       BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
@@ -40,16 +50,17 @@ class ModuleBanException : public Module
        BanException be;
 
 public:
-       ModuleBanException(InspIRCd* Me) : Module(Me), be(Me, this)
+       ModuleBanException() : be(this)
        {
-               if (!ServerInstance->Modes->AddMode(&be))
-                       throw ModuleException("Could not add new modes!");
-               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+       }
 
-               be.DoImplements(this);
-               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
-               Me->Modules->Attach(list, this, 5);
+       void init()
+       {
+               ServerInstance->Modules->AddService(be);
 
+               be.DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
        void On005Numeric(std::string &output)
@@ -106,11 +117,6 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       void OnCleanup(int target_type, void* item)
-       {
-               be.DoCleanup(target_type, item);
-       }
-
        void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be.DoSyncChannel(chan, proto, opaque);
@@ -121,20 +127,9 @@ public:
                be.DoRehash();
        }
 
-       const char* OnRequest(Request* request)
-       {
-               return be.DoOnRequest(request);
-       }
-
        Version GetVersion()
        {
-               return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
-       }
-
-       ~ModuleBanException()
-       {
-               ServerInstance->Modes->DelMode(&be);
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +e channel mode", VF_VENDOR);
        }
 };