X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.h;h=460231502a76c532a7da5ff9567ed848882a9ab2;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=943267cfdda742bdec1b37e11394a4b5703a0f4e;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.h b/src/modules/m_spanningtree/treeserver.h
index 943267cfd..460231502 100644
--- a/src/modules/m_spanningtree/treeserver.h
+++ b/src/modules/m_spanningtree/treeserver.h
@@ -19,8 +19,7 @@
  */
 
 
-#ifndef M_SPANNINGTREE_TREESERVER_H
-#define M_SPANNINGTREE_TREESERVER_H
+#pragma once
 
 #include "treesocket.h"
 
@@ -46,8 +45,6 @@ class TreeServer : public classbase
 	irc::string ServerName;			/* Server's name */
 	std::string ServerDesc;			/* Server's description */
 	std::string VersionString;		/* Version string or empty string */
-	unsigned int ServerUserCount;		/* How many users are on this server? [note: doesn't care about +i] */
-	unsigned int ServerOperCount;		/* How many opers are on this server? */
 	TreeSocket* Socket;			/* For directly connected servers this points at the socket object */
 	time_t NextPing;			/* After this time, the server should be PINGed*/
 	bool LastPingWasGood;			/* True if the server responded to the last PING with a PONG */
@@ -67,6 +64,9 @@ class TreeServer : public classbase
 	bool Warned;				/* True if we've warned opers about high latency on this server */
 	bool bursting;				/* whether or not this server is bursting */
 
+	unsigned int UserCount;			/* How many users are on this server? [note: doesn't care about +i] */
+	unsigned int OperCount;			/* How many opers are on this server? */
+
 	/** We use this constructor only to create the 'root' item, Utils->TreeRoot, which
 	 * represents our own server. Therefore, it has no route, no parent, and
 	 * no socket associated with it. Its version string is our own local version.
@@ -105,11 +105,11 @@ class TreeServer : public classbase
 
 	/** Get server description (GECOS)
 	 */
-	std::string GetDesc();
+	const std::string& GetDesc();
 
 	/** Get server version string
 	 */
-	std::string GetVersion();
+	const std::string& GetVersion();
 
 	/** Set time we are next due to ping this server
 	 */
@@ -143,22 +143,6 @@ class TreeServer : public classbase
 	 */
 	void SetPingFlag();
 
-	/** Get the number of users on this server.
-	 */
-	unsigned int GetUserCount();
-
-	/** Increment or decrement the user count by diff.
-	 */
-	void SetUserCount(int diff);
-
-	/** Gets the numbers of opers on this server.
-	 */
-	unsigned int GetOperCount();
-
-	/** Increment or decrement the oper count by diff.
-	 */
-	void SetOperCount(int diff);
-
 	/** Get the TreeSocket pointer for local servers.
 	 * For remote servers, this returns NULL.
 	 */
@@ -197,7 +181,7 @@ class TreeServer : public classbase
 
 	/** Get server ID
 	 */
-	std::string& GetID();
+	const std::string& GetID();
 
 	/** Marks a server as having finished bursting and performs appropriate actions.
 	 */
@@ -210,5 +194,3 @@ class TreeServer : public classbase
 	 */
 	~TreeServer();
 };
-
-#endif