InspSocket -> BufferedSocket. Paves the way for a SimpleSocket class which ident...

[user/henk/code/inspircd.git] / src / cmd_kick.cpp

diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp
index 27552f66c8a03f7031603a6061b23dfd1360fc2a..c4eeaf6096b027fab1b8bd2bbe3a74a967f6a8b7 100644 (file)
--- a/src/cmd_kick.cpp
+++ b/src/cmd_kick.cpp
@@ -11,22 +11,21 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
 #include "inspircd.h"
 #include "commands/cmd_kick.h"
 
-extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
 {
        return new cmd_kick(Instance);
 }
 
 /** Handle /KICK
  */
-CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_kick::Handle (const char** parameters, int pcnt, User *user)
 {
        char reason[MAXKICK];
-       chanrec* c = ServerInstance->FindChan(parameters[0]);
-       userrec* u = ServerInstance->FindNick(parameters[1]);
+       Channel* c = ServerInstance->FindChan(parameters[0]);
+       User* u = ServerInstance->FindNick(parameters[1]);
 
        if (!u || !c)
        {
@@ -50,7 +49,7 @@ CmdResult cmd_kick::Handle (const char** parameters, int pcnt, userrec *user)
        }
 
        if (!c->KickUser(user, u, reason))
-               /* Nobody left here, delete the chanrec */
+               /* Nobody left here, delete the Channel */
                delete c;
 
        return CMD_SUCCESS;