Less CoreExport.. Too much of a good thing..

[user/henk/code/inspircd.git] / include / protocol.h

diff --git a/include/protocol.h b/include/protocol.h
index 60fcf4df283e45ce55c384b03b7cd0af7e653f36..a3afe9fb37f37da3066ea1e2481afc352abba425 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -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
 {
@@ -36,10 +35,8 @@ typedef std::list<ProtoServer> ProtoServerList;
 
 class ProtocolInterface : public Extensible
 {
- 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, TargetTypeFlags 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, const parameterlist &modedata, const std::deque<TranslateType> &translate) { }
+       virtual void SendMode(const std::string &target, const parameterlist &modedata, const std::vector<TranslateType> &translate) { }
 
        /** Convenience function, string wrapper around the above.
          */
@@ -76,7 +72,7 @@ class ProtocolInterface : public Extensible
        {
                irc::spacesepstream x(modeline);
                parameterlist n;
-               std::deque<TranslateType> types;
+               std::vector<TranslateType> types;
                std::string v;
                while (x.GetToken(v))
                {
@@ -135,11 +131,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