Deprecate Send{Channel,User}Notice; use SendMessage instead.

diff --git a/include/protocol.h b/include/protocol.h
index f98f6b37d4d40a90e344471f9ae0854eacd0eec0..c95ea17061bcc60478d9e8aeca08b3d2f6b13421 100644 (file)
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -122,7 +122,7 @@ class CoreExport ProtocolInterface
         * @param status The status character (e.g. %) required to receive.
         * @param text The message to send.
         */
-       void SendChannelNotice(Channel* target, char status, const std::string &text)
+       DEPRECATED_METHOD(void SendChannelNotice(Channel* target, char status, const std::string& text))
        {
                SendMessage(target, status, text, MSG_NOTICE);
        }
@@ -131,7 +131,7 @@ class CoreExport ProtocolInterface
         * @param target The user to message.
         * @param text The message to send.
         */
-       void SendUserNotice(User* target, const std::string &text)
+       DEPRECATED_METHOD(void SendUserNotice(User* target, const std::string& text))
        {
                SendMessage(target, text, MSG_NOTICE);
        }

diff --git a/src/users.cpp b/src/users.cpp
index bca1c6a7cdfeadafb7214a3c655c6f5a1422a42d..6c58f0617d500c52624336a4e427a2aa2cd7c6fe 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -853,7 +853,7 @@ void User::WriteNumeric(const Numeric::Numeric& numeric)
 
 void User::WriteRemoteNotice(const std::string& text)
 {
-       ServerInstance->PI->SendUserNotice(this, text);
+       ServerInstance->PI->SendMessage(this, text, MSG_NOTICE);
 }
 
 void LocalUser::WriteRemoteNotice(const std::string& text)