Change more modules to VF_OPTCOMMON and assert identical charsets in m_nationalchars

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / time.cpp

diff --git a/src/modules/m_spanningtree/time.cpp b/src/modules/m_spanningtree/time.cpp
index d2c8f79897275fcf255eba9e10e0a04a5e0c2766..4f4373498575afdeef929419be2ec4237f49724f 100644 (file)
--- a/src/modules/m_spanningtree/time.cpp
+++ b/src/modules/m_spanningtree/time.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,11 +12,8 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -33,20 +30,20 @@ bool TreeSocket::Time(const std::string &prefix, parameterlist &params)
        if (params.size() == 2)
        {
                // someone querying our time?
-               if (this->ServerInstance->Config->ServerName == params[0] || this->ServerInstance->Config->GetSID() == params[0])
+               if (ServerInstance->Config->ServerName == params[0] || ServerInstance->Config->GetSID() == params[0])
                {
-                       User* u = this->ServerInstance->FindNick(params[1]);
+                       User* u = ServerInstance->FindNick(params[1]);
                        if (u)
                        {
                                params.push_back(ConvToStr(ServerInstance->Time()));
                                params[0] = prefix;
-                               Utils->DoOneToOne(this->ServerInstance->Config->GetSID(),"TIME",params,params[0]);
+                               Utils->DoOneToOne(ServerInstance->Config->GetSID(),"TIME",params,params[0]);
                        }
                }
                else
                {
                        // not us, pass it on
-                       User* u = this->ServerInstance->FindNick(params[1]);
+                       User* u = ServerInstance->FindNick(params[1]);
                        if (u)
                                Utils->DoOneToOne(prefix,"TIME",params,params[0]);
                }
@@ -54,7 +51,7 @@ bool TreeSocket::Time(const std::string &prefix, parameterlist &params)
        else if (params.size() == 3)
        {
                // a response to a previous TIME
-               User* u = this->ServerInstance->FindNick(params[1]);
+               User* u = ServerInstance->FindNick(params[1]);
                if ((u) && (IS_LOCAL(u)))
                {
                        std::string sourceserv = Utils->FindServer(prefix)->GetName();