From e964e2286d78ab691078db40e402f685561ef0ca Mon Sep 17 00:00:00 2001 From: brain Date: Wed, 9 Aug 2006 10:04:58 +0000 Subject: common_channels -> userrec::SharesChannelWith() git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4805 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/globals.h | 1 - include/message.h | 1 - include/modules.h | 6 ------ include/users.h | 6 ++++-- 4 files changed, 4 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/globals.h b/include/globals.h index d3aac6571..a6e39066e 100644 --- a/include/globals.h +++ b/include/globals.h @@ -33,7 +33,6 @@ typedef std::multimap< std::string, KeyValList > ConfigDataHash; void WriteOpers(char* text, ...); void do_log(int level, char *text, ...); -int common_channels(userrec *u, userrec *u2); int isnick(const char *n); chanrec* FindChan(const char* chan); void readfile(file_cache &F, const char* fname); diff --git a/include/message.h b/include/message.h index f7fcba278..edcda3da9 100644 --- a/include/message.h +++ b/include/message.h @@ -28,7 +28,6 @@ #include "users.h" #include "channels.h" -int common_channels(userrec *u, userrec *u2); void Blocking(int s); void NonBlocking(int s); int c_count(userrec* u); diff --git a/include/modules.h b/include/modules.h index 392047a35..cb105c60e 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1327,12 +1327,6 @@ class Server : public Extensible */ virtual void Log(int level, const std::string &s); - /** Returns true if two users share a common channel. - * This method is used internally by the NICK and QUIT commands, and the Server::SendCommon - * method. - */ - virtual bool CommonChannels(userrec* u1, userrec* u2); - /** Returns true if a nick is valid. * Nicks for unregistered connections will return false. */ diff --git a/include/users.h b/include/users.h index 5e6225dfb..cc7074004 100644 --- a/include/users.h +++ b/include/users.h @@ -627,9 +627,11 @@ class userrec : public connection */ void WriteCommonExcept(const std::string &text); - void userrec::WriteWallOps(const char* text, ...); + void WriteWallOps(const char* text, ...); - void userrec::WriteWallOps(const std::string &text); + void WriteWallOps(const std::string &text); + + bool SharesChannelWith(userrec *other); /** Default destructor */ -- cgit v1.2.3