Merge pull request #70 from Shawn-Smith/insp20+chancreatefix

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

diff --git a/include/cull_list.h b/include/cull_list.h
index bd2fb45dae899f220f7ebb9fb1ff0d6585a5c4ed..8e2d5f2abbf2ed6c2717239861b419c8db6a6629 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
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#ifndef __CULLLIST_H__
-#define __CULLLIST_H__
+#ifndef CULL_LIST_H
+#define CULL_LIST_H
 
 /**
  * The CullList class is used to delete objects at the end of the main loop to
@@ -21,17 +21,34 @@
  */
 class CoreExport CullList
 {
-       std::set<classbase*> list;
+       std::vector<classbase*> list;
+       std::vector<LocalUser*> SQlist;
 
  public:
        /** Adds an item to the cull list
         */
-       void AddItem(classbase* item) { list.insert(item); }
+       void AddItem(classbase* item) { list.push_back(item); }
+       void AddSQItem(LocalUser* item) { SQlist.push_back(item); }
 
        /** Applies the cull list (deletes the contents)
         */
        void Apply();
 };
 
+class CoreExport ActionList
+{
+       std::vector<HandlerBase0<void>*> list;
+
+ public:
+       /** Adds an item to the list
+        */
+       void AddAction(HandlerBase0<void>* item) { list.push_back(item); }
+
+       /** Runs the items
+        */
+       void Run();
+
+};
+
 #endif