Modernize various minor legacy C++isms.

24 files changed, 60 insertions, 80 deletions

diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index ce327c3e8..4cdec7d79 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -314,10 +314,8 @@ public:
 	{
 		this->LockQueue();
 
-		for (unsigned int i = 0; i < this->queries.size(); ++i)
+		for (auto& req : this->queries)
 		{
-			LDAPRequest* req = this->queries[i];
-
 			/* queries have no results yet */
 			req->result = new LDAPResult();
 			req->result->type = req->type;
@@ -328,10 +326,8 @@ public:
 		}
 		this->queries.clear();
 
-		for (unsigned int i = 0; i < this->results.size(); ++i)
+		for (auto& req : this->results)
 		{
-			LDAPRequest* req = this->results[i];
-
 			/* even though this may have already finished successfully we return that it didn't */
 			req->result->error = "LDAP Interface is going away";
 			req->inter->OnError(*req->result);
@@ -449,7 +445,7 @@ private:
 
 				std::vector<std::string> attrs;
 				for (int j = 0; j < count; ++j)
-					attrs.push_back(vals[j]->bv_val);
+					attrs.emplace_back(vals[j]->bv_val);
 				attributes[attr] = attrs;
 
 				ldap_value_free_len(vals);
@@ -477,9 +473,8 @@ private:
 			return;
 		}
 
-		for (unsigned int i = 0; i < q.size(); ++i)
+		for (auto& req : q)
 		{
-			LDAPRequest* req = q[i];
 			int ret = req->run();
 
 			if (ret == LDAP_SERVER_DOWN || ret == LDAP_TIMEOUT)
@@ -530,9 +525,8 @@ public:
 		this->results.swap(r);
 		this->UnlockQueue();
 
-		for (unsigned int i = 0; i < r.size(); ++i)
+		for (auto& req : r)
 		{
-			LDAPRequest* req = r[i];
 			LDAPInterface* li = req->inter;
 			LDAPResult* res = req->result;
 
@@ -585,9 +579,8 @@ public:
 			}
 		}
 
-		for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i)
+		for (auto& [_, conn] : LDAPServices)
 		{
-			LDAPService* conn = i->second;
 			ServerInstance->Modules.DelService(*conn);
 			conn->Stop();
 			conn->OnNotify();
@@ -640,9 +633,8 @@ public:
 
 	~ModuleLDAP() override
 	{
-		for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i)
+		for (auto& [_, conn] : LDAPServices)
 		{
-			LDAPService* conn = i->second;
 			conn->Stop();
 			conn->OnNotify();
 			delete conn;
diff --git a/src/modules/extra/m_log_json.cpp b/src/modules/extra/m_log_json.cpp
index 7f79c5e51..cc7ba9334 100644
--- a/src/modules/extra/m_log_json.cpp
+++ b/src/modules/extra/m_log_json.cpp
@@ -55,7 +55,7 @@ public:
 			ServerInstance->Timers.AddTimer(this);
 	}
 
-	~JSONMethod()
+	~JSONMethod() override
 	{
 		fclose(file);
 	}
diff --git a/src/modules/extra/m_log_syslog.cpp b/src/modules/extra/m_log_syslog.cpp
index d2da016be..6e94c76a1 100644
--- a/src/modules/extra/m_log_syslog.cpp
+++ b/src/modules/extra/m_log_syslog.cpp
@@ -84,7 +84,7 @@ public:
 		openlog("inspircd", LOG_NDELAY|LOG_PID, LOG_USER);
 	}
 
-	~ModuleLogSyslog()
+	~ModuleLogSyslog() override
 	{
 		closelog();
 	}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index ead27295e..5082de804 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -399,10 +399,10 @@ public:
 	{
 		std::string res;
 		unsigned int param = 0;
-		for(std::string::size_type i = 0; i < q.length(); i++)
+		for (const auto chr : q)
 		{
-			if (q[i] != '?')
-				res.push_back(q[i]);
+			if (chr != '?')
+				res.push_back(chr);
 			else if (param < p.size() && !EscapeString(call, p[param++], res))
 				return;
 		}
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index f2e23d2e0..ad3743ad9 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -124,7 +124,7 @@ public:
 			rows = ConvToNum<int>(PQcmdTuples(res));
 	}
 
-	~PgSQLresult()
+	~PgSQLresult() override
 	{
 		PQclear(res);
 	}
@@ -435,10 +435,10 @@ restart:
 	{
 		std::string res;
 		unsigned int param = 0;
-		for(std::string::size_type i = 0; i < q.length(); i++)
+		for (const auto chr : q)
 		{
-			if (q[i] != '?')
-				res.push_back(q[i]);
+			if (chr != '?')
+				res.push_back(chr);
 			else
 			{
 				if (param < p.size())
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 797f54a51..0ebd22452 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -141,7 +141,7 @@ public:
 		{
 			res.columns[i] = sqlite3_column_name(stmt, i);
 		}
-		while (1)
+		while (true)
 		{
 			err = sqlite3_step(stmt);
 			if (err == SQLITE_ROW)
@@ -183,10 +183,10 @@ public:
 	{
 		std::string res;
 		unsigned int param = 0;
-		for(std::string::size_type i = 0; i < q.length(); i++)
+		for (const auto chr : q)
 		{
-			if (q[i] != '?')
-				res.push_back(q[i]);
+			if (chr != '?')
+				res.push_back(chr);
 			else
 			{
 				if (param < p.size())
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index a7ad33aa4..a18cb6379 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -675,7 +675,6 @@ public:
 	OpenSSLIOHook(std::shared_ptr<IOHookProvider> hookprov, StreamSocket* sock, SSL* session)
 		: SSLIOHook(hookprov)
 		, sess(session)
-		, data_to_write(false)
 	{
 		// Create BIO instance and store a pointer to the socket in it which will be used by the read and write functions
 		BIO* bio = BIO_new(biomethods);
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 02db49a89..9b8eb2fe0 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -312,9 +312,9 @@ public:
 				std::string ipmask(user->nick);
 				ipmask.append(1, '!').append(user->MakeHostIP());
 
-				for(BanRedirectList::iterator redir = redirects->begin(); redir != redirects->end(); redir++)
+				for (const auto& redirect : *redirects)
 				{
-					if(InspIRCd::Match(user->GetFullRealHost(), redir->banmask) || InspIRCd::Match(user->GetFullHost(), redir->banmask) || InspIRCd::MatchCIDR(ipmask, redir->banmask))
+					if(InspIRCd::Match(user->GetFullRealHost(), redirect.banmask) || InspIRCd::Match(user->GetFullHost(), redirect.banmask) || InspIRCd::MatchCIDR(ipmask, redirect.banmask))
 					{
 						/* This prevents recursion when a user sets multiple ban redirects in a chain
 						 * (thanks Potter)
@@ -327,7 +327,7 @@ public:
 							return MOD_RES_DENY;
 
 						/* tell them they're banned and are being transferred */
-						Channel* destchan = ServerInstance->Channels.Find(redir->targetchan);
+						Channel* destchan = ServerInstance->Channels.Find(redirect.targetchan);
 						std::string destlimit;
 
 						if (destchan)
@@ -341,9 +341,9 @@ public:
 						else
 						{
 							user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (you're banned)");
-							user->WriteNumeric(470, chan->name, redir->targetchan, "You are banned from this channel, so you are automatically being transferred to the redirected channel.");
+							user->WriteNumeric(470, chan->name, redirect.targetchan, "You are banned from this channel, so you are automatically being transferred to the redirected channel.");
 							nofollow = true;
-							Channel::JoinUser(user, redir->targetchan);
+							Channel::JoinUser(user, redirect.targetchan);
 							nofollow = false;
 							return MOD_RES_DENY;
 						}
diff --git a/src/modules/m_bcrypt.cpp b/src/modules/m_bcrypt.cpp
index 17bd9e072..0e464081c 100644
--- a/src/modules/m_bcrypt.cpp
+++ b/src/modules/m_bcrypt.cpp
@@ -30,8 +30,8 @@ private:
 	std::string Salt()
 	{
 		char entropy[16];
-		for (unsigned int i = 0; i < sizeof(entropy); ++i)
-			entropy[i] = ServerInstance->GenRandomInt(0xFF);
+		for (char& chr : entropy)
+			chr = ServerInstance->GenRandomInt(0xFF);
 
 		char salt[32];
 		if (!_crypt_gensalt_blowfish_rn("$2a$", rounds, entropy, sizeof(entropy), salt, sizeof(salt)))
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index b4ba0d7ce..fcfea8a01 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -286,7 +286,7 @@ namespace
 		// XXX: Cast away the const because IS_LOCAL() doesn't handle it
 		LocalUser* user = IS_LOCAL(const_cast<User*>(static_cast<const User*>(container)));
 		if (!user)
-			return std::string();
+			return {};
 
 		// List requested caps
 		std::vector<std::string> result;
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 25651e84e..d35a6d270 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -158,10 +158,9 @@ private:
 
 	void AddTag(ClientProtocol::Message& msg, const std::string& tagkey, std::string& tagval)
 	{
-		const Events::ModuleEventProvider::SubscriberList& list = tagevent.GetSubscribers();
-		for (Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i)
+		for (const auto& subscriber : tagevent.GetSubscribers())
 		{
-			ClientProtocol::MessageTagProvider* const tagprov = static_cast<ClientProtocol::MessageTagProvider*>(*i);
+			ClientProtocol::MessageTagProvider* const tagprov = static_cast<ClientProtocol::MessageTagProvider*>(subscriber);
 			const ModResult res = tagprov->OnProcessTag(ServerInstance->FakeClient, tagkey, tagval);
 			if (res == MOD_RES_ALLOW)
 				msg.AddTag(tagkey, tagprov, tagval);
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 645345a82..75c480293 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -44,7 +44,7 @@ private:
 	unsigned int ipv6_cidr;
 	unsigned long bootwait;
 	unsigned long splitwait;
-	time_t ignoreuntil;
+	time_t ignoreuntil = 0;
 	std::string banmessage;
 
 	unsigned char GetRange(LocalUser* user)
@@ -86,7 +86,6 @@ public:
 		: Module(VF_VENDOR, "Z-lines IP addresses which make excessive connections to the server.")
 		, ServerProtocol::LinkEventListener(this)
 		, WebIRC::EventListener(this)
-		, ignoreuntil(0)
 	{
 	}
 
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 5838febd0..f113215f7 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -347,8 +347,8 @@ public:
 	void DisplayHelp(User* user)
 	{
 		user->WriteNumeric(RPL_HELPSTART, "*", "DCCALLOW [(+|-)<nick> [<time>]]|[LIST|HELP]");
-		for (size_t i = 0; i < sizeof(helptext)/sizeof(helptext[0]); i++)
-			user->WriteNumeric(RPL_HELPTXT, "*", helptext[i]);
+		for (const auto& helpline : helptext)
+			user->WriteNumeric(RPL_HELPTXT, "*", helpline);
 		user->WriteNumeric(RPL_ENDOFHELP, "*", "End of DCCALLOW HELP");
 
 		LocalUser* localuser = IS_LOCAL(user);
@@ -479,12 +479,12 @@ public:
 						std::string filename = buf.substr(first, s);
 
 						bool found = false;
-						for (unsigned int i = 0; i < bfl.size(); i++)
+						for (auto& bf : bfl)
 						{
-							if (InspIRCd::Match(filename, bfl[i].filemask, ascii_case_insensitive_map))
+							if (InspIRCd::Match(filename, bf.filemask, ascii_case_insensitive_map))
 							{
 								/* We have a matching badfile entry, override whatever the default action is */
-								if (stdalgo::string::equalsci(bfl[i].action, "allow"))
+								if (stdalgo::string::equalsci(bf.action, "allow"))
 									return MOD_RES_PASSTHRU;
 								else
 								{
diff --git a/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp
index db3da710b..393fb6297 100644
--- a/src/modules/m_haproxy.cpp
+++ b/src/modules/m_haproxy.cpp
@@ -136,7 +136,7 @@ class HAProxyHook final
 {
 private:
 	// The length of the address section.
-	uint16_t address_length;
+	uint16_t address_length = 0;
 
 	// The endpoint the client is connecting from.
 	irc::sockets::sockaddrs client;
@@ -151,7 +151,7 @@ private:
 	UserCertificateAPI& sslapi;
 
 	// The current state of the PROXY parser.
-	HAProxyState state;
+	HAProxyState state = HPS_WAITING_FOR_HEADER;
 
 	size_t ReadProxyTLV(StreamSocket* sock, size_t start_index, uint16_t buffer_length)
 	{
@@ -379,9 +379,7 @@ private:
 public:
 	HAProxyHook(std::shared_ptr<IOHookProvider> Prov, StreamSocket* sock, UserCertificateAPI& api)
 		: IOHookMiddle(Prov)
-		, address_length(0)
 		, sslapi(api)
-		, state(HPS_WAITING_FOR_HEADER)
 	{
 		sock->AddIOHook(this);
 	}
diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp
index 890301112..8dec3855d 100644
--- a/src/modules/m_hidelist.cpp
+++ b/src/modules/m_hidelist.cpp
@@ -72,7 +72,7 @@ public:
 			// If rank is set to 0 everyone inside the channel can view the list,
 			// but non-members may not
 			ModeHandler::Rank rank = tag->getUInt("rank", HALFOP_VALUE);
-			newconfigs.push_back(std::make_pair(modename, rank));
+			newconfigs.emplace_back(modename, rank);
 		}
 
 		stdalgo::delete_all(watchers);
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index 96295ed6a..1f0b7e437 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -324,11 +324,11 @@ private:
 
 	ModResult CopyClientTags(const ClientProtocol::TagMap& tags_in, ClientProtocol::TagMap& tags_out)
 	{
-		for (ClientProtocol::TagMap::const_iterator i = tags_in.begin(); i != tags_in.end(); ++i)
+		for (const auto& tag_in : tags_in)
 		{
-			const ClientProtocol::MessageTagData& tagdata = i->second;
+			const ClientProtocol::MessageTagData& tagdata = tag_in.second;
 			if (tagdata.tagprov == &c2ctags)
-				tags_out.insert(*i);
+				tags_out.insert(tag_in);
 		}
 		return MOD_RES_PASSTHRU;
 	}
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 24ccc0be2..f7e4aaa1d 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -135,7 +135,7 @@ class ModuleJoinFlood final
 {
 private:
 	JoinFlood jf;
-	time_t ignoreuntil;
+	time_t ignoreuntil = 0;
 	unsigned long bootwait;
 	unsigned long splitwait;
 
@@ -144,7 +144,6 @@ public:
 		: Module(VF_VENDOR, "Adds channel mode j (joinflood) which helps protect against spammers which mass-join channels.")
 		, ServerProtocol::LinkEventListener(this)
 		, jf(this)
-		, ignoreuntil(0)
 	{
 	}
 
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 35c2f12ce..47e3098ca 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -353,7 +353,7 @@ public:
 			const std::string val = rtag->getString("value");
 
 			if (!attr.empty() && !val.empty())
-				requiredattributes.push_back(make_pair(attr, val));
+				requiredattributes.emplace_back(attr, val);
 		}
 
 		std::string allowpattern = tag->getString("allowpattern");
@@ -380,7 +380,7 @@ public:
 		{
 			if (InspIRCd::Match(user->nick, allowpattern))
 			{
-				ldapAuthed.Set(user,1);
+				ldapAuthed.Set(user, true);
 				return MOD_RES_PASSTHRU;
 			}
 		}
@@ -389,7 +389,7 @@ public:
 		{
 			if (InspIRCd::MatchCIDR(user->GetIPString(), whitelistedcidr, ascii_case_insensitive_map))
 			{
-				ldapAuthed.Set(user,1);
+				ldapAuthed.Set(user, true);
 				return MOD_RES_PASSTHRU;
 			}
 		}
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp
index def2c6f5e..3ca8030f1 100644
--- a/src/modules/m_monitor.cpp
+++ b/src/modules/m_monitor.cpp
@@ -23,18 +23,15 @@
 #include "modules/isupport.h"
 #include "numericbuilder.h"
 
-namespace IRCv3
+namespace IRCv3::Monitor
 {
-	namespace Monitor
-	{
-		class ExtItem;
-		struct Entry;
-		class Manager;
-		class ManagerInternal;
+	class ExtItem;
+	struct Entry;
+	class Manager;
+	class ManagerInternal;
 
-		typedef std::vector<Entry*> WatchedList;
-		typedef std::vector<LocalUser*> WatcherList;
-	}
+	typedef std::vector<Entry*> WatchedList;
+	typedef std::vector<LocalUser*> WatcherList;
 }
 
 struct IRCv3::Monitor::Entry final
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index e9c43c7d8..be87576b5 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -108,10 +108,8 @@ public:
 				if (user->HasPrivPermission("users/ignore-noctcp"))
 					return MOD_RES_PASSTHRU;
 
-				const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-				for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
+				for (auto* u : ServerInstance->Users.GetLocalUsers())
 				{
-					LocalUser* u = *iter;
 					if (u->IsModeSet(ncu))
 						details.exemptions.insert(u);
 				}
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 7823b1869..59e2b48a3 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -76,7 +76,7 @@ public:
 	{
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, Modes::Change& change) override
 	{
 		ModeAction res = SimpleUserMode::OnModeChange(source, dest, channel, change);
 		if (change.adding && res == MODEACTION_ALLOW && IS_LOCAL(dest) && timeout)
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 3132083d1..87e1e6ad2 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -44,9 +44,9 @@ private:
 		if (user->HasPrivPermission("channels/restricted-create"))
 			return true;
 
-		for (AllowChans::const_iterator it = allowchans.begin(), it_end = allowchans.end(); it != it_end; ++it)
+		for (const auto& allowchan : allowchans)
 		{
-			if (InspIRCd::Match(name, *it))
+			if (InspIRCd::Match(name, allowchan))
 				return true;
 		}
 
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 2100080dd..7bca715db 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -189,7 +189,7 @@ private:
 		params.reserve(3);
 		params.push_back(user->GetRealHost());
 		params.push_back(user->GetIPString());
-		params.push_back(sslapi && sslapi->GetCertificate(user) ? "S" : "P");
+		params.emplace_back(sslapi && sslapi->GetCertificate(user) ? "S" : "P");
 
 		SendSASL(user, "*", 'H', params);
 	}
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index bb5633988..602c0dde4 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -291,10 +291,9 @@ void TreeSocket::ProcessTag(User* source, const std::string& tag, ClientProtocol
 		tagkey.assign(tag);
 	}
 
-	const Events::ModuleEventProvider::SubscriberList& list = Utils->Creator->tagevprov.GetSubscribers();
-	for (Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i)
+	for (const auto& subscriber : Utils->Creator->tagevprov.GetSubscribers())
 	{
-		ClientProtocol::MessageTagProvider* const tagprov = static_cast<ClientProtocol::MessageTagProvider*>(*i);
+		ClientProtocol::MessageTagProvider* const tagprov = static_cast<ClientProtocol::MessageTagProvider*>(subscriber);
 		const ModResult res = tagprov->OnProcessTag(source, tagkey, tagval);
 		if (res == MOD_RES_ALLOW)
 			tags.emplace(tagkey, ClientProtocol::MessageTagData(tagprov, tagval));