X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fprotocol.h;h=7f987964f5ce6617715d0f9db1d0a54aff037b61;hb=23b0ee51ed995673949540ce8bb79ff3de06cef3;hp=3d8f86cca879635169d060e366b9bf804984c0b8;hpb=2b39234be281afda6d23299886b2b2b8f03df2ea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/protocol.h b/include/protocol.h
index 3d8f86cca..7f987964f 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -16,10 +16,9 @@
 
 #include "hashcomp.h"
 
-class InspIRCd;
 class User;
 
-typedef std::deque<std::string> parameterlist;
+typedef std::vector<std::string> parameterlist;
 
 class ProtoServer
 {
@@ -34,12 +33,10 @@ class ProtoServer
 
 typedef std::list<ProtoServer> ProtoServerList;
 
-class ProtocolInterface : public Extensible
+class ProtocolInterface
 {
- protected:
-	InspIRCd* ServerInstance;
  public:
-	ProtocolInterface(InspIRCd* Instance) : ServerInstance(Instance) { }
+	ProtocolInterface() { }
 	virtual ~ProtocolInterface() { }
 
 	/** Send an ENCAP message to one or more linked servers.
@@ -52,11 +49,10 @@ class ProtocolInterface : public Extensible
 
 	/** Send metadata for an object to other linked servers.
 	 * @param target The object to send metadata for.
-	 * @param type The type of metadata to send (TYPE_USER, TYPE_CHANNEL, etc)
 	 * @param key The 'key' of the data, e.g. "swhois" for swhois desc on a user
 	 * @param data The string representation of the data
 	 */
-	virtual void SendMetaData(void* target, int type, const std::string &key, const std::string &data) { }
+	virtual void SendMetaData(Extensible* target, const std::string &key, const std::string &data) { }
 
 	/** Send a topic change for a channel
 	 * @param channel The channel to change the topic for.
@@ -68,7 +64,7 @@ class ProtocolInterface : public Extensible
 	 * @param target The channel name or user to send mode changes for.
 	 * @param The mode changes to send.
 	 */
-	virtual void SendMode(const std::string &target, parameterlist &modedata) { }
+	virtual void SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate) { }
 
 	/** Convenience function, string wrapper around the above.
 	  */
@@ -76,18 +72,16 @@ class ProtocolInterface : public Extensible
 	{
 		irc::spacesepstream x(modeline);
 		parameterlist n;
+		std::vector<TranslateType> types;
 		std::string v;
 		while (x.GetToken(v))
+		{
 			n.push_back(v);
-		SendMode(target, n);
+			types.push_back(TR_TEXT);
+		}
+		SendMode(target, n, types);
 	}
 
-	/** Send a notice to users with a given mode(s).
-	 * @param modes The modes required for the message to be sent.
-	 * @param text The message to send.
-	 */
-	virtual void SendModeNotice(const std::string &modes, const std::string &text) { }
-
 	/** Send a notice to users with a given snomask.
 	 * @param snomask The snomask required for the message to be sent.
 	 * @param text The message to send.
@@ -131,11 +125,6 @@ class ProtocolInterface : public Extensible
 	 * XXX: document me properly, this is shit.
 	 */
 	virtual void GetServerList(ProtoServerList &sl) { }
-
-	/** Send information about a user connection to linked servers.
-	 * @param u The user to send information about.
-	 */
-	virtual void Introduce(User* u) { }
 };
 
 #endif