Rename ServiceProvider methods to avoid shadowing issues.

6 files changed, 7 insertions, 7 deletions

diff --git a/include/modules/cap.h b/include/modules/cap.h
index 7fe46c06e..106f0f7e5 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -234,7 +234,7 @@ namespace Cap
 		/** Get the name of the capability that's used in the protocol
 		 * @return Name of the capability as used in the protocol
 		 */
-		const std::string& GetName() const { return name; }
+		const std::string& GetName() const { return this->service_name; }
 
 		/** Check whether the capability is active. The cap must be active and registered to be used by users.
 		 * @return True if the cap is active, false if it has been deactivated
diff --git a/include/modules/cloak.h b/include/modules/cloak.h
index e11161f63..e4d97187f 100644
--- a/include/modules/cloak.h
+++ b/include/modules/cloak.h
@@ -129,7 +129,7 @@ private:
 
 protected:
 	Method(const Engine* engine, const std::shared_ptr<ConfigTag>& tag) ATTR_NOT_NULL(2)
-		: provname(engine->name)
+		: provname(engine->service_name)
 	{
 		irc::commasepstream klassstream(tag->getString("class"));
 		for (std::string klass; klassstream.GetToken(klass); )
@@ -183,7 +183,7 @@ public:
 	 */
 	bool IsProvidedBy(const ServiceProvider& prov) const
 	{
-		return prov.name == provname;
+		return prov.service_name == provname;
 	}
 };
 
diff --git a/include/modules/extban.h b/include/modules/extban.h
index c3e789890..6965d585f 100644
--- a/include/modules/extban.h
+++ b/include/modules/extban.h
@@ -262,7 +262,7 @@ public:
 	auto GetMatchFlags() const { return match_flags; }
 
 	/** Retrieves the name used in bans to signify this extban. */
-	const std::string& GetName() const { return name; }
+	const std::string& GetName() const { return service_name; }
 
 	/** Retrieves the type of this extban. */
 	virtual Type GetType() const = 0;
diff --git a/include/modules/hash.h b/include/modules/hash.h
index 40063e222..4af45c57c 100644
--- a/include/modules/hash.h
+++ b/include/modules/hash.h
@@ -126,7 +126,7 @@ public:
 	/** Retrieves the name of the hash algorithm. */
 	const char* GetAlgorithm() const
 	{
-		return name.c_str() + 5;
+		return this->service_name.c_str() + 5;
 	}
 
 	/** Quickly hashes the specified values and returns the digest. */
diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h
index 274a2af37..afb0b2f1e 100644
--- a/include/modules/ircv3.h
+++ b/include/modules/ircv3.h
@@ -47,7 +47,7 @@ namespace IRCv3
 		if (cap && cap->IsEnabled(user))
 			user->WriteRemoteReply(rt, command, code, std::forward<Args>(args)...);
 		else if (command)
-			user->WriteRemoteNotice("*** {}: {}", command->name, std::get<sizeof...(Args) - 1>(std::forward_as_tuple(args...)));
+			user->WriteRemoteNotice("*** {}: {}", command->service_name, std::get<sizeof...(Args) - 1>(std::forward_as_tuple(args...)));
 		else
 			user->WriteRemoteNotice("*** {}", std::get<sizeof...(Args) - 1>(std::forward_as_tuple(args...)));
 	}
diff --git a/include/modules/regex.h b/include/modules/regex.h
index 88b5a39be..2e4154490 100644
--- a/include/modules/regex.h
+++ b/include/modules/regex.h
@@ -82,7 +82,7 @@ public:
 	/** Retrieves the name of this regex engine. */
 	const char* GetName() const
 	{
-		return name.c_str() + 6;
+		return this->service_name.c_str() + 6;
 	}
 };