Merge v2.0.23 and v2.0.24 into master.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.h

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 13c743f731387cd4ecdabd8851cd981c85120643..46c21b4e954aef8e12f7f1f4f932b982f55046dc 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include "inspircd.h"
+#include "event.h"
 #include "modules/dns.h"
 #include "servercommand.h"
 #include "commands.h"
@@ -43,7 +44,6 @@ const long MinCompatProtocol = 1202;
 
 /** Forward declarations
  */
-class SpanningTreeCommands;
 class SpanningTreeUtilities;
 class CacheRefreshTimer;
 class TreeServer;
@@ -62,7 +62,7 @@ class ModuleSpanningTree : public Module
 
        /** Server to server only commands, not registered in the core
         */
-       SpanningTreeCommands* commands;
+       SpanningTreeCommands commands;
 
        /** Next membership id assigned when a local user joins a channel
         */
@@ -72,6 +72,10 @@ class ModuleSpanningTree : public Module
         */
        SpanningTreeProtocolInterface protocolinterface;
 
+       /** Event provider for our events
+        */
+       Events::ModuleEventProvider eventprov;
+
  public:
        dynamic_reference<DNS::Manager> DNS;
 
@@ -127,14 +131,12 @@ class ModuleSpanningTree : public Module
         */
        ModResult HandleConnect(const std::vector<std::string>& parameters, User* user);
 
-       /** Attempt to send a message to a user
-        */
-       void RemoteMessage(User* user, const char* format, ...) CUSTOM_PRINTF(3, 4);
-
        /** Display a time as a human readable string
         */
        static std::string TimeToStr(time_t secs);
 
+       const Events::ModuleEventProvider& GetEventProvider() const { return eventprov; }
+
        /**
         ** *** MODULE EVENTS ***
         **/
@@ -142,7 +144,8 @@ class ModuleSpanningTree : public Module
        ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE;
        void OnPostCommand(Command*, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line) CXX11_OVERRIDE;
        void OnUserConnect(LocalUser* source) CXX11_OVERRIDE;
-       void OnUserInvite(User* source,User* dest,Channel* channel, time_t) CXX11_OVERRIDE;
+       void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE;
+       ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) CXX11_OVERRIDE;
        void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
        void OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
        void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
@@ -159,7 +162,7 @@ class ModuleSpanningTree : public Module
        void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE;
        void OnAddLine(User *u, XLine *x) CXX11_OVERRIDE;
        void OnDelLine(User *u, XLine *x) CXX11_OVERRIDE;
-       ModResult OnStats(char statschar, User* user, string_list &results) CXX11_OVERRIDE;
+       ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE;
        ModResult OnSetAway(User* user, const std::string &awaymsg) CXX11_OVERRIDE;
        void OnLoadModule(Module* mod) CXX11_OVERRIDE;
        void OnUnloadModule(Module* mod) CXX11_OVERRIDE;