Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[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 399ad2ae5a90080be4c0fd28b9d3197d435edf42..d7ac3d04a3c74793d4d3885b2983c010e36e4253 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -19,15 +19,11 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "commands.h"
 #include "inspircd.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
 
-extern InspIRCd* ServerInstance;
-
 class Alias : public classbase
 {
  public:
@@ -71,7 +67,7 @@ class ModuleAlias : public Module
                : Module::Module(Me)
        {
                
-               MyConf = new ConfigReader;
+               MyConf = new ConfigReader(ServerInstance);
                ReadAliases();
        }
 
@@ -116,7 +112,7 @@ class ModuleAlias : public Module
                                }
                                if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
                                {
-                                       if (!is_uline(u->server))
+                                       if (!ServerInstance->ULine(u->server))
                                        {
                                                ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!"); 
                                                user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
@@ -149,7 +145,7 @@ class ModuleAlias : public Module
        virtual void OnRehash(const std::string &parameter)
        {
                DELETE(MyConf);
-               MyConf = new ConfigReader;
+               MyConf = new ConfigReader(ServerInstance);
        
                ReadAliases();
        }