X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ftypedefs.h;h=7659628d22c900dffca052e384a76d42a5d3cbd4;hb=34b2dde776b332116d04cea356843b324ab099fb;hp=a1c6e774d7f63468b9bdc9151a1e097d461675da;hpb=54fb0cd5aa7d090d5c3da5ab54988c86ba8a2e8e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/typedefs.h b/include/typedefs.h
index a1c6e774d..7659628d2 100644
--- a/include/typedefs.h
+++ b/include/typedefs.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) 2005, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *
- * 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 __TYPEDEF_H__
-#define __TYPEDEF_H__
+
+#ifndef TYPEDEFS_H
+#define TYPEDEFS_H
 
 class BanCacheManager;
 class BanItem;
@@ -26,6 +34,8 @@ class DNSRequest;
 class Extensible;
 class FakeUser;
 class InspIRCd;
+class Invitation;
+class InviteBase;
 class LocalUser;
 class Membership;
 class Module;
@@ -64,7 +74,7 @@ typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
 
 /** Holds a complete list of all channels to which a user has been invited and has not yet joined, and the time at which they'll expire.
  */
-typedef std::vector< std::pair<irc::string, time_t> > InvitedList;
+typedef std::vector<Invitation*> InviteList;
 
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */
@@ -97,6 +107,7 @@ typedef std::pair<std::string, std::string> KeyVal;
 /** The entire configuration
  */
 typedef std::multimap<std::string, reference<ConfigTag> > ConfigDataHash;
+
 /** Iterator of ConfigDataHash */
 typedef ConfigDataHash::const_iterator ConfigIter;
 /** Iterator pair, used for tag-name ranges */
@@ -105,6 +116,9 @@ typedef std::pair<ConfigIter,ConfigIter> ConfigTagList;
 /** Index of valid oper blocks and types */
 typedef std::map<std::string, reference<OperInfo> > OperIndex;
 
+/** Files read by the configuration */
+typedef std::map<std::string, file_cache> ConfigFileCache;
+
 /** A hash of commands used by the core
  */
 typedef nspace::hash_map<std::string,Command*> Commandtable;