More CoreExport, brought the errors down, but some still persist.

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

diff --git a/include/protocol.h b/include/protocol.h
index fdfb89aab1a125e443d630b1798e49d668a7ac9e..c6db5155ea2022b26d857e1d10b63d5215c35908 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -16,12 +16,11 @@
 
 #include "hashcomp.h"
 
-class InspIRCd;
 class User;
 
-typedef std::vector<std::string> parameterlist;
+CoreExport typedef std::vector<std::string> parameterlist;
 
-class ProtoServer
+class CoreExport ProtoServer
 {
  public:
        std::string servername;
@@ -32,14 +31,12 @@ class ProtoServer
        unsigned int latencyms;
 };
 
-typedef std::list<ProtoServer> ProtoServerList;
+CoreExport typedef std::list<ProtoServer> ProtoServerList;
 
-class ProtocolInterface : public Extensible
+class CoreExport 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.