X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcmd_topic.cpp;h=e8784e318b99b651447d85361fa22ad57a4c2944;hb=6ab1d0dffb8084bf6a2ad8a446a3836fa3760c8a;hp=b8c60240dc5ade2abe2a1ee55c2f8e4438209e33;hpb=ced58c3be3f1da8dcf70c3904e5fe4bdaabf0e3d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index b8c60240d..e8784e318 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
+ *	     	          E-mail:
  *                <brain@chatspike.net>
  *                <Craig@chatspike.net>
  *
@@ -14,54 +14,22 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #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 "commands.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "dnsqueue.h"
+#include "commands/cmd_topic.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "socketengine.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_topic.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> 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];
+extern ModuleList modules;
+extern FactoryList factory;
 
-void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_topic::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	chanrec* Ptr;
 
@@ -112,18 +80,18 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
 			char topic[MAXTOPIC];
 			strlcpy(topic,parameters[1],MAXTOPIC-1);
 
-                        if (IS_LOCAL(user))
-                        {
-                                int MOD_RESULT = 0;
-                                FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
-                                if (MOD_RESULT)
-                                        return;
-                        }
+			if (IS_LOCAL(user))
+			{
+				int MOD_RESULT = 0;
+				FOREACH_RESULT(I_OnLocalTopicChange,OnLocalTopicChange(user,Ptr,topic));
+				if (MOD_RESULT)
+					return;
+			}
 
 			strlcpy(Ptr->topic,topic,MAXTOPIC-1);
 			strlcpy(Ptr->setby,user->nick,NICKMAX-1);
 			Ptr->topicset = TIME;
-			WriteChannel(Ptr,user,"TOPIC %s :%s",Ptr->name, Ptr->topic);
+			Ptr->WriteChannel(user, "TOPIC %s :%s", Ptr->name, Ptr->topic);
 			if (IS_LOCAL(user))
 			{
 				FOREACH_MOD(I_OnPostLocalTopicChange,OnPostLocalTopicChange(user,Ptr,topic));
@@ -136,4 +104,3 @@ void cmd_topic::Handle (char **parameters, int pcnt, userrec *user)
 	}
 }
 
-