X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=0814c08c4f1731c910255663148f832dcd6a246d;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=9ab0532c59178af2d7c14ee9c58ed21e27c9abde;hpb=18a67e4a2a6131b9694b9bc960ba50c55a50a43e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 9ab0532c5..0814c08c4 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -14,52 +14,24 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <string>
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
+#include "wildcard.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
 #include "cmd_privmsg.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern ModuleList modules;
+extern FactoryList factory;
 extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -76,18 +48,18 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 		char* servermask = parameters[0];
 		servermask++;
 		if (match(Config->ServerName,servermask))
-                {
+		{
 			ServerPrivmsgAll("%s",parameters[1]);
-                }
+		}
 		return;
-        }
-        char status = 0;
-        if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
-        {
-                status = *parameters[0];
-                parameters[0]++;
-        }
-        if (parameters[0][0] == '#')
+	}
+	char status = 0;
+	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	{
+		status = *parameters[0];
+		parameters[0]++;
+	}
+	if (parameters[0][0] == '#')
 	{
 		chan = FindChan(parameters[0]);
 		if (chan)
@@ -163,5 +135,3 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
 	}
 }
-
-