Merge branch 'master+listmode'

[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 2d539dcabd0e8679d94eb17ea83debc479082ef6..42ed6e4c1ced14aa3606be15b009a08e77ee77eb 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;
@@ -94,10 +94,6 @@ class FlagExtItem : public ExtensionItem
        {
        }
 
-       ~FlagExtItem()
-       {
-       }
-
        bool get(const Extensible* container) const
        {
                return (get_raw(container) != NULL);