Merge v2.0.23 and v2.0.24 into master.

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

diff --git a/src/modules/m_spanningtree/protocolinterface.h b/src/modules/m_spanningtree/protocolinterface.h
index 80a21c49b34c7a11631386ceb5b6fb55ea0c22c0..e7fed54752d60671b64ff24991305d49dbca78f8 100644 (file)
--- a/src/modules/m_spanningtree/protocolinterface.h
+++ b/src/modules/m_spanningtree/protocolinterface.h
@@ -19,25 +19,25 @@
 
 #pragma once
 
-class SpanningTreeUtilities;
-class ModuleSpanningTree;
-
 class SpanningTreeProtocolInterface : public ProtocolInterface
 {
-       SpanningTreeUtilities* Utils;
-       void SendChannel(Channel* target, char status, const std::string &text);
  public:
-       SpanningTreeProtocolInterface(SpanningTreeUtilities* util) : Utils(util) { }
+       class Server : public ProtocolInterface::Server
+       {
+               TreeSocket* const sock;
+
+        public:
+               Server(TreeSocket* s) : sock(s) { }
+               void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE;
+       };
 
-       bool SendEncapsulatedData(const parameterlist &encap);
-       void SendMetaData(Extensible* target, const std::string &key, const std::string &data);
-       void SendTopic(Channel* channel, std::string &topic);
-       void SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &types);
-       void SendSNONotice(const std::string &snomask, const std::string &text);
-       void PushToClient(User* target, const std::string &rawline);
-       void SendChannelPrivmsg(Channel* target, char status, const std::string &text);
-       void SendChannelNotice(Channel* target, char status, const std::string &text);
-       void SendUserPrivmsg(User* target, const std::string &text);
-       void SendUserNotice(User* target, const std::string &text);
-       void GetServerList(ProtoServerList &sl);
+       bool SendEncapsulatedData(const std::string& targetmask, const std::string& cmd, const parameterlist& params, User* source) CXX11_OVERRIDE;
+       void BroadcastEncap(const std::string& cmd, const parameterlist& params, User* source, User* omit) CXX11_OVERRIDE;
+       void SendMetaData(User* user, const std::string& key, const std::string& data) CXX11_OVERRIDE;
+       void SendMetaData(Channel* chan, const std::string& key, const std::string& data) CXX11_OVERRIDE;
+       void SendMetaData(const std::string& key, const std::string& data) CXX11_OVERRIDE;
+       void SendSNONotice(char snomask, const std::string& text) CXX11_OVERRIDE;
+       void SendMessage(Channel* target, char status, const std::string& text, MessageType msgtype);
+       void SendMessage(User* target, const std::string& text, MessageType msgtype);
+       void GetServerList(ServerList& sl);
 };