Replaced anope_SendSVSMode_chan() with direct call to SendSVSModeChan() in IRCDProto class.

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

7 files changed, 18 insertions, 23 deletions

diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index a89b091cd..0c5ef4bc3 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -177,12 +177,12 @@ int do_clear(User * u)
 
         if (ircd->svsmode_ucmode) {
             av[0] = chan;
-            anope_SendSVSMode_chan(av[0], "-o", NULL);
+            ircdproto->SendSVSModeChan(av[0], "-o", NULL);
             if (ircd->owner) {
-                anope_SendSVSMode_chan(av[0], ircd->ownerunset, NULL);
+                ircdproto->SendSVSModeChan(av[0], ircd->ownerunset, NULL);
             }
             if (ircd->protect || ircd->admin) {
-                anope_SendSVSMode_chan(av[0], ircd->adminunset, NULL);
+                ircdproto->SendSVSModeChan(av[0], ircd->adminunset, NULL);
             }
             for (cu = c->users; cu; cu = next) {
                 next = cu->next;
@@ -284,9 +284,9 @@ int do_clear(User * u)
 
             if (ircd->svsmode_ucmode) {
                 if (ircdcap->tsmode)
-                    anope_SendSVSMode_chan(av[0], av[2], NULL);
+                    ircdproto->SendSVSModeChan(av[0], av[2], NULL);
                 else
-                    anope_SendSVSMode_chan(av[0], av[1], NULL);
+                    ircdproto->SendSVSModeChan(av[0], av[1], NULL);
 
                 do_cmode(s_ChanServ, ac, av);
                 break;
@@ -328,9 +328,9 @@ int do_clear(User * u)
 
             if (ircd->svsmode_ucmode) {
                 if (ircdcap->tsmode)
-                    anope_SendSVSMode_chan(av[0], av[2], NULL);
+                    ircdproto->SendSVSModeChan(av[0], av[2], NULL);
                 else
-                    anope_SendSVSMode_chan(av[0], av[1], NULL);
+                    ircdproto->SendSVSModeChan(av[0], av[1], NULL);
 
                 do_cmode(s_ChanServ, ac, av);
                 break;
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index 214404e3d..d93d52838 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -105,7 +105,7 @@ int do_clearmodes(User * u)
         if (all) {
             /* Clear mode +o */
             if (ircd->svsmode_ucmode) {
-                anope_SendSVSMode_chan(c->name, "-o", NULL);
+                ircdproto->SendSVSModeChan(c->name, "-o", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_OP)) {
@@ -129,7 +129,7 @@ int do_clearmodes(User * u)
             }
 
             if (ircd->svsmode_ucmode) {
-                anope_SendSVSMode_chan(c->name, "-v", NULL);
+                ircdproto->SendSVSModeChan(c->name, "-v", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_VOICE)) {
@@ -155,7 +155,7 @@ int do_clearmodes(User * u)
 
             /* Clear mode +h */
             if (ircd->svsmode_ucmode && ircd->halfop) {
-                anope_SendSVSMode_chan(c->name, "-h", NULL);
+                ircdproto->SendSVSModeChan(c->name, "-h", NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
@@ -179,7 +179,7 @@ int do_clearmodes(User * u)
             }
             /* Clear mode Owners */
             if (ircd->svsmode_ucmode && ircd->owner) {
-                anope_SendSVSMode_chan(c->name, ircd->ownerunset, NULL);
+                ircdproto->SendSVSModeChan(c->name, ircd->ownerunset, NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
@@ -204,7 +204,7 @@ int do_clearmodes(User * u)
             /* Clear mode protected or admins */
             if (ircd->svsmode_ucmode && (ircd->protect || ircd->admin)) {
 
-                anope_SendSVSMode_chan(c->name, ircd->adminunset, NULL);
+                ircdproto->SendSVSModeChan(c->name, ircd->adminunset, NULL);
                 for (cu = c->users; cu; cu = next) {
                     next = cu->next;
                     if (!chan_has_user_status(c, cu->user, CUS_HALFOP)) {
diff --git a/src/ircd.c b/src/ircd.c
index 4d55edb6b..b34747da9 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -43,11 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
 	ircdproto->ProcessUsermodes(user, ac, av);
 }
 
-void anope_SendSVSMode_chan(const char *name, const char *mode, const char *nick)
-{
-	ircdproto->SendSVSMode_chan(name, mode, nick);
-}
-
 void anope_SendSVID(const char *nick, time_t ts)
 {
 	ircdproto->SendSVID(nick, ts);
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index 27eb415bf..0c8b0ebef 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -474,13 +474,13 @@ void BahamutIRCdProto::SendSVSHoldDel(const char *nick)
 /* SVSMODE -b */
 void BahamutIRCdProto::SendBanDel(const char *name, const char *nick)
 {
-	SendSVSMode_chan(name, "-b", nick);
+	SendSVSModeChan(name, "-b", nick);
 }
 
 
 /* SVSMODE channel modes */
 
-void BahamutIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const char *nick)
+void BahamutIRCdProto::SendSVSModeChan(const char *name, const char *mode, const char *nick)
 {
 	if (nick) send_cmd(ServerName, "SVSMODE %s %s %s", name, mode, nick);
 	else send_cmd(ServerName, "SVSMODE %s %s", name, mode);
diff --git a/src/protocol/bahamut.h b/src/protocol/bahamut.h
index 06a97dcf8..a1da77a92 100644
--- a/src/protocol/bahamut.h
+++ b/src/protocol/bahamut.h
@@ -83,7 +83,7 @@ class BahamutIRCdProto : public IRCDProto {
 		void SendSZLine(const char *, const char *, const char *);
 		void SendSGLine(const char *, const char *);
 		void SendBanDel(const char *, const char *);
-		void SendSVSMode_chan(const char *, const char *, const char *);
+		void SendSVSModeChan(const char *, const char *, const char *);
 		void SendSVID(const char *, time_t);
 		void SendUnregisteredNick(User *);
 		void SendSVID3(User *, const char *);
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index 5363c7d57..3e7089953 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1165,13 +1165,13 @@ void UnrealIRCdProto::SendSGLine(const char *mask, const char *reason)
 /* SVSMODE -b */
 void UnrealIRCdProto::SendBanDel(const char *name, const char *nick)
 {
-	SendSVSMode_chan(name, "-b", nick);
+	SendSVSModeChan(name, "-b", nick);
 }
 
 
 /* SVSMODE channel modes */
 
-void UnrealIRCdProto::SendSVSMode_chan(const char *name, const char *mode, const char *nick)
+void UnrealIRCdProto::SendSVSModeChan(const char *name, const char *mode, const char *nick)
 {
 	if (nick) send_cmd(ServerName, "%s %s %s %s", send_token("SVSMODE", "n"), name, mode, nick);
 	else send_cmd(ServerName, "%s %s %s", send_token("SVSMODE", "n"), name, mode);
diff --git a/src/protocol/unreal32.h b/src/protocol/unreal32.h
index 4088a6f3b..f34af0659 100644
--- a/src/protocol/unreal32.h
+++ b/src/protocol/unreal32.h
@@ -109,7 +109,7 @@ class UnrealIRCdProto : public IRCDProto {
 		void SendSZLine(const char *, const char *, const char *);
 		void SendSGLine(const char *, const char *);
 		void SendBanDel(const char *, const char *);
-		void SendSVSMode_chan(const char *, const char *, const char *);
+		void SendSVSModeChan(const char *, const char *, const char *);
 		void SendSVID(const char *, time_t);
 		void SendUnregisteredNick(User *);
 		void SendSVID2(User *, const char *);