Introduce Server class

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

diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index 8d381d8488043343b3726d47d109851a278b4196..c7431b4c67582d2c95fcab03f0291a6b267e905f 100644 (file)
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -29,7 +29,7 @@ class CommandSVSTOPIC : public Command
 
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
-               if (!ServerInstance->ULine(user->server))
+               if (!user->server->IsULine())
                {
                        // Ulines only
                        return CMD_FAILURE;
@@ -45,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;
                        }
 
@@ -149,13 +149,6 @@ class ModuleTopicLock : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(cmd);
-               ServerInstance->Modules->AddService(topiclock);
-               ServerInstance->Modules->Attach(I_OnPreTopicChange, this);
-       }
-
        ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE
        {
                // Only fired for local users currently, but added a check anyway