WriteWallops() -> userrec::WriteWallops() (originates from a user, so belongs in userrec)

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

4 files changed, 6 insertions, 10 deletions

diff --git a/include/globals.h b/include/globals.h
index 299a1f438..d3aac6571 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -34,7 +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 WriteWallOps(userrec *source, bool local_only, char* text, ...);
 int isnick(const char *n);
 chanrec* FindChan(const char* chan);
 void readfile(file_cache &F, const char* fname);
diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index d35f0ae6e..e094b1a0e 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -56,7 +56,6 @@ void WriteMode(const char* modes, int flags, const char* text, ...);
 void NoticeAll(userrec *source, bool local_only, char* text, ...);
 void ServerNoticeAll(char* text, ...);
 void ServerPrivmsgAll(char* text, ...);
-void WriteWallOps(userrec *source, bool local_only, char* text, ...);
 void strlower(char *n);
 userrec* Find(const std::string &nick);
 userrec* Find(const char* nick);
diff --git a/include/modules.h b/include/modules.h
index 88fe81adc..f086188d0 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1333,12 +1333,6 @@ class Server : public Extensible
 	 */
 	virtual bool CommonChannels(userrec* u1, userrec* u2);
 
-	/** Sends a WALLOPS message.
-	 * This method writes a WALLOPS message to all users with the +w flag, originating from the
-	 * specified user.
-	 */
-	virtual void SendWallops(userrec* User, const std::string &text);
-
 	/** 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 a66062383..5e6225dfb 100644
--- a/include/users.h
+++ b/include/users.h
@@ -614,19 +614,23 @@ class userrec : public connection
 	 * @param text The format string for text to send to the users
 	 * @param ... POD-type format arguments
 	 */
-	void WriteCommon(char* text, ...);
+	void WriteCommon(const char* text, ...);
 
 	/** Write to all users that can see this user (not including this user in the list), appending CR/LF
 	 * @param text The format string for text to send to the users
 	 * @param ... POD-type format arguments
 	 */
-	void WriteCommonExcept(char* text, ...);
+	void WriteCommonExcept(const char* text, ...);
 
 	/** Write to all users that can see this user (not including this user in the list), appending CR/LF
 	 * @param text A std::string to send to the users
 	 */
 	void WriteCommonExcept(const std::string &text);
 
+	void userrec::WriteWallOps(const char* text, ...);
+
+	void userrec::WriteWallOps(const std::string &text);
+
 	/** Default destructor
 	 */
 	virtual ~userrec();