X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=7fba57faa8b59b5825ea6dc40398c4633f1dedd3;hb=caa0c27a5a485151a0de21e700680c1e46ab85b4;hp=249f87850e1991aa4e9dac8c8b41ba270b65ac78;hpb=c511bb56f5ceff1e395d82c4bfd78e5c23aabab6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index 249f87850..7fba57faa 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -27,7 +27,6 @@
 #include <stdarg.h>
 #include "socketengine.h"
 #include "xline.h"
-#include "bancache.h"
 
 already_sent_t LocalUser::already_sent_id = 0;
 
@@ -285,7 +284,7 @@ eol_found:
 		recvq = recvq.substr(qpos);
 
 		// TODO should this be moved to when it was inserted in recvq?
-		ServerInstance->stats->statsRecv += qpos;
+		ServerInstance->stats.Recv += qpos;
 		user->bytes_in += qpos;
 		user->cmds_in++;
 
@@ -540,7 +539,7 @@ bool LocalUser::CheckLines(bool doZline)
 
 void LocalUser::FullConnect()
 {
-	ServerInstance->stats->statsConnects++;
+	ServerInstance->stats.Connects++;
 	this->idle_lastmsg = ServerInstance->Time();
 
 	/*
@@ -558,11 +557,11 @@ void LocalUser::FullConnect()
 		return;
 
 	this->WriteNumeric(RPL_WELCOME, ":Welcome to the %s IRC Network %s", ServerInstance->Config->Network.c_str(), GetFullRealHost().c_str());
-	this->WriteNumeric(RPL_YOURHOSTIS, ":Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), BRANCH);
+	this->WriteNumeric(RPL_YOURHOSTIS, ":Your host is %s, running version %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH);
 	this->WriteNumeric(RPL_SERVERCREATED, ":This server was created %s %s", __TIME__, __DATE__);
 
 	const std::string& modelist = ServerInstance->Modes->GetModeListFor004Numeric();
-	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), BRANCH, modelist.c_str());
+	this->WriteNumeric(RPL_SERVERVERSION, "%s %s %s", ServerInstance->Config->ServerName.c_str(), INSPIRCD_BRANCH, modelist.c_str());
 
 	ServerInstance->ISupport.SendTo(this);
 
@@ -629,7 +628,7 @@ bool User::ChangeNick(const std::string& newnick, bool force, time_t newts)
 
 		if (MOD_RESULT == MOD_RES_DENY)
 		{
-			ServerInstance->stats->statsCollisions++;
+			ServerInstance->stats.Collisions++;
 			return false;
 		}
 	}
@@ -837,7 +836,7 @@ void LocalUser::Write(const std::string& text)
 	eh.AddWriteBuf(text);
 	eh.AddWriteBuf(wide_newline);
 
-	ServerInstance->stats->statsSent += text.length() + 2;
+	ServerInstance->stats.Sent += text.length() + 2;
 	this->bytes_out += text.length() + 2;
 	this->cmds_out++;
 }