X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_topiclock.cpp;h=6053bc849cca9c6ad1c011dca25c9d5801c62653;hb=bbbd6c9ac46c040b9769c227f0f3ffbfcd43b0e7;hp=3194f6e9b54318a7d21479ea8aed20bede466a81;hpb=a5fe50aca04ca554d313e7361c571c6a497a9c4e;p=user%2Fhenk%2Fcode%2Finspircd.git
diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index 3194f6e9b..6053bc849 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -16,8 +16,6 @@
* along with this program. If not, see .
*/
-/* $ModDesc: Implements server-side topic locks and the server-to-server command SVSTOPIC */
-
#include "inspircd.h"
class CommandSVSTOPIC : public Command
@@ -31,7 +29,7 @@ class CommandSVSTOPIC : public Command
CmdResult Handle(const std::vector ¶meters, User *user)
{
- if (!ServerInstance->ULine(user->server))
+ if (!user->server->IsULine())
{
// Ulines only
return CMD_FAILURE;
@@ -47,7 +45,7 @@ class CommandSVSTOPIC : public Command
time_t topicts = ConvToInt(parameters[1]);
if (!topicts)
{
- ServerInstance->Logs->Log("m_topiclock", LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
+ ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
return CMD_INVALID;
}
@@ -92,11 +90,7 @@ class FlagExtItem : public ExtensionItem
{
public:
FlagExtItem(const std::string& key, Module* owner)
- : ExtensionItem(key, owner)
- {
- }
-
- virtual ~FlagExtItem()
+ : ExtensionItem(key, ExtensionItem::EXT_CHANNEL, owner)
{
}
@@ -151,14 +145,7 @@ class ModuleTopicLock : public Module
{
}
- void init()
- {
- ServerInstance->Modules->AddService(cmd);
- ServerInstance->Modules->AddService(topiclock);
- ServerInstance->Modules->Attach(I_OnPreTopicChange, this);
- }
-
- ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic)
+ ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE
{
// Only fired for local users currently, but added a check anyway
if ((IS_LOCAL(user)) && (topiclock.get(chan)))
@@ -170,7 +157,7 @@ class ModuleTopicLock : public Module
return MOD_RES_PASSTHRU;
}
- Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
return Version("Implements server-side topic locks and the server-to-server command SVSTOPIC", VF_COMMON | VF_VENDOR);
}