Remove InspIRCd* parameters and fields

[user/henk/code/inspircd.git] / include / snomasks.h

diff --git a/include/snomasks.h b/include/snomasks.h
index f785af2911e5abc15f47da180098af33aa524e40..dddde1ff9095339ce74d46d0d7a6343d02b1fd67 100644 (file)
--- a/include/snomasks.h
+++ b/include/snomasks.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,20 +14,18 @@
 #ifndef __SNOMASKS_H__
 #define __SNOMASKS_H__
 
-class Snomask
+class Snomask : public Extensible
 {
- private:
-       InspIRCd *ServerInstance;
-
  public:
        char MySnomask;
        std::string Description;
        std::string LastMessage;
+       bool LastBlocked;
        unsigned int Count;
 
        /** Create a new Snomask
         */
-       Snomask(InspIRCd* Instance, char snomask, const std::string &description) : MySnomask(snomask), Description(description), LastMessage(""), Count(0)
+       Snomask(char snomask, const std::string &description) : MySnomask(snomask), Description(description), LastMessage(""), Count(0)
        {
        }
 
@@ -35,7 +33,7 @@ class Snomask
         */
        void SendMessage(const std::string &message);
 
-       /** Sends out a pending message
+       /** Sends out the (last message repeated N times) message
         */
        void Flush();
 };
@@ -48,13 +46,9 @@ typedef std::map<char, Snomask *> SnoList;
  * Modules and the core can enable and disable snomask characters. If they do,
  * then sending snomasks using these characters becomes possible.
  */
-class CoreExport SnomaskManager : public Extensible
+class CoreExport SnomaskManager
 {
  private:
-       /** Creator/owner
-        */
-       InspIRCd* ServerInstance;
-
        /** Currently active snomask list
         */
        SnoList SnoMasks;
@@ -65,7 +59,7 @@ class CoreExport SnomaskManager : public Extensible
  public:
        /** Create a new SnomaskManager
         */
-       SnomaskManager(InspIRCd* Instance);
+       SnomaskManager();
 
        /** Delete SnomaskManager
         */
@@ -89,18 +83,32 @@ class CoreExport SnomaskManager : public Extensible
         */
        bool DisableSnomask(char letter);
 
-       /** Write to all users with a given snomask.
+       /** Write to all users with a given snomask (local server only)
         * @param letter The snomask letter to write to
         * @param text The text to send to the users
         */
        void WriteToSnoMask(char letter, const std::string &text);
 
-       /** Write to all users with a given snomask.
+       /** Write to all users with a given snomask (local server only)
+        * @param letter The snomask letter to write to
+        * @param text A format string containing text to send
+        * @param ... Format arguments
+        */
+       void WriteToSnoMask(char letter, const char* text, ...) CUSTOM_PRINTF(3, 4);
+
+       /** Write to all users with a given snomask (sent globally)
+        * @param letter The snomask letter to write to
+        * @param text The text to send to the users
+        */
+       void WriteGlobalSno(char letter, const std::string &text);
+
+       /** Write to all users with a given snomask (sent globally)
         * @param letter The snomask letter to write to
         * @param text A format string containing text to send
         * @param ... Format arguments
         */
-       void WriteToSnoMask(char letter, const char* text, ...);
+       void WriteGlobalSno(char letter, const char* text, ...) CUSTOM_PRINTF(3, 4);
+
 
        /** Called once per 5 seconds from the mainloop, this flushes any cached
         * snotices. The way the caching works is as follows: