X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fglobals.h;h=4a01e454eed81eef909734d8f9b0c99a36708bc1;hb=2b3394855d5adddb16285b905503d9ffe5a1d963;hp=4087ab00cb5aace5b710b76bcca9fabb3221820a;hpb=f98a8569791abd5d021285871c93e7e3d7f04446;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/globals.h b/include/globals.h
index 4087ab00c..4a01e454e 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,45 +1,39 @@
-/*
-
-
-*/
-
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #ifndef __WORLD_H
 #define __WORLD_H
 
-// include the common header files
-
-#include <typeinfo>
-#include <iostream>
 #include <string>
 #include <deque>
-#include "users.h"
-#include "channels.h"
+#include <map>
+#include <vector>
 
+/** A cached text file stored with its contents as lines
+ */
 typedef std::deque<std::string> file_cache;
 
-void WriteOpers(char* text, ...);
-void log(int level, char *text, ...);
-void Write(int sock,char *text, ...);
-void WriteServ(int sock, char* text, ...);
-void WriteFrom(int sock, userrec *user,char* text, ...);
-void WriteTo(userrec *source, userrec *dest,char *data, ...);
-void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...);
-void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...);
-int common_channels(userrec *u, userrec *u2);
-void WriteCommon(userrec *u, char* text, ...);
-void WriteCommonExcept(userrec *u, char* text, ...);
-void WriteWallOps(userrec *source, bool local_only, char* text, ...);
-int isnick(const char *n);
-userrec* Find(std::string nick);
-chanrec* FindChan(const char* chan);
-char* cmode(userrec *user, chanrec *chan);
-std::string getservername();
-std::string getnetworkname();
-std::string getadminname();
-std::string getadminemail();
-std::string getadminnick();
-void readfile(file_cache &F, const char* fname);
-int ModeDefiend(char c, int i);
+/** A configuration key and value pair
+ */
+typedef std::pair< std::string, std::string > KeyVal;
+
+/** A list of related configuration keys and values
+ */
+typedef std::vector< KeyVal > KeyValList;
+
+/** An entire config file, built up of KeyValLists
+ */
+typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
 #endif
+