Missing a changeover

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

diff --git a/include/globals.h b/include/globals.h
index 07c32303fb844e6f541b541463a5287c6ac3fe93..5b74aeaa1412f1f655af13cc3b92738748db7b4e 100644 (file)
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,8 +1,18 @@
-/*
-
-
-*/
-
+/*       +------------------------------------+
+ *       | 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
@@ -10,13 +20,13 @@
 // include the common header files
 
 #include <typeinfo>
-#include <iostream.h>
+#include <iostream>
 #include <string>
 #include <deque>
 #include "users.h"
 #include "channels.h"
 
-typedef deque<string> file_cache;
+typedef std::deque<std::string> file_cache;
 
 void WriteOpers(char* text, ...);
 void log(int level, char *text, ...);
@@ -29,16 +39,10 @@ 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, ...);
+void WriteWallOps(userrec *source, bool local_only, char* text, ...);
 int isnick(const char *n);
-userrec* Find(string nick);
+userrec* Find(std::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);
 
 #endif