Move core message handles to protocol/rfc1459

1 files changed, 25 insertions, 23 deletions

diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index c1d85bcf8..638a4037a 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -18,6 +18,8 @@
  * along with this program; if not, see see <http://www.gnu.org/licenses/>.
  */
 
+/* Dependencies: anope_protocol.rfc1459 */
+
 #include "module.h"
 #include "modules/protocol/hybrid.h"
 
@@ -366,7 +368,7 @@ void hybrid::Join::Run(MessageSource &source, const std::vector<Anope::string> &
 	std::vector<Anope::string> p = params;
 	p.erase(p.begin());
 
-	return Message::Join::Run(source, p);
+	return rfc1459::Join::Run(source, p);
 }
 
 /*                 0       1          */
@@ -423,14 +425,14 @@ void hybrid::SJoin::Run(MessageSource &source, const std::vector<Anope::string>
 	if (!modes.empty())
 		modes.erase(modes.begin());
 
-	std::list<Message::Join::SJoinUser> users;
+	std::list<rfc1459::Join::SJoinUser> users;
 
 	spacesepstream sep(params[params.size() - 1]);
 	Anope::string buf;
 
 	while (sep.GetToken(buf))
 	{
-		Message::Join::SJoinUser sju;
+		rfc1459::Join::SJoinUser sju;
 
 		/* Get prefixes from the nick */
 		for (char ch; (ch = ModeManager::GetStatusChar(buf[0]));)
@@ -450,7 +452,7 @@ void hybrid::SJoin::Run(MessageSource &source, const std::vector<Anope::string>
 	}
 
 	time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : Anope::CurTime;
-	Message::Join::SJoin(source, params[1], ts, modes, users);
+	rfc1459::Join::SJoin(source, params[1], ts, modes, users);
 }
 
 /*
@@ -538,25 +540,25 @@ class ProtoHybrid : public Module
 	HybridProto ircd_proto;
 
 	/* Core message handlers */
-	Message::Away message_away;
-	Message::Capab message_capab;
-	Message::Error message_error;
-	Message::Invite message_invite;
-	Message::Kick message_kick;
-	Message::Kill message_kill;
-	Message::Mode message_mode;
-	Message::MOTD message_motd;
-	Message::Notice message_notice;
-	Message::Part message_part;
-	Message::Ping message_ping;
-	Message::Privmsg message_privmsg;
-	Message::Quit message_quit;
-	Message::SQuit message_squit;
-	Message::Stats message_stats;
-	Message::Time message_time;
-	Message::Topic message_topic;
-	Message::Version message_version;
-	Message::Whois message_whois;
+	rfc1459::Away message_away;
+	rfc1459::Capab message_capab;
+	rfc1459::Error message_error;
+	rfc1459::Invite message_invite;
+	rfc1459::Kick message_kick;
+	rfc1459::Kill message_kill;
+	rfc1459::Mode message_mode;
+	rfc1459::MOTD message_motd;
+	rfc1459::Notice message_notice;
+	rfc1459::Part message_part;
+	rfc1459::Ping message_ping;
+	rfc1459::Privmsg message_privmsg;
+	rfc1459::Quit message_quit;
+	rfc1459::SQuit message_squit;
+	rfc1459::Stats message_stats;
+	rfc1459::Time message_time;
+	rfc1459::Topic message_topic;
+	rfc1459::Version message_version;
+	rfc1459::Whois message_whois;
 
 	/* Our message handlers */
 	hybrid::CertFP message_certfp;