Move nick change code out of cmd_nick; fixes double-invocation of hooks and may elimi...

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

diff --git a/include/cull_list.h b/include/cull_list.h
index 2a0b895f2c8e0964d30a1a9d56ae6c0620f43c44..5a74aa72470c9f2396f9e0247361a69175866442 100644 (file)
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,60 +14,38 @@
 #ifndef __CULLLIST_H__
 #define __CULLLIST_H__
 
-/** The CullList class is used by the core to create lists of users
- * prior to actually quitting (and deleting the objects) all at once.
- * to quitting them all at once. This is faster than quitting
- * them within the loop, as the loops become tighter with
- * little or no comparisons within them. The CullList class
- * operates by allowing the programmer to push users onto
- * the list, each with a seperate quit reason, and then, once
- * the list is complete, call a method to flush the list,
- * quitting all the users upon it. A CullList may hold local
- * or remote users, but it may only hold each user once. If
- * you attempt to add the same user twice, then the second
- * attempt will be ignored.
- *
- * NOTE: Don't use this outside core, use the QuitUser method like everyone else!
+/**
+ * The CullList class is used to delete objects at the end of the main loop to
+ * avoid problems with references to deleted pointers if an object were deleted
+ * during execution.
  */
-class CoreExport CullList : public classbase
+class CoreExport CullList
 {
- private:
-       /** Creator of this CullList
-        */
-       InspIRCd* ServerInstance;
-
-       /** Holds a list of users being quit.
-        * See the information for CullItem for
-        * more information.
-        */
-       std::vector<User *> list;
+       std::vector<classbase*> list;
 
  public:
-       /** Constructor.
-        * @param Instance Creator of this CullList object
+       /** Adds an item to the cull list
         */
-       CullList(InspIRCd* Instance);
+       void AddItem(classbase* item) { list.push_back(item); }
 
-       /** Adds a user to the cull list for later
-        * removal via QUIT.
-        * @param user The user to add
-        * @param reason The quit reason of the user being added
-        * @param o_reason The quit reason to show only to opers
+       /** Applies the cull list (deletes the contents)
         */
-       void AddItem(User* user);
+       void Apply();
+};
 
-       /* Turn an item into a silent item (don't send out QUIT for this user)
+class CoreExport ActionList
+{
+       std::vector<HandlerBase0<void>*> list;
+
+ public:
+       /** Adds an item to the list
         */
-       void MakeSilent(User* user);
+       void AddAction(HandlerBase0<void>* item) { list.push_back(item); }
 
-       /** Applies the cull list, quitting all the users
-        * on the list with their quit reasons all at once.
-        * This is a very fast operation compared to
-        * iterating the user list and comparing each one,
-        * especially if there are multiple comparisons
-        * to be done, or recursion.
+       /** Runs the items
         */
-       void Apply();
+       void Run();
+
 };
 
 #endif