Merge insp20

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

diff --git a/include/users.h b/include/users.h
index 8d53197ba048fb000be29ba883ca77254693e990..ae76d2eb3a3ffa18948bf460fd1e0175bd40596e 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -455,11 +455,10 @@ class CoreExport User : public Extensible
        /** Returns true or false if a user can set a privileged user or channel mode.
         * This is done by looking up their oper type from User::oper, then referencing
         * this to their oper classes, and checking the modes they can set.
-        * @param mode The mode the check
-        * @param type ModeType (MODETYPE_CHANNEL or MODETYPE_USER).
+        * @param mh Mode to check
         * @return True if the user can set or unset this mode.
         */
-       virtual bool HasModePermission(unsigned char mode, ModeType type);
+       virtual bool HasModePermission(const ModeHandler* mh) const;
 
        /** Creates a usermask with real host.
         * Takes a buffer to use and fills the given buffer with the hostmask in the format user\@host
@@ -524,7 +523,7 @@ class CoreExport User : public Extensible
         */
        virtual void WriteRemoteNotice(const std::string& text);
 
-       void WriteRemoteNumeric(const Numeric::Numeric& numeric);
+       virtual void WriteRemoteNumeric(const Numeric::Numeric& numeric);
 
        template <typename T1>
        void WriteRemoteNumeric(unsigned int numeric, T1 p1)
@@ -663,20 +662,6 @@ class CoreExport User : public Extensible
         */
        void ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self = true);
 
-       /** Dump text to a user target, splitting it appropriately to fit
-        * @param linePrefix text to prefix each complete line with
-        * @param textStream the text to send to the user
-        */
-       void SendText(const std::string& linePrefix, std::stringstream& textStream);
-
-       /** Write to the user, routing the line if the user is remote.
-        */
-       virtual void SendText(const std::string& line) = 0;
-
-       /** Write to the user, routing the line if the user is remote.
-        */
-       void SendText(const char* text, ...) CUSTOM_PRINTF(2, 3);
-
        /** Return true if the user shares at least one channel with another user
         * @param other The other user to compare the channel list against
         * @return True if the given user shares at least one channel with this user
@@ -848,7 +833,6 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 
        void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true);
 
-       void SendText(const std::string& line);
        void Write(const std::string& text);
        void Write(const char*, ...) CUSTOM_PRINTF(2, 3);
 
@@ -879,20 +863,18 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
        /** Returns true or false if a user can set a privileged user or channel mode.
         * This is done by looking up their oper type from User::oper, then referencing
         * this to their oper classes, and checking the modes they can set.
-        * @param mode The mode the check
-        * @param type ModeType (MODETYPE_CHANNEL or MODETYPE_USER).
+        * @param mh Mode to check
         * @return True if the user can set or unset this mode.
         */
-       bool HasModePermission(unsigned char mode, ModeType type);
+       bool HasModePermission(const ModeHandler* mh) const;
 };
 
-class CoreExport RemoteUser : public User
+class RemoteUser : public User
 {
  public:
        RemoteUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_REMOTE)
        {
        }
-       virtual void SendText(const std::string& line);
 };
 
 class CoreExport FakeUser : public User
@@ -910,7 +892,6 @@ class CoreExport FakeUser : public User
        }
 
        virtual CullResult cull();
-       virtual void SendText(const std::string& line);
        virtual const std::string& GetFullHost();
        virtual const std::string& GetFullRealHost();
 };