WriteCommon() and WriteCommonExcept() -> userrec::WriteCommon(), userrec::WriteCommonExcept()

WriteCommon_NoFormat() and WriteCommonExcept_NoFormat() -> std::string variants


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4800 e03df62e-2008-0410-955e-edbf42e46eb7

4 files changed, 8 insertions, 16 deletions

diff --git a/include/globals.h b/include/globals.h
index 6c51e1834..299a1f438 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -34,8 +34,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);
-void WriteCommon(userrec *u, char* text, ...);
-void WriteCommonExcept(userrec *u, char* text, ...);
 void WriteWallOps(userrec *source, bool local_only, char* text, ...);
 int isnick(const char *n);
 chanrec* FindChan(const char* chan);
diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index 64b668769..d35f0ae6e 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -48,12 +48,7 @@
 void do_log(int level, const char *text, ...);
 void readfile(file_cache &F, const char* fname);
 
-void WriteCommon(userrec *u, char* text, ...);
-void WriteCommonExcept(userrec *u, char* text, ...);
 void WriteOpers(const char* text, ...);
-
-void WriteCommon_NoFormat(userrec *u, const char* text);
-void WriteCommonExcept_NoFormat(userrec *u, const char* text);
 void WriteOpers_NoFormat(const char* text);
 
 std::string GetServerDescription(const char* servername);
diff --git a/include/modules.h b/include/modules.h
index a7f18fecd..88fe81adc 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1333,15 +1333,6 @@ class Server : public Extensible
 	 */
 	virtual bool CommonChannels(userrec* u1, userrec* u2);
 
-	/** Sends text from a user to one or more channels (mulicast).
-	 * This method writes a line of text to all users which share a common channel with a given	
-	 * user, with the user's nick/ident/host combination prepended, as used in PRIVMSG etc
-	 * commands (see RFC 1459). If the IncludeSender flag is set, then the text is also sent
-	 * back to the user from which it originated, as seen in NICK (see RFC 1459). Otherwise, it
-	 * is only sent to the other recipients, as seen in QUIT.
-	 */
-	virtual void SendCommon(userrec* User, const std::string &text, bool IncludeSender);
-
 	/** Sends a WALLOPS message.
 	 * This method writes a WALLOPS message to all users with the +w flag, originating from the
 	 * specified user.
diff --git a/include/users.h b/include/users.h
index 2ea805745..bd60726c0 100644
--- a/include/users.h
+++ b/include/users.h
@@ -602,6 +602,14 @@ class userrec : public connection
 	 */
 	void WriteTo(userrec *dest, const char *data, ...);
 
+	void WriteCommon(const std::string &text);
+
+	void WriteCommon(char* text, ...);
+
+	void WriteCommonExcept(char* text, ...);
+
+	void WriteCommonExcept(const std::string &text);
+
 	/** Default destructor
 	 */
 	virtual ~userrec();