Rename OnClientProtocolPopulateTags to OnPopulateTags.

diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index ec033e1664d338b9ed8977003ad5684a2e3ef925..44896a3a38e37b02b72e3cc8fd1321e4fd8570b5 100644 (file)
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -537,7 +537,7 @@ class ClientProtocol::MessageTagProvider : public Events::ModuleEventListener
         * The default implementation does nothing.
         * @param msg Message to be populated with tags.
         */
-       virtual void OnClientProtocolPopulateTags(ClientProtocol::Message& msg)
+       virtual void OnPopulateTags(ClientProtocol::Message& msg)
        {
        }
 

diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h
index 9729e8ed507716a6453c6cf93535737771d23d3f..ce2b70da7ddd8ce400ffa157808a013f09d0c31a 100644 (file)
--- a/include/modules/ircv3.h
+++ b/include/modules/ircv3.h
@@ -75,7 +75,7 @@ class IRCv3::CapTag : public ClientProtocol::MessageTagProvider
                return cap.get(user);
        }
 
-       void OnClientProtocolPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+       void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
        {
                T& tag = static_cast<T&>(*this);
                const std::string* const val = tag.GetValue(msg);

diff --git a/src/clientprotocol.cpp b/src/clientprotocol.cpp
index 212d65d6bef590cebc87b30d70e73948ad94b344..ee3909fbfb1f3c1c389e2699fcc3aa42554a66aa 100644 (file)
--- a/src/clientprotocol.cpp
+++ b/src/clientprotocol.cpp
@@ -63,7 +63,7 @@ const ClientProtocol::SerializedMessage& ClientProtocol::Serializer::SerializeFo
        if (!msg.msginit_done)
        {
                msg.msginit_done = true;
-               FOREACH_MOD_CUSTOM(evprov, MessageTagProvider, OnClientProtocolPopulateTags, (msg));
+               FOREACH_MOD_CUSTOM(evprov, MessageTagProvider, OnPopulateTags, (msg));
        }
        return msg.GetSerialized(Message::SerializedInfo(this, MakeTagWhitelist(user, msg.GetTags())));
 }

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 1007f7ca12cab89b71c36960cae3062fa84ea404..44241e82c5e83151391bb48a33cba37865f50a77 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -43,7 +43,7 @@ class BotTag : public ClientProtocol::MessageTagProvider
        {
        }
 
-       void OnClientProtocolPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+       void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
        {
                User* const user = msg.GetSourceUser();
                if (user && user->IsModeSet(botmode))