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

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

diff --git a/include/users.h b/include/users.h
index 7e05c9f2a35adae3fc46b8224ff4b4053db5e81f..a898d58130d18b7f58c752473d51e319c09afc8c 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -196,19 +196,19 @@ struct CoreExport ConnectClass : public refcountbase
 
 /** Holds a complete list of all channels to which a user has been invited and has not yet joined, and the time at which they'll expire.
  */
-typedef std::vector< std::pair<irc::string, time_t> > InvitedList;
+CoreExport typedef std::vector< std::pair<irc::string, time_t> > InvitedList;
 
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */
-typedef std::vector<reference<ConnectClass> > ClassVector;
+CoreExport typedef std::vector<reference<ConnectClass> > ClassVector;
 
 /** Typedef for the list of user-channel records for a user
  */
-typedef std::set<Channel*> UserChanList;
+CoreExport typedef std::set<Channel*> UserChanList;
 
 /** Shorthand for an iterator into a UserChanList
  */
-typedef UserChanList::iterator UCListIter;
+CoreExport typedef UserChanList::iterator UCListIter;
 
 /* Required forward declaration
  */
@@ -264,9 +264,6 @@ class CoreExport User : public StreamSocket
        std::bitset<64> AllowedChanModes;
 
  public:
-       static LocalIntExt NICKForced;
-       static LocalStringExt OperQuit;
-
        /** Contains a pointer to the connect class a user is on from - this will be NULL for remote connections.
         */
        reference<ConnectClass> MyClass;
@@ -444,10 +441,6 @@ class CoreExport User : public StreamSocket
         * @return The port number of this user.
         */
        int GetServerPort();
-       /**
-        * @return The server IP address
-        */
-       std::string GetServerIP();
 
        /** Get client IP string from sockaddr, using static internal buffer
         * @return The IP string
@@ -719,7 +712,7 @@ class CoreExport User : public StreamSocket
        /** Write to all users that can see this user (including this user in the list), appending CR/LF
         * @param text A std::string to send to the users
         */
-       void WriteCommon(const std::string &text);
+       void WriteCommonRaw(const std::string &line, bool include_self = true);
 
        /** Write to all users that can see this user (including this user in the list), appending CR/LF
         * @param text The format string for text to send to the users
@@ -733,11 +726,6 @@ class CoreExport User : public StreamSocket
         */
        void WriteCommonExcept(const char* text, ...) CUSTOM_PRINTF(2, 3);
 
-       /** Write to all users that can see this user (not including this user in the list), appending CR/LF
-        * @param text A std::string to send to the users
-        */
-       void WriteCommonExcept(const std::string &text);
-
        /** Write a quit message to all common users, as in User::WriteCommonExcept but with a specific
         * quit message for opers only.
         * @param normal_text Normal user quit message