Pedantic clean

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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index b6fe43549b816918b47a581bd71d9c00a919a9e7..2171db86079963ae0734713f5ee4154537e09a73 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,38 +2,26 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-extern InspIRCd* ServerInstance;
-
 class OperChans : public ModeHandler
 {
  public:
        /* This is an oper-only mode */
        OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -62,26 +50,22 @@ class ModuleOperChans : public Module
        OperChans* oc;
  public:
        ModuleOperChans(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                                
                oc = new OperChans(ServerInstance);
-               ServerInstance->AddMode(oc, 'O');
+               if (!ServerInstance->AddMode(oc))
+                       throw ModuleException("Could not add new modes!");
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
+               List[I_OnUserPreJoin] = 1;
        }
-       
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output,"O",4);
-       }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
        {
-               if (!*user->oper)
+               if (!IS_OPER(user))
                {
                        if (chan)
                        {
@@ -95,39 +79,16 @@ class ModuleOperChans : public Module
                return 0;
        }
        
-       virtual ~ModuleOperChans()
+       virtual ~ModuleOperChans()
        {
+               ServerInstance->Modes->DelMode(oc);
                DELETE(oc);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
 };
 
-
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-       ModuleOperChansFactory()
-       {
-       }
-       
-       ~ModuleOperChansFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleOperChans(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)