X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fxline.h;h=9aae32b24b044068a33e5b8deb7c4de683531a06;hb=204d78aaa7b1cbfa98ef39f3961ad5fe428cf12b;hp=4094e05df2c0a83cd9ef631d3fc5b8a32794277d;hpb=8c4dfd8add09cddc83faa5007317b851ae21d529;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/xline.h b/include/xline.h
index 4094e05df..9aae32b24 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -20,8 +20,7 @@
  */
 
 
-#ifndef XLINE_H
-#define XLINE_H
+#pragma once
 
 /** XLine is the base class for ban lines such as G lines and K lines.
  * Modules may derive from this, and their xlines will automatically be
@@ -108,9 +107,9 @@ class CoreExport XLine : public classbase
 	 * in a form which can be used to construct an entire derived xline,
 	 * even if it is stored differently internally (e.g. GLine stores the
 	 * ident and host parts seperately but will still return ident\@host
-	 * for its Displayable() method)
+	 * for its Displayable() method).
 	 */
-	virtual const char* Displayable() = 0;
+	virtual const std::string& Displayable() = 0;
 
 	/** Called when the xline has just been added.
 	 */
@@ -171,15 +170,15 @@ class CoreExport KLine : public XLine
 	{
 	}
 
-	virtual bool Matches(User *u);
+	bool Matches(User* u) CXX11_OVERRIDE;
 
-	virtual bool Matches(const std::string &str);
+	bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-	virtual void Apply(User* u);
+	void Apply(User* u) CXX11_OVERRIDE;
 
-	virtual const char* Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
-	virtual bool IsBurstable();
+	bool IsBurstable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -217,13 +216,13 @@ class CoreExport GLine : public XLine
 	{
 	}
 
-	virtual bool Matches(User *u);
+	bool Matches(User* u) CXX11_OVERRIDE;
 
-	virtual bool Matches(const std::string &str);
+	bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-	virtual void Apply(User* u);
+	void Apply(User* u)  CXX11_OVERRIDE;
 
-	virtual const char* Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -259,15 +258,15 @@ class CoreExport ELine : public XLine
 	{
 	}
 
-	virtual bool Matches(User *u);
+	bool Matches(User* u) CXX11_OVERRIDE;
 
-	virtual bool Matches(const std::string &str);
+	bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-	virtual void Unset();
+	void Unset() CXX11_OVERRIDE;
 
-	virtual void OnAdd();
+	void OnAdd() CXX11_OVERRIDE;
 
-	virtual const char* Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -302,13 +301,13 @@ class CoreExport ZLine : public XLine
 	{
 	}
 
-	virtual bool Matches(User *u);
+	bool Matches(User* u) CXX11_OVERRIDE;
 
-	virtual bool Matches(const std::string &str);
+	bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-	virtual void Apply(User* u);
+	void Apply(User* u) CXX11_OVERRIDE;
 
-	virtual const char* Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** IP mask (no ident part)
 	 */
@@ -337,13 +336,13 @@ class CoreExport QLine : public XLine
 	~QLine()
 	{
 	}
-	virtual bool Matches(User *u);
+	bool Matches(User* u) CXX11_OVERRIDE;
 
-	virtual bool Matches(const std::string &str);
+	bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-	virtual void Apply(User* u);
+	void Apply(User* u) CXX11_OVERRIDE;
 
-	virtual const char* Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Nickname mask
 	 */
@@ -521,10 +520,7 @@ class CoreExport XLineManager
 	 * will be expired and removed before the list is displayed.
 	 * @param type The type of stats to show
 	 * @param numeric The numeric to give to each result line
-	 * @param user The username making the query
-	 * @param results The string_list to receive the results
+	 * @param stats Stats context
 	 */
-	void InvokeStats(const std::string &type, int numeric, User* user, string_list &results);
+	void InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats);
 };
-
-#endif