Include untranslated user/channel metadata in CHECK output

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 9e12b4e185949382df1d24dcfdc067104449d7de..835f73443f7ed02dc20dbe833869f18f642de65d 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -40,12 +40,6 @@ class KickRejoin : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
-       {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (!adding)
@@ -112,16 +106,14 @@ class KickRejoin : public ModeHandler
 class ModuleKickNoRejoin : public Module
 {
 
-       KickRejoin* kr;
+       KickRejoin kr;
 
 public:
 
        ModuleKickNoRejoin(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), kr(Me)
        {
-
-               kr = new KickRejoin(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(kr))
+               if (!ServerInstance->Modes->AddMode(&kr))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnCleanup, I_OnChannelDelete, I_OnUserPreJoin, I_OnUserKick };
                ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -201,8 +193,7 @@ public:
 
        virtual ~ModuleKickNoRejoin()
        {
-               ServerInstance->Modes->DelMode(kr);
-               delete kr;
+               ServerInstance->Modes->DelMode(&kr);
        }
 
        virtual Version GetVersion()