A few more I missed.

[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 a901ab16515a72b091024ccc554e6914e54908b1..94c64b4055868754377e406f6f7ba9d19f9aa173 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 #include "wildcard.h"
-#include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
@@ -75,7 +74,7 @@ class ModuleAlias : public Module
  public:
        
        ModuleAlias(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                ReadAliases();
                pars.resize(127);
@@ -102,7 +101,7 @@ class ModuleAlias : public Module
                int index = *(varname.begin()) - 48;
                varname.erase(varname.begin());
                bool everything_after = (varname == "-");
-               std::string word = "";
+               std::string word;
 
                for (int j = 0; j < index; j++)
                        word = ss.GetToken();
@@ -171,7 +170,7 @@ class ModuleAlias : public Module
                                if ((Aliases[i].operonly) && (!IS_OPER(user)))
                                        return 0;
 
-                               if (Aliases[i].requires != "")
+                               if (!Aliases[i].requires.empty())
                                {
                                        u = ServerInstance->FindNick(Aliases[i].requires);
                                        if (!u)
@@ -180,7 +179,7 @@ class ModuleAlias : public Module
                                                return 1;
                                        }
                                }
-                               if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+                               if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
                                {
                                        if (!ServerInstance->ULine(u->server))
                                        {
@@ -270,27 +269,4 @@ class ModuleAlias : public Module
        }
 };
 
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
-       ModuleAliasFactory()
-       {
-       }
-
-       ~ModuleAliasFactory()
-       {
-       }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAlias(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)