Add the override keyword in places that it is missing.

GCCs warnings for this are much better than Clangs.

17 files changed, 79 insertions, 79 deletions

diff --git a/include/builtinmodes.h b/include/builtinmodes.h
index 49198b650..3bd3e2566 100644
--- a/include/builtinmodes.h
+++ b/include/builtinmodes.h
@@ -42,9 +42,9 @@ class ModeChannelKey : public ParamMode<ModeChannelKey, LocalStringExt>
 	static const std::string::size_type maxkeylen = 32;
  public:
 	ModeChannelKey();
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
-	void SerializeParam(Channel* chan, const std::string* key, std::string& out);
-	ModeAction OnSet(User* source, Channel* chan, std::string& param);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
+	void SerializeParam(Channel* chan, const std::string* key, std::string& out)	;
+	ModeAction OnSet(User* source, Channel* chan, std::string& param) CXX11_OVERRIDE;
 };
 
 /** Channel mode +l
@@ -53,9 +53,9 @@ class ModeChannelLimit : public ParamMode<ModeChannelLimit, LocalIntExt>
 {
  public:
 	ModeChannelLimit();
-	bool ResolveModeConflict(std::string &their_param, const std::string &our_param, Channel* channel);
+	bool ResolveModeConflict(std::string& their_param, const std::string& our_param, Channel* channel) CXX11_OVERRIDE;
 	void SerializeParam(Channel* chan, intptr_t n, std::string& out);
-	ModeAction OnSet(User* source, Channel* channel, std::string& parameter);
+	ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE;
 };
 
 /** Channel mode +o
@@ -114,5 +114,5 @@ class ModeUserOperator : public ModeHandler
 {
  public:
 	ModeUserOperator();
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding) CXX11_OVERRIDE;
 };
diff --git a/include/caller.h b/include/caller.h
index 47f896ef6..dfa6ccebb 100644
--- a/include/caller.h
+++ b/include/caller.h
@@ -65,31 +65,31 @@ template<typename ReturnType, typename... Args> class CoreExport Caller
 #define caller8 Caller
 
 #define DEFINE_HANDLER0(NAME, RETURN) \
-	class CoreExport NAME : public Handler<RETURN> { public: NAME() { } virtual RETURN Call(); }
+	class CoreExport NAME : public Handler<RETURN> { public: RETURN Call() CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER1(NAME, RETURN, V1) \
-	class CoreExport NAME : public Handler<RETURN, V1> { public: NAME() { } virtual RETURN Call(V1); }
+	class CoreExport NAME : public Handler<RETURN, V1> { public: RETURN Call(V1) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER2(NAME, RETURN, V1, V2) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2> { public: NAME() { } virtual RETURN Call(V1, V2); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2> { public: RETURN Call(V1, V2) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER3(NAME, RETURN, V1, V2, V3) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3> { public: NAME() { } virtual RETURN Call(V1, V2, V3); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3> { public: RETURN Call(V1, V2, V3) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER4(NAME, RETURN, V1, V2, V3, V4) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4> { public: RETURN Call(V1, V2, V3, V4) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER5(NAME, RETURN, V1, V2, V3, V4, V5) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5> { public: RETURN Call(V1, V2, V3, V4, V5) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER6(NAME, RETURN, V1, V2, V3, V4, V5, V6) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6> { public: RETURN Call(V1, V2, V3, V4, V5, V6) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER7(NAME, RETURN, V1, V2, V3, V4, V5, V6, V7) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7> { public: RETURN Call(V1, V2, V3, V4, V5, V6, V7) CXX11_OVERRIDE; }
 
 #define DEFINE_HANDLER8(NAME, RETURN, V1, V2, V3, V4, V5, V6, V7, V8) \
-	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: NAME() { } virtual RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8); }
+	class CoreExport NAME : public Handler<RETURN, V1, V2, V3, V4, V5, V6, V7, V8> { public: RETURN Call(V1, V2, V3, V4, V5, V6, V7, V8) CXX11_OVERRIDE; }
 
 #else
 
diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h
index 070858cc5..03ffae905 100644
--- a/include/commands/cmd_whowas.h
+++ b/include/commands/cmd_whowas.h
@@ -203,5 +203,5 @@ class CommandWhowas : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 };
diff --git a/include/configreader.h b/include/configreader.h
index 69c98a55e..db7258d4e 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -516,7 +516,7 @@ class CoreExport ConfigReaderThread : public Thread
 		delete Config;
 	}
 
-	void Run();
+	void Run() CXX11_OVERRIDE;
 	/** Run in the main thread to apply the configuration */
 	void Finish();
 	bool IsDone() { return done; }
diff --git a/include/ctables.h b/include/ctables.h
index bba395919..43a311a66 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -236,7 +236,7 @@ class CoreExport SplitCommand : public Command
  public:
 	SplitCommand(Module* me, const std::string &cmd, unsigned int minpara = 0, unsigned int maxpara = 0)
 		: Command(me, cmd, minpara, maxpara) {}
-	virtual CmdResult Handle(const std::vector<std::string>& parameters, User* user);
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 	virtual CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user);
 	virtual CmdResult HandleRemote(const std::vector<std::string>& parameters, RemoteUser* user);
 	virtual CmdResult HandleServer(const std::vector<std::string>& parameters, FakeUser* user);
diff --git a/include/extensible.h b/include/extensible.h
index 1da45cee6..afb1cd5b6 100644
--- a/include/extensible.h
+++ b/include/extensible.h
@@ -111,7 +111,7 @@ class CoreExport Extensible : public classbase
 	inline const ExtensibleStore& GetExtList() const { return extensions; }
 
 	Extensible();
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 	virtual ~Extensible();
 	void doUnhookExtensions(const std::vector<reference<ExtensionItem> >& toRemove);
 
@@ -145,9 +145,9 @@ class CoreExport LocalExtItem : public ExtensionItem
  public:
 	LocalExtItem(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~LocalExtItem();
-	virtual std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-	virtual void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
-	virtual void free(void* item) = 0;
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
+	void free(void* item) CXX11_OVERRIDE = 0;
 };
 
 template <typename T, typename Del = stdalgo::defaultdeleter<T> >
@@ -190,7 +190,7 @@ class SimpleExtItem : public LocalExtItem
 		del(old);
 	}
 
-	virtual void free(void* item)
+	void free(void* item) CXX11_OVERRIDE
 	{
 		Del del;
 		del(static_cast<T*>(item));
@@ -202,8 +202,8 @@ class CoreExport LocalStringExt : public SimpleExtItem<std::string>
  public:
 	LocalStringExt(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~LocalStringExt();
-	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 };
 
 class CoreExport LocalIntExt : public LocalExtItem
@@ -211,12 +211,12 @@ class CoreExport LocalIntExt : public LocalExtItem
  public:
 	LocalIntExt(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~LocalIntExt();
-	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 	intptr_t get(const Extensible* container) const;
 	intptr_t set(Extensible* container, intptr_t value);
 	void unset(Extensible* container) { set(container, 0); }
-	void free(void* item);
+	void free(void* item) CXX11_OVERRIDE;
 };
 
 class CoreExport StringExtItem : public ExtensionItem
@@ -225,9 +225,9 @@ class CoreExport StringExtItem : public ExtensionItem
 	StringExtItem(const std::string& key, ExtensibleType exttype, Module* owner);
 	virtual ~StringExtItem();
 	std::string* get(const Extensible* container) const;
-	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-	void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 	void set(Extensible* container, const std::string& value);
 	void unset(Extensible* container);
-	void free(void* item);
+	void free(void* item) CXX11_OVERRIDE;
 };
diff --git a/include/filelogger.h b/include/filelogger.h
index ce571c3ae..af43a6d90 100644
--- a/include/filelogger.h
+++ b/include/filelogger.h
@@ -33,5 +33,5 @@ class CoreExport FileLogStream : public LogStream
 
 	virtual ~FileLogStream();
 
-	virtual void OnLog(LogLevel loglevel, const std::string &type, const std::string &msg);
+	void OnLog(LogLevel loglevel, const std::string& type, const std::string& msg) CXX11_OVERRIDE;
 };
diff --git a/include/inspircd.h b/include/inspircd.h
index 5f5493350..47ec9e0e2 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -562,7 +562,7 @@ class CommandModule : public Module
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version(cmd.name, VF_VENDOR|VF_CORE);
 	}
diff --git a/include/inspsocket.h b/include/inspsocket.h
index 258d186b9..addb761d1 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -98,7 +98,7 @@ class CoreExport SocketTimeout : public Timer
 
 	/** Handle tick event
 	 */
-	virtual bool Tick(time_t now);
+	bool Tick(time_t now) CXX11_OVERRIDE;
 };
 
 /**
@@ -316,7 +316,7 @@ class CoreExport StreamSocket : public EventHandler
 	 */
 	virtual void Close();
 	/** This ensures that close is called prior to destructor */
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 
 	/** Get the IOHook of a module attached to this socket
 	 * @param mod Module whose IOHook to return
@@ -376,7 +376,7 @@ class CoreExport BufferedSocket : public StreamSocket
 	/** When there is data waiting to be read on a socket, the OnDataReady()
 	 * method is called.
 	 */
-	virtual void OnDataReady() CXX11_OVERRIDE = 0;
+	void OnDataReady() CXX11_OVERRIDE = 0;
 
 	/**
 	 * When an outbound connection fails, and the attempt times out, you
diff --git a/include/listmode.h b/include/listmode.h
index f978e9c9a..ba64f8b61 100644
--- a/include/listmode.h
+++ b/include/listmode.h
@@ -141,7 +141,7 @@ class CoreExport ListModeBase : public ModeHandler
 	 * @param user The user to send the list to
 	 * @param channel The channel the user is requesting the list for
 	 */
-	virtual void DisplayList(User* user, Channel* channel);
+	void DisplayList(User* user, Channel* channel) CXX11_OVERRIDE;
 
 	/** Tell a user that a list contains no elements.
 	 * Sends 'eolnum' numeric with text 'eolstr', unless overridden (see constructor)
@@ -149,7 +149,7 @@ class CoreExport ListModeBase : public ModeHandler
 	 * @param channel The channel that has the empty list
 	 * See mode.h
 	 */
-	virtual void DisplayEmptyList(User* user, Channel* channel);
+	void DisplayEmptyList(User* user, Channel* channel) CXX11_OVERRIDE;
 
 	/** Remove all instances of the mode from a channel.
 	 * Populates the given modestack with modes that remove every instance of
@@ -158,7 +158,7 @@ class CoreExport ListModeBase : public ModeHandler
 	 * @param channel The channel to remove all instances of the mode from
 	 * @param changelist Mode change list to populate with the removal of this mode
 	 */
-	virtual void RemoveMode(Channel* channel, Modes::ChangeList& changelist);
+	void RemoveMode(Channel* channel, Modes::ChangeList& changelist) CXX11_OVERRIDE;
 
 	/** Perform a rehash of this mode's configuration data
 	 */
@@ -167,7 +167,7 @@ class CoreExport ListModeBase : public ModeHandler
 	/** Handle the list mode.
 	 * See mode.h
 	 */
-	virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding) CXX11_OVERRIDE;
 
 	/** Validate parameters.
 	 * Overridden by implementing module.
diff --git a/include/mode.h b/include/mode.h
index 83b8f31be..f944da62c 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -167,7 +167,7 @@ class CoreExport ModeHandler : public ServiceProvider
 	 * @param mclass The object type of this mode handler, one of ModeHandler::Class
 	 */
 	ModeHandler(Module* me, const std::string& name, char modeletter, ParamSpec params, ModeType type, Class mclass = MC_OTHER);
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 	virtual ~ModeHandler();
 
 	/** Register this object in the ModeParser
@@ -396,7 +396,7 @@ class CoreExport PrefixMode : public ModeHandler
 	 * The latter occurs either when the member cannot be found or when the member already has this prefix set
 	 * (when setting) or doesn't have this prefix set (when unsetting).
 	 */
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& param, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& param, bool adding) CXX11_OVERRIDE;
 
 	/**
 	 * Updates the configuration of this prefix.
@@ -412,7 +412,7 @@ class CoreExport PrefixMode : public ModeHandler
 	 * @param channel The channel which the server wants to remove your mode from
 	 * @param changelist Mode change list to populate with the removal of this mode
 	 */
-	void RemoveMode(Channel* channel, Modes::ChangeList& changelist);
+	void RemoveMode(Channel* channel, Modes::ChangeList& changelist) CXX11_OVERRIDE;
 
 
 	/**
@@ -447,7 +447,7 @@ class CoreExport SimpleUserModeHandler : public ModeHandler
  public:
 	SimpleUserModeHandler(Module* Creator, const std::string& Name, char modeletter)
 		: ModeHandler(Creator, Name, modeletter, PARAM_NONE, MODETYPE_USER) {}
-	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
 };
 
 /** A prebuilt mode handler which handles a simple channel mode, e.g. no parameters, usable by any user, with no extra
@@ -460,7 +460,7 @@ class CoreExport SimpleChannelModeHandler : public ModeHandler
  public:
 	SimpleChannelModeHandler(Module* Creator, const std::string& Name, char modeletter)
 		: ModeHandler(Creator, Name, modeletter, PARAM_NONE, MODETYPE_CHANNEL) {}
-	virtual ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding);
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
 };
 
 /**
diff --git a/include/modules.h b/include/modules.h
index 33b41e28f..ce2402964 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -286,7 +286,7 @@ class CoreExport Module : public classbase, public usecountbase
 	/** Clean up prior to destruction
 	 * If you override, you must call this AFTER your module's cleanup
 	 */
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 
 	/** Default destructor.
 	 * destroys a module class
diff --git a/include/modules/cap.h b/include/modules/cap.h
index 86a60c445..8299d14ae 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -32,8 +32,8 @@ namespace Cap
 	{
 	 public:
 		ExtItem(Module* mod);
-		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const;
-		void unserialize(SerializeFormat format, Extensible* container, const std::string& value);
+		std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE;
+		void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE;
 	};
 
 	class Capability;
diff --git a/include/modules/dns.h b/include/modules/dns.h
index f3bf45916..3db651798 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -191,7 +191,7 @@ namespace DNS
 		/** Used to time out the query, calls OnError and asks the TimerManager
 		 * to delete this request
 		 */
-		bool Tick(time_t now)
+		bool Tick(time_t now) CXX11_OVERRIDE
 		{
 			Query rr(this->question);
 			rr.error = ERROR_TIMEDOUT;
diff --git a/include/threadengine.h b/include/threadengine.h
index fec1bbb96..964b8d796 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -108,7 +108,7 @@ class CoreExport QueuedThread : public Thread
 		queue.Wakeup();
 		queue.Unlock();
 	}
-	virtual void SetExitFlag()
+	void SetExitFlag() CXX11_OVERRIDE
 	{
 		queue.Lock();
 		Thread::SetExitFlag();
@@ -157,7 +157,7 @@ class CoreExport SocketThread : public Thread
 		queue.Wakeup();
 		queue.Unlock();
 	}
-	virtual void SetExitFlag()
+	void SetExitFlag() CXX11_OVERRIDE
 	{
 		queue.Lock();
 		Thread::SetExitFlag();
diff --git a/include/users.h b/include/users.h
index 40c99517d..12a311980 100644
--- a/include/users.h
+++ b/include/users.h
@@ -727,7 +727,7 @@ class CoreExport User : public Extensible
 	/** Default destructor
 	 */
 	virtual ~User();
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 };
 
 class CoreExport UserIOHandler : public StreamSocket
@@ -735,8 +735,8 @@ class CoreExport UserIOHandler : public StreamSocket
  public:
 	LocalUser* const user;
 	UserIOHandler(LocalUser* me) : user(me) {}
-	void OnDataReady();
-	void OnError(BufferedSocketError error);
+	void OnDataReady() CXX11_OVERRIDE;
+	void OnError(BufferedSocketError error) CXX11_OVERRIDE;
 
 	/** Adds to the user's write buffer.
 	 * You may add any amount of text up to this users sendq value, if you exceed the
@@ -914,9 +914,9 @@ class CoreExport FakeUser : public User
 		nick = sname;
 	}
 
-	virtual CullResult cull() CXX11_OVERRIDE;
-	virtual const std::string& GetFullHost() CXX11_OVERRIDE;
-	virtual const std::string& GetFullRealHost() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
+	const std::string& GetFullHost() CXX11_OVERRIDE;
+	const std::string& GetFullRealHost() CXX11_OVERRIDE;
 };
 
 /* Faster than dynamic_cast */
diff --git a/include/xline.h b/include/xline.h
index c2ede29df..9aae32b24 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -170,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 std::string& Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
-	virtual bool IsBurstable();
+	bool IsBurstable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -216,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 std::string& Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -258,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 std::string& Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Ident mask (ident part only)
 	 */
@@ -301,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 std::string& Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** IP mask (no ident part)
 	 */
@@ -336,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 std::string& Displayable();
+	const std::string& Displayable() CXX11_OVERRIDE;
 
 	/** Nickname mask
 	 */