Remove more instances of SourceHook::List

Author: Kenzzer

core/CoreConfig.cpp

@@ -399,9 +399,9 @@ inline bool SM_CvarExistsInConfig(ke::HashMap<std::string, std::string, StringPo
 	return cvars.find(cvar_name).found();
 }
 
-bool SM_CvarExistsInPlugin(List<const ConVar *> &convars, const char *cvar_name)
+bool SM_CvarExistsInPlugin(std::list<const ConVar *> &convars, const char *cvar_name)
 {
-	for (List<const ConVar *>::iterator iter = convars.begin(); iter != convars.end(); iter++)
+	for (auto iter = convars.begin(); iter != convars.end(); iter++)
 	{
 		const ConVar *cvar = (*iter);
 #if SOURCE_ENGINE >= SE_ORANGEBOX
@@ -425,7 +425,7 @@ bool SM_CvarExistsInPlugin(List<const ConVar *> &convars, const char *cvar_name)
 bool SM_ConfigCheckRegeneration(
 	const char *file,
 	ke::HashMap<std::string, std::string, StringPolicy> &existing_cvars,
-	List<const ConVar *> &convars)
+	std::list<const ConVar *> &convars)
 {
 	FILE *fp = fopen(file, "rt");
 	if (!fp)
@@ -438,7 +438,7 @@ bool SM_ConfigCheckRegeneration(
 	fclose(fp);
 
 	/* #1. Check if the plugin's cvar list has a cvar that doesn't exist in the config file. */
-	for (List<const ConVar *>::iterator iter = convars.begin(); iter != convars.end(); iter++)
+	for (auto iter = convars.begin(); iter != convars.end(); iter++)
 	{
 		const ConVar *cvar = (*iter);
 #if SOURCE_ENGINE >= SE_ORANGEBOX
@@ -478,7 +478,7 @@ inline void SM_ExecuteConfigFile(const char *file)
 bool SM_GenerateConfigFile(
 	IPlugin *pl,
 	const char *file,
-	List<const ConVar *> &convars,
+	std::list<const ConVar *> &convars,
 	bool needs_regeneration = false,
 	ke::HashMap<std::string, std::string, StringPolicy> *existing_cvars = NULL)
 {
@@ -510,7 +510,7 @@ bool SM_GenerateConfigFile(
 	fprintf(fp, "\n\n");
 
 	float x;
-	for (List<const ConVar *>::iterator iter = convars.begin(); iter != convars.end(); iter++)
+	for (auto iter = convars.begin(); iter != convars.end(); iter++)
 	{
 		const ConVar *cvar = (*iter);
 #if SOURCE_ENGINE >= SE_ORANGEBOX
@@ -683,7 +683,7 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 		return can_create;
 	}
 
-	List<const ConVar *> *convars = NULL;
+	std::list<const ConVar *> *convars = nullptr;
 	if (!pl->GetProperty("ConVarList", (void **)&convars, false) || !convars)
 	{
 		if (file_exists)

extensions/structs/Struct.cpp

@@ -81,9 +81,7 @@ void StructInfo::AddMember( const char *name, MemberInfo *member )
 
 StructInfo::~StructInfo()
 {
-	SourceHook::List<MemberInfo *>::iterator iter;
-
-	iter = membersList.begin();
+	auto iter = membersList.begin();
 
 	while (iter != membersList.end())
 	{

extensions/structs/StructManager.cpp

@@ -42,9 +42,7 @@ void StructManager::AddStruct( const char *name, StructInfo *str )
 
 StructManager::~StructManager()
 {
-	SourceHook::List<StructInfo *>::iterator iter;
-
-	iter = structsList.begin();
+	auto iter = structsList.begin();
 
 	while (iter != structsList.end())
 	{

extensions/structs/StructManager.h

@@ -38,6 +38,8 @@
 #include "IHandleSys.h"
 #include "smsdk_ext.h"
 
+#include <list>
+
 int CheckBaseHandle(CBaseHandle &hndl);
 
 class StructManager : public IStructAbstracter
@@ -48,7 +50,7 @@ class StructManager : public IStructAbstracter
 	void AddStruct(const char *name, StructInfo *str);
 private:
 	KTrie<StructInfo *> structs;
-	SourceHook::List<StructInfo *> structsList;
+	std::list<StructInfo *> structsList;
 };
 
 extern StructManager g_StructManager;