From f54ad1f22075940dff3b6ec6d4c39e92425793d7 Mon Sep 17 00:00:00 2001
From: Mikaela Suomalainen <mikaela+git@mikaela.info>
Date: Sat, 19 Sep 2015 08:40:53 +0300
Subject: [PATCH 1/2] perform: say "number" instead of "nr"

I think it's inconsistent that perform uses abbreviation "nr" of "number"
while it talks about "command" instead of "cmd".
---
 modules/perform.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/perform.cpp b/modules/perform.cpp
index fbf7cbaa..419ee4f6 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -92,11 +92,11 @@ public:
 		AddCommand("Add",     static_cast<CModCommand::ModCmdFunc>(&CPerform::Add),
 			"<command>");
 		AddCommand("Del",     static_cast<CModCommand::ModCmdFunc>(&CPerform::Del),
-			"<nr>");
+			"<number>");
 		AddCommand("List",    static_cast<CModCommand::ModCmdFunc>(&CPerform::List));
 		AddCommand("Execute", static_cast<CModCommand::ModCmdFunc>(&CPerform::Execute));
 		AddCommand("Swap",    static_cast<CModCommand::ModCmdFunc>(&CPerform::Swap),
-			"<nr> <nr>");
+			"<number> <number>");
 	}
 
 	virtual ~CPerform() {}

From 3058a0e69a69119494dbbb6b3cac1575686f191d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 19 Sep 2015 21:01:20 +0200
Subject: [PATCH 2/2] Fix warnings [-Winconsistent-missing-override]

---
 include/znc/HTTPSock.h   | 8 ++++----
 include/znc/WebModules.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/znc/HTTPSock.h b/include/znc/HTTPSock.h
index 6ec5cee2..ed85d8b1 100644
--- a/include/znc/HTTPSock.h
+++ b/include/znc/HTTPSock.h
@@ -30,10 +30,10 @@ public:
 	virtual ~CHTTPSock();
 
 	// Csocket derived members
-	virtual void ReadData(const char* data, size_t len);
-	virtual void ReadLine(const CString& sData);
-	virtual void Connected();
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort) = 0;
+	void ReadData(const char* data, size_t len) override;
+	void ReadLine(const CString& sData) override;
+	void Connected() override;
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override = 0;
 	// !Csocket derived members
 
 	// Hooks
diff --git a/include/znc/WebModules.h b/include/znc/WebModules.h
index 947cac9f..8e74bdc9 100644
--- a/include/znc/WebModules.h
+++ b/include/znc/WebModules.h
@@ -134,7 +134,7 @@ public:
 
 	std::shared_ptr<CWebSession> GetSession();
 
-	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
+	Csock* GetSockObj(const CString& sHost, unsigned short uPort) override;
 	static CString GetSkinPath(const CString& sSkinName);
 	void GetAvailSkins(VCString& vRet) const;
 	CString GetSkinName();