Merge the latest changes from insp20 into master.

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

diff --git a/include/cull_list.h b/include/cull_list.h
index 2b3ed13915435fa25d9f18a0c44c4760906827b7..ac64dced284341805081c6e78c0b33927a1af9d3 100644 (file)
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -1,18 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CULLLIST_H__
-#define __CULLLIST_H__
+
+#pragma once
 
 /**
  * The CullList class is used to delete objects at the end of the main loop to
@@ -22,16 +30,30 @@
 class CoreExport CullList
 {
        std::vector<classbase*> list;
+       std::vector<LocalUser*> SQlist;
 
  public:
        /** Adds an item to the cull list
         */
        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();
 };
 
-#endif
+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();
+
+};