MetaData rework

[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 08ba21108281b55e511a4f13c50748da54f28ac4..276fef038cab386c6695a06b738eb8ce689d5e11 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -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,7 +181,7 @@ class ModuleSVSHold : public Module
        virtual ~ModuleSVSHold()
        {
                ServerInstance->XLines->DelAll("SVSHOLD");
-               ServerInstance->XLines->UnregisterFactory(s);
+               ServerInstance->XLines->UnregisterFactory(&s);
        }
 
        virtual Version GetVersion()