Fixes found by removing User inheritance from StreamSocket

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

diff --git a/src/modules/m_spanningtree/whois.cpp b/src/modules/m_spanningtree/whois.cpp
index f12a7f1090500c6e947a8d437f4b215a2ee915bc..03fb5f9234e627c76065540ca0cd032b32b2e7dd 100644 (file)
--- a/src/modules/m_spanningtree/whois.cpp
+++ b/src/modules/m_spanningtree/whois.cpp
@@ -14,7 +14,6 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "xline.h"
-#include "../transport.h"
 #include "socketengine.h"
 
 #include "main.h"
@@ -28,13 +27,13 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
 {
        if (params.size() < 1)
                return true;
-       User* u = this->ServerInstance->FindNick(prefix);
+       User* u = ServerInstance->FindNick(prefix);
        if (u)
        {
                // an incoming request
                if (params.size() == 1)
                {
-                       User* x = this->ServerInstance->FindNick(params[0]);
+                       User* x = ServerInstance->FindNick(params[0]);
                        if ((x) && (IS_LOCAL(x)))
                        {
                                char signon[MAXBUF];
@@ -58,7 +57,7 @@ bool TreeSocket::Whois(const std::string &prefix, parameterlist &params)
                else if (params.size() == 3)
                {
                        std::string who_did_the_whois = params[0];
-                       User* who_to_send_to = this->ServerInstance->FindNick(who_did_the_whois);
+                       User* who_to_send_to = ServerInstance->FindNick(who_did_the_whois);
                        if ((who_to_send_to) && (IS_LOCAL(who_to_send_to)))
                        {
                                // an incoming reply to a whois we sent out