Merge branch 'master+writeremotenotice'

[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 d29609a35fac7e4cbc2e647054195f20f6072b1d..e1c0932b4b0df918b70c47fa7c02139a4d05e9f7 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -44,7 +44,6 @@ const long MinCompatProtocol = 1202;
 
 /** Forward declarations
  */
-class SpanningTreeCommands;
 class SpanningTreeUtilities;
 class CacheRefreshTimer;
 class TreeServer;
@@ -63,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
         */
@@ -132,10 +131,6 @@ 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);
@@ -166,7 +161,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;