Switch all core modules still using COMMAND_INIT to MODULE_INIT.

diff --git a/include/inspircd.h b/include/inspircd.h
index 90ee6ca8d93b45d372b13345b98d32d5859246f4..934f2f82bca4510760dbaf5c4859f024a6f67f8b 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -574,21 +574,6 @@ class CoreExport InspIRCd
 
 ENTRYPOINT;
 
-template<class Cmd>
-class CommandModule : public Module
-{
-       Cmd cmd;
- public:
-       CommandModule() : cmd(this)
-       {
-       }
-
-       Version GetVersion() CXX11_OVERRIDE
-       {
-               return Version(cmd.name, VF_VENDOR|VF_CORE);
-       }
-};
-
 inline void stdalgo::culldeleter::operator()(classbase* item)
 {
        if (item)

diff --git a/include/modules.h b/include/modules.h
index db0bc341e12871042a35e0b63a1dde7e0c5a9e4e..43ab2ae3ad211d6c698bb64df3447092bfd8df88 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -1186,5 +1186,3 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
                return new y; \
        } \
        extern "C" DllExport const char inspircd_src_version[] = INSPIRCD_VERSION;
-
-#define COMMAND_INIT(c) MODULE_INIT(CommandModule<c>)

diff --git a/src/coremods/core_ison.cpp b/src/coremods/core_ison.cpp
index 0c98dfe5621aa23bdf93781ed105543db126d2a3..3f6b1ac74c2af68bcbfd866083f5ce34378f983e 100644 (file)
--- a/src/coremods/core_ison.cpp
+++ b/src/coremods/core_ison.cpp
@@ -77,5 +77,21 @@ CmdResult CommandIson::HandleLocal(LocalUser* user, const Params& parameters)
        return CMD_SUCCESS;
 }
 
+class CoreModIson : public Module
+{
+ private:
+       CommandIson cmd;
+
+ public:
+       CoreModIson()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the ISON command", VF_CORE | VF_VENDOR);
+       }
+};
 
-COMMAND_INIT(CommandIson)
+MODULE_INIT(CoreModIson)

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 383d574bfe3c077798d22c24116532cf36378e91..ea5d40abdc72d8c6841c06f90db9af98cd71b597 100644 (file)
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -765,4 +765,21 @@ CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
        }
 }
 
-COMMAND_INIT(CommandReloadmodule)
+class CoreModReloadmodule : public Module
+{
+ private:
+       CommandReloadmodule cmd;
+
+ public:
+       CoreModReloadmodule()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the RELOADMODULE command", VF_CORE | VF_VENDOR);
+       }
+};
+
+MODULE_INIT(CoreModReloadmodule)

diff --git a/src/coremods/core_stats.cpp b/src/coremods/core_stats.cpp
index bb20dd7612ab470cd9bd3b29dd1807222b8ddfff..06602b28864f918e4398a8b35c29d49ff3561a42 100644 (file)
--- a/src/coremods/core_stats.cpp
+++ b/src/coremods/core_stats.cpp
@@ -397,4 +397,21 @@ CmdResult CommandStats::Handle(User* user, const Params& parameters)
        return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandStats)
+class CoreModStats : public Module
+{
+ private:
+       CommandStats cmd;
+
+ public:
+       CoreModStats()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the STATS command", VF_CORE | VF_VENDOR);
+       }
+};
+
+MODULE_INIT(CoreModStats)

diff --git a/src/coremods/core_userhost.cpp b/src/coremods/core_userhost.cpp
index 294f714b4e0f8f9d468c8e16c546ca331e3e108c..542c1831dce9b959e27199f80584419bbe292bfe 100644 (file)
--- a/src/coremods/core_userhost.cpp
+++ b/src/coremods/core_userhost.cpp
@@ -82,4 +82,21 @@ CmdResult CommandUserhost::Handle(User* user, const Params& parameters)
        return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandUserhost)
+class CoreModUserhost : public Module
+{
+ private:
+       CommandUserhost cmd;
+
+ public:
+       CoreModUserhost()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the USERHOST command", VF_CORE | VF_VENDOR);
+       }
+};
+
+MODULE_INIT(CoreModUserhost)

diff --git a/src/coremods/core_wallops.cpp b/src/coremods/core_wallops.cpp
index 26a00a47daa49de8b6bf9357d11a07a74bf0ae91..6b055f874a6df046e9c966963b26a80075600587 100644 (file)
--- a/src/coremods/core_wallops.cpp
+++ b/src/coremods/core_wallops.cpp
@@ -69,4 +69,21 @@ CmdResult CommandWallops::Handle(User* user, const Params& parameters)
        return CMD_SUCCESS;
 }
 
-COMMAND_INIT(CommandWallops)
+class CoreModWallops : public Module
+{
+ private:
+       CommandWallops cmd;
+
+ public:
+       CoreModWallops()
+               : cmd(this)
+       {
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Provides the WALLOPS command", VF_CORE | VF_VENDOR);
+       }
+};
+
+MODULE_INIT(CoreModWallops)