m_spanningtree Remove unneeded #includes

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 6e06af74af4958584ee5277b1a0f0e06e3bd6c8f..cd53c9f9733cc45ea17cdc6be70375af3de1e0eb 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -59,14 +59,12 @@ class Alias
 
 class ModuleAlias : public Module
 {
- private:
-
        char fprefix;
 
        /* We cant use a map, there may be multiple aliases with the same name.
         * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
         *              -- w00t
-   */
+     */
        std::multimap<irc::string, Alias> Aliases;
 
        /* whether or not +B users are allowed to use fantasy commands */
@@ -100,17 +98,11 @@ class ModuleAlias : public Module
        }
 
  public:
-
-       ModuleAlias()
+       void init()
        {
                ReadAliases();
-               ServerInstance->Modules->Attach(I_OnPreCommand, this);
-               ServerInstance->Modules->Attach(I_OnRehash, this);
-               ServerInstance->Modules->Attach(I_OnUserMessage, this);
-       }
-
-       virtual ~ModuleAlias()
-       {
+               Implementation eventlist[] = { I_OnPreCommand, I_OnRehash, I_OnUserMessage };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual Version GetVersion()
@@ -271,7 +263,7 @@ class ModuleAlias : public Module
                        }
                }
 
-               if ((a->OperOnly) && (!IS_OPER(user)))
+               if ((a->OperOnly) && (!user->IsOper()))
                        return 0;
 
                if (!a->RequiredNick.empty())