Remove useless vector copy

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

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 089aacdf5d8018d8841bc6f46b60ce1deedb26b6..276fef038cab386c6695a06b738eb8ce689d5e11 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -48,7 +48,7 @@ public:
 
        void DisplayExpiry()
        {
-               ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, this->duration);
+               ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time));
        }
 
        const char* Displayable()
@@ -142,19 +142,17 @@ class CommandSvshold : public Command
 
 class ModuleSVSHold : public Module
 {
-       CommandSvshold *mycommand;
-       SVSHoldFactory *s;
+       CommandSvshold cmd;
+       SVSHoldFactory s;
 
 
  public:
-       ModuleSVSHold(InspIRCd* Me) : Module(Me)
+       ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me), s(Me)
        {
-               s = new SVSHoldFactory(ServerInstance);
-               ServerInstance->XLines->RegisterFactory(s);
-               mycommand = new CommandSvshold(Me);
-               ServerInstance->AddCommand(mycommand);
-               Implementation eventlist[] = { I_OnUserPreNick, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->XLines->RegisterFactory(&s);
+               ServerInstance->AddCommand(&cmd);
+               Implementation eventlist[] = { I_OnUserPreNick, I_OnStats };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
 
@@ -183,12 +181,12 @@ class ModuleSVSHold : public Module
        virtual ~ModuleSVSHold()
        {
                ServerInstance->XLines->DelAll("SVSHOLD");
-               ServerInstance->XLines->UnregisterFactory(s);
+               ServerInstance->XLines->UnregisterFactory(&s);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };