X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fxline.h;h=fe044d0f2d07b7ef119606dc0d7fd8464e979473;hb=19eb420281670348532fdd58f5fe757d5413faf7;hp=2a49d8b80efe1c49230137a847a4838a049485be;hpb=74ee9af96639323d852a8b15be72ee9974e0a826;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/xline.h b/include/xline.h
index 2a49d8b80..fe044d0f2 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
@@ -101,16 +100,16 @@ class CoreExport XLine : public classbase
 	 * line. Usually a line in the form 'expiring Xline blah, set by...'
 	 * see the DisplayExpiry methods of GLine, ELine etc.
 	 */
-	virtual void DisplayExpiry() = 0;
+	virtual void DisplayExpiry();
 
 	/** Returns the displayable form of the pattern for this xline,
 	 * e.g. '*\@foo' or '*baz*'. This must always return the full pattern
 	 * 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.
 	 */
@@ -177,9 +176,7 @@ class CoreExport KLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
-	virtual const char* Displayable();
+	virtual const std::string& Displayable();
 
 	virtual bool IsBurstable();
 
@@ -225,9 +222,7 @@ class CoreExport GLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
-	virtual const char* Displayable();
+	virtual const std::string& Displayable();
 
 	/** Ident mask (ident part only)
 	 */
@@ -269,11 +264,9 @@ class CoreExport ELine : public XLine
 
 	virtual void Unset();
 
-	virtual void DisplayExpiry();
-
 	virtual void OnAdd();
 
-	virtual const char* Displayable();
+	virtual const std::string& Displayable();
 
 	/** Ident mask (ident part only)
 	 */
@@ -314,9 +307,7 @@ class CoreExport ZLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
-	virtual const char* Displayable();
+	virtual const std::string& Displayable();
 
 	/** IP mask (no ident part)
 	 */
@@ -351,9 +342,7 @@ class CoreExport QLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
-	virtual const char* Displayable();
+	virtual const std::string& Displayable();
 
 	/** Nickname mask
 	 */
@@ -536,5 +525,3 @@ class CoreExport XLineManager
 	 */
 	void InvokeStats(const std::string &type, int numeric, User* user, string_list &results);
 };
-
-#endif