This one too, grr

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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 55608dcb8ccddfa9891e131350443cca52c4fae3..fbc72aeea35f3fab362e6cddc0acc8470dbe21f8 100644 (file)
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -12,15 +12,12 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
 static FileReader* opermotd;
 
-CmdResult ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(User* user)
 {
        if(!opermotd->FileSize())
        {
@@ -43,16 +40,16 @@ CmdResult ShowOperMOTD(userrec* user)
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public command_t
+class CommandOpermotd : public Command
 {
  public:
-       cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
+       CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
        {
                this->source = "m_opermotd.so";
                syntax = "[<servername>]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle (const char** parameters, int pcnt, User* user)
        {
                return ShowOperMOTD(user);
        }
@@ -61,7 +58,7 @@ class cmd_opermotd : public command_t
 
 class ModuleOpermotd : public Module
 {
-       cmd_opermotd* mycommand;
+       CommandOpermotd* mycommand;
  public:
 
        void LoadOperMOTD()
@@ -82,7 +79,7 @@ class ModuleOpermotd : public Module
                : Module(Me)
        {
                opermotd = NULL;
-               mycommand = new cmd_opermotd(ServerInstance);
+               mycommand = new CommandOpermotd(ServerInstance);
                ServerInstance->AddCommand(mycommand);
                opermotd = new FileReader(ServerInstance);
                LoadOperMOTD();
@@ -102,12 +99,12 @@ class ModuleOpermotd : public Module
                List[I_OnRehash] = List[I_OnOper] = 1;
        }
 
-       virtual void OnOper(userrec* user, const std::string &opertype)
+       virtual void OnOper(User* user, const std::string &opertype)
        {
                ShowOperMOTD(user);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                LoadOperMOTD();
        }