Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/include/globals.h b/include/globals.h
index 07c32303fb844e6f541b541463a5287c6ac3fe93..fce5fc043d8562a2fd0f9478fb0fa0255d47401e 100644 (file)
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,44 +1,30 @@
-/*
-
-
-*/
-
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * 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.h>
 #include <string>
 #include <deque>
-#include "users.h"
-#include "channels.h"
-
-typedef deque<string> file_cache;
+#include <map>
+#include <vector>
 
-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, char* text, ...);
-int isnick(const char *n);
-userrec* Find(string nick);
-chanrec* FindChan(const char* chan);
-char* cmode(userrec *user, chanrec *chan);
-string getservername();
-string getnetworkname();
-string getadminname();
-string getadminemail();
-string getadminnick();
-void readfile(file_cache &F, const char* fname);
+typedef std::deque<std::string> file_cache;
+typedef std::pair< std::string, std::string > KeyVal;
+typedef std::vector< KeyVal > KeyValList;
+typedef std::multimap< std::string, KeyValList > ConfigDataHash;
 
 #endif