Dunno why this method was static, doesnt need to be...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 0acc3683c04efcca08eda73330c03607a4c15749..b36b28a132f75153fde1470fd838eb6407ee3e69 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -11,6 +11,7 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
@@ -21,7 +22,6 @@
 #include "socketengine.h"
 #include "command_parse.h"
 #include "dns.h"
-#include "inspircd.h"
 
 // version is a simple class for holding a modules version number
 Version::Version(int major, int minor, int revision, int build, int flags, int api_ver)
@@ -376,7 +376,7 @@ bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spatter
        return match(sliteral.c_str(),spattern.c_str());
 }
 
-bool InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
+CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, userrec* user)
 {
        return this->Parser->CallHandler(commandname,parameters,pcnt,user);
 }
@@ -448,18 +448,6 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached)
        }
 }
 
-bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
-{
-       throw CoreException("The InspIRCd::UsertoPseudo function should not be used in InspIRCd later than 1.0.x");
-       return false;
-}
-
-bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
-{
-       throw CoreException("The InspIRCd::PseudotoUser function should not be used in InspIRCd later than 1.0.x");
-       return false;
-}
-
 void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)
 {
        XLines->add_gline(duration, source.c_str(), reason.c_str(), hostmask.c_str());