Added cmd_topic() function to IRCDProtoNew class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1209 5417fbe8-f217-4b02-8779-1006273d7864

11 files changed, 19 insertions, 48 deletions

diff --git a/src/ircd.c b/src/ircd.c
index d11273d9b..f020f81b1 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -46,7 +46,6 @@ void initIrcdProto()
 {
     ircdproto.ircd_set_mod_current_buffer = NULL;
     ircdproto.ircd_set_umode = NULL;
-    ircdproto.ircd_cmd_topic = NULL;
     ircdproto.ircd_cmd_vhost_off = NULL;
     ircdproto.ircd_cmd_akill = NULL;
     ircdproto.ircd_cmd_svskill = NULL;
@@ -143,10 +142,9 @@ void anope_cmd_remove_akill(const char *user, const char *host)
 	ircdprotonew->cmd_remove_akill(user, host);
 }
 
-void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                     const char *topic, time_t when)
+void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    ircdproto.ircd_cmd_topic(whosets, chan, whosetit, topic, when);
+	ircdprotonew->cmd_topic(whosets, chan, whosetit, topic, when);
 }
 
 void anope_cmd_vhost_off(User * u)
@@ -690,13 +688,6 @@ void pmodule_set_mod_current_buffer(void (*func) (int ac, char **av))
     ircdproto.ircd_set_mod_current_buffer = func;
 }
 
-void pmodule_cmd_topic(void (*func)
-                        (const char *whosets, const char *chan, const char *whosetit,
-                         const char *topic, time_t when))
-{
-    ircdproto.ircd_cmd_topic = func;
-}
-
 void pmodule_cmd_vhost_off(void (*func) (User * u))
 {
     ircdproto.ircd_cmd_vhost_off = func;
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 5a38312d5..59d48647a 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -768,11 +768,9 @@ void bahamut_cmd_part(const char *nick, const char *chan, const char *buf)
 }
 
 /* TOPIC */
-void bahamut_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                       const char *topic, time_t when)
+void BahamutIRCdProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit,
-             (unsigned long int) when, topic);
+	send_cmd(whosets, "TOPIC %s %s %lu :%s", chan, whosetit, static_cast<unsigned long>(when), topic);
 }
 
 /* UNSQLINE */
@@ -1554,7 +1552,6 @@ void bahamut_cmd_chghost(const char *nick, const char *vhost)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_topic(bahamut_cmd_topic);
     pmodule_cmd_vhost_off(bahamut_cmd_vhost_off);
     pmodule_cmd_akill(bahamut_cmd_akill);
     pmodule_cmd_svskill(bahamut_cmd_svskill);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index e8a914c1c..bb41b9bc5 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -59,7 +59,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void bahamut_set_umode(User * user, int ac, const char **av);
-void bahamut_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void bahamut_cmd_vhost_off(User * u);
 void bahamut_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void bahamut_cmd_svskill(const char *source, const char *user, const char *buf);
@@ -129,4 +128,5 @@ class BahamutIRCdProto : public IRCDProtoNew {
 	public:
 		void cmd_svsnoop(const char *, int);
 		void cmd_remove_akill(const char *, const char *);
+		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 9de7d6036..9442122b3 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -833,14 +833,10 @@ void CharybdisProto::cmd_remove_akill(const char *user, const char *host)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host);
 }
 
-void charybdis_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                      const char *topic, time_t when)
+void CharybdisProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    Uid *ud;
-
-    ud = find_uid(whosets);
-    send_cmd((UseTS6 ? (ud ? ud->uid : whosets) : whosets), "TOPIC %s :%s",
-             chan, topic);
+	Uid *ud = find_uid(whosets);
+	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
 }
 
 void charybdis_cmd_vhost_off(User * u)
@@ -1832,7 +1828,6 @@ int charybdis_send_deaccount(int argc, char **argv)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_topic(charybdis_cmd_topic);
     pmodule_cmd_vhost_off(charybdis_cmd_vhost_off);
     pmodule_cmd_akill(charybdis_cmd_akill);
     pmodule_cmd_svskill(charybdis_cmd_svskill);
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index 8f4303902..1489085ca 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -47,7 +47,6 @@
 
 
 void charybdis_set_umode(User * user, int ac, const char **av);
-void charybdis_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void charybdis_cmd_vhost_off(User * u);
 void charybdis_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void charybdis_cmd_svskill(const char *source, const char *user, const char *buf);
@@ -116,4 +115,5 @@ void charybdis_cmd_ctcp(const char *source, const char *dest, const char *buf);
 class CharybdisProto : public IRCDProtoNew {
 	public:
 		void cmd_remove_akill(const char *, const char *);
+		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 88409b69f..ad646a520 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -533,12 +533,9 @@ void InspIRCdProto::cmd_remove_akill(const char *user, const char *host)
 	send_cmd(s_OperServ, "GLINE %s@%s", user, host);
 }
 
-void
-inspircd_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                   const char *topic, time_t when)
+void InspIRCdProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    send_cmd(whosets, "FTOPIC %s %lu %s :%s", chan,
-             (unsigned long int) when, whosetit, topic);
+	send_cmd(whosets, "FTOPIC %s %lu %s :%s", chan, static_cast<unsigned long>(when), whosetit, topic);
 }
 
 void inspircd_cmd_vhost_off(User * u)
@@ -1789,7 +1786,6 @@ void inspircd_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_topic(inspircd_cmd_topic);
     pmodule_cmd_vhost_off(inspircd_cmd_vhost_off);
     pmodule_cmd_akill(inspircd_cmd_akill);
     pmodule_cmd_svskill(inspircd_cmd_svskill);
diff --git a/src/protocol/inspircd11.h b/src/protocol/inspircd11.h
index ed6d6f8f6..981bb9e79 100755
--- a/src/protocol/inspircd11.h
+++ b/src/protocol/inspircd11.h
@@ -52,7 +52,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void inspircd_set_umode(User * user, int ac, const char **av);
-void inspircd_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void inspircd_cmd_vhost_off(User * u);
 void inspircd_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void inspircd_cmd_svskill(const char *source, const char *user, const char *buf);
@@ -132,4 +131,5 @@ int anope_event_rsquit(const char *source, int ac, const char **av);
 class InspIRCdProto : public IRCDProtoNew {
 	public:
 		void cmd_remove_akill(const char *, const char *);
+		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 27e7ff3e1..9bb5df39c 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -781,14 +781,10 @@ void RatboxProto::cmd_remove_akill(const char *user, const char *host)
 	send_cmd(UseTS6 ? (ud ? ud->uid : s_OperServ) : s_OperServ, "UNKLINE * %s %s", user, host);
 }
 
-void ratbox_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                      const char *topic, time_t when)
+void RatboxProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    Uid *ud;
-
-    ud = find_uid(whosets);
-    send_cmd((UseTS6 ? (ud ? ud->uid : whosets) : whosets), "TOPIC %s :%s",
-             chan, topic);
+	Uid *ud = find_uid(whosets);
+	send_cmd(UseTS6 ? (ud ? ud->uid : whosets) : whosets, "TOPIC %s :%s", chan, topic);
 }
 
 void ratbox_cmd_vhost_off(User * u)
@@ -1728,7 +1724,6 @@ void ratbox_cmd_ctcp(const char *source, const char *dest, const char *buf)
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_topic(ratbox_cmd_topic);
     pmodule_cmd_vhost_off(ratbox_cmd_vhost_off);
     pmodule_cmd_akill(ratbox_cmd_akill);
     pmodule_cmd_svskill(ratbox_cmd_svskill);
diff --git a/src/protocol/ratbox.h b/src/protocol/ratbox.h
index b4ac1f1cc..9a3e647c0 100644
--- a/src/protocol/ratbox.h
+++ b/src/protocol/ratbox.h
@@ -46,7 +46,6 @@
 
 
 void ratbox_set_umode(User * user, int ac, const char **av);
-void ratbox_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void ratbox_cmd_vhost_off(User * u);
 void ratbox_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void ratbox_cmd_svskill(const char *source, const char *user, const char *buf);
@@ -115,4 +114,5 @@ void ratbox_cmd_ctcp(const char *source, const char *dest, const char *buf);
 class RatboxProto : public IRCDProtoNew {
 	public:
 		void cmd_remove_akill(const char *, const char *);
+		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 } ircd_proto;
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 4d7c94997..fb1ffab4c 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -517,11 +517,9 @@ void UnrealIRCdProto::cmd_remove_akill(const char *user, const char *host)
 	send_cmd(NULL, "%s - G %s %s %s", send_token("TKL", "BD"), user, host, s_OperServ);
 }
 
-void unreal_cmd_topic(const char *whosets, const char *chan, const char *whosetit,
-                      const char *topic, time_t when)
+void UnrealIRCdProto::cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
 {
-    send_cmd(whosets, "%s %s %s %lu :%s", send_token("TOPIC", ")"), chan,
-             whosetit, (unsigned long int) when, topic);
+	send_cmd(whosets, "%s %s %s %lu :%s", send_token("TOPIC", ")"), chan, whosetit, static_cast<unsigned long>(when), topic);
 }
 
 void unreal_cmd_vhost_off(User * u)
@@ -2106,7 +2104,6 @@ void moduleAddIRCDMsgs(void) {
  **/
 void moduleAddAnopeCmds()
 {
-    pmodule_cmd_topic(unreal_cmd_topic);
     pmodule_cmd_vhost_off(unreal_cmd_vhost_off);
     pmodule_cmd_akill(unreal_cmd_akill);
     pmodule_cmd_svskill(unreal_cmd_svskill);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 7edaeb749..a8be0e1c5 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -81,7 +81,6 @@
 #define DEFAULT_MLOCK CMODE_n | CMODE_t | CMODE_r
 
 void unreal_set_umode(User * user, int ac, const char **av);
-void unreal_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when);
 void unreal_cmd_vhost_off(User * u);
 void unreal_cmd_akill(const char *user, const char *host, const char *who, time_t when,time_t expires, const char *reason);
 void unreal_cmd_svskill(const char *source, const char *user, const char *buf);
@@ -151,4 +150,5 @@ class UnrealIRCdProto : public IRCDProtoNew {
 	public:
 		void cmd_svsnoop(const char *, int);
 		void cmd_remove_akill(const char *, const char *);
+		void cmd_topic(const char *, const char *, const char *, const char *, time_t);
 } ircd_proto;