Merge branch '2.0' into 2.1.

7 files changed, 13 insertions, 10 deletions

diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 508274002..386978340 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -34,7 +34,7 @@ class AccessChanAccess : public ChanAccess
 		return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name);
 	}
 
-	Anope::string AccessSerialize() const
+	Anope::string AccessSerialize() const anope_override
 	{
 		return stringify(this->level);
 	}
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 179d04317..5fca415de 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -30,7 +30,7 @@ class FlagsChanAccess : public ChanAccess
 		return false;
 	}
 
-	Anope::string AccessSerialize() const
+	Anope::string AccessSerialize() const anope_override
 	{
 		return Anope::string(this->flags.begin(), this->flags.end());
 	}
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 403920030..2b0cf413f 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -37,7 +37,7 @@ class XOPChanAccess : public ChanAccess
 		return false;
 	}
 
-	Anope::string AccessSerialize() const
+	Anope::string AccessSerialize() const anope_override
 	{
 		return this->type;
 	}
@@ -489,7 +489,7 @@ class CommandCSXOP : public Command
 		return Anope::printf(Language::Translate(source.GetAccount(), _("Modify the list of %s users")), source.command.upper().c_str());
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelInfo *ci = ChannelInfo::Find(params[0]);
 		if (ci == NULL)
diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp
index 7a780c003..018872b7d 100644
--- a/modules/commands/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
@@ -60,6 +60,7 @@ class CommandNSInfo : public Command
 
 			InfoFormatter info(source.nc);
 
+			info[_("Account")] = na->nc->display;
 			if (nick_online)
 			{
 				bool shown = false;
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index c8fdeb344..6fd66a33f 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -179,6 +179,7 @@ class CommandNSRegister : public Command
 		}
 
 		if (Config->GetModule("nickserv")->Get<bool>("restrictopernicks"))
+		{
 			for (unsigned i = 0; i < Oper::opers.size(); ++i)
 			{
 				Oper *o = Oper::opers[i];
@@ -189,6 +190,7 @@ class CommandNSRegister : public Command
 					return;
 				}
 			}
+		}
 
 		unsigned int passlen = Config->GetModule("nickserv")->Get<unsigned>("passlen", "32");
 
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index d83e44025..f199cdad5 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -111,12 +111,12 @@ class MyNewsService : public NewsService
 		return new MyNewsItem();
 	}
 
-	void AddNewsItem(NewsItem *n)
+	void AddNewsItem(NewsItem *n) anope_override
 	{
 		this->newsItems[n->type].push_back(n);
 	}
 
-	void DelNewsItem(NewsItem *n)
+	void DelNewsItem(NewsItem *n) anope_override
 	{
 		std::vector<NewsItem *> &list = this->GetNewsList(n->type);
 		std::vector<NewsItem *>::iterator it = std::find(list.begin(), list.end(), n);
@@ -125,7 +125,7 @@ class MyNewsService : public NewsService
 		delete n;
 	}
 
-	std::vector<NewsItem *> &GetNewsList(NewsType t)
+	std::vector<NewsItem *> &GetNewsList(NewsType t) anope_override
 	{
 		return this->newsItems[t];
 	}
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index 4a0e92ed4..167115194 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -253,12 +253,12 @@ class CommandOSSXLineBase : public Command
 		return;
 	}
 
-	virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) = 0;
+	virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override = 0;
 };
 
 class CommandOSSNLine : public CommandOSSXLineBase
 {
-	XLineManager *xlm()
+	XLineManager *xlm() anope_override
 	{
 		return this->snlines;
 	}
@@ -484,7 +484,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 
 class CommandOSSQLine : public CommandOSSXLineBase
 {
-	XLineManager *xlm()
+	XLineManager *xlm() anope_override
 	{
 		return this->sqlines;
 	}