Remove virtual User::GetClass() (but keep LocalUser::GetClass())

3 files changed, 6 insertions, 19 deletions

diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp
index 8e227723e..b28e57b2f 100644
--- a/src/commands/cmd_motd.cpp
+++ b/src/commands/cmd_motd.cpp
@@ -54,8 +54,9 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
 		return CMD_SUCCESS;
 
 	ConfigTag* tag = NULL;
-	if (IS_LOCAL(user))
-		tag = user->GetClass()->config;
+	LocalUser* localuser = IS_LOCAL(user);
+	if (localuser)
+		tag = localuser->GetClass()->config;
 	std::string motd_name = tag->getString("motd", "motd");
 	ConfigFileCache::iterator motd = ServerInstance->Config->Files.find(motd_name);
 	if (motd == ServerInstance->Config->Files.end())
diff --git a/src/commands/cmd_rules.cpp b/src/commands/cmd_rules.cpp
index 5d41aa4b8..76ee0061b 100644
--- a/src/commands/cmd_rules.cpp
+++ b/src/commands/cmd_rules.cpp
@@ -52,8 +52,9 @@ CmdResult CommandRules::Handle (const std::vector<std::string>& parameters, User
 		return CMD_SUCCESS;
 
 	ConfigTag* tag = NULL;
-	if (IS_LOCAL(user))
-		tag = user->GetClass()->config;
+	LocalUser* localuser = IS_LOCAL(user);
+	if (localuser)
+		tag = localuser->GetClass()->config;
 	std::string rules_name = tag->getString("rules", "rules");
 	ConfigFileCache::iterator rules = ServerInstance->Config->Files.find(rules_name);
 	if (rules == ServerInstance->Config->Files.end())
diff --git a/src/users.cpp b/src/users.cpp
index 3bc196321..b49587b38 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1278,21 +1278,6 @@ void LocalUser::SetClass(const std::string &explicit_name)
 	}
 }
 
-/* looks up a users password for their connection class (<ALLOW>/<DENY> tags)
- * NOTE: If the <ALLOW> or <DENY> tag specifies an ip, and this user resolves,
- * then their ip will be taken as 'priority' anyway, so for example,
- * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
- */
-ConnectClass* LocalUser::GetClass()
-{
-	return MyClass;
-}
-
-ConnectClass* User::GetClass()
-{
-	return NULL;
-}
-
 void User::PurgeEmptyChannels()
 {
 	// firstly decrement the count on each channel