From c256741488caac06ad79288b8aacc665ce429cfa Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Tue, 6 Mar 2007 06:49:35 +0000 Subject: [PATCH] Renamed CConVarManager to ConVarManager --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40586 --- .../{CConVarManager.cpp => ConVarManager.cpp} | 34 +++++++++---------- core/{CConVarManager.h => ConVarManager.h} | 14 ++++---- core/msvc8/sourcemod_mm.vcproj | 16 ++++----- core/smn_console.cpp | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) rename core/{CConVarManager.cpp => ConVarManager.cpp} (87%) rename core/{CConVarManager.h => ConVarManager.h} (88%) diff --git a/core/CConVarManager.cpp b/core/ConVarManager.cpp similarity index 87% rename from core/CConVarManager.cpp rename to core/ConVarManager.cpp index 5c6e6f02..5f4b50e7 100644 --- a/core/CConVarManager.cpp +++ b/core/ConVarManager.cpp @@ -11,7 +11,7 @@ * Version: $Id$ */ -#include "CConVarManager.h" +#include "ConVarManager.h" #include "PluginSys.h" #include "ForwardSys.h" #include "HandleSys.h" @@ -19,31 +19,31 @@ #include "sm_stringutil.h" #include -CConVarManager g_ConVarManager; +ConVarManager g_ConVarManager; -CConVarManager::CConVarManager() : m_ConVarType(0) +ConVarManager::ConVarManager() : m_ConVarType(0) { // Create a convar lookup trie m_ConVarCache = sm_trie_create(); } -CConVarManager::~CConVarManager() +ConVarManager::~ConVarManager() { - List::iterator i; + List::iterator iter; // Destroy our convar lookup trie sm_trie_destroy(m_ConVarCache); // Destroy all the ConVarInfo structures - for (i = m_ConVars.begin(); i != m_ConVars.end(); i++) + for (iter = m_ConVars.begin(); iter != m_ConVars.end(); iter++) { - delete (*i); + delete (*iter); } m_ConVars.clear(); } -void CConVarManager::OnSourceModAllInitialized() +void ConVarManager::OnSourceModAllInitialized() { HandleAccess sec; @@ -59,7 +59,7 @@ void CConVarManager::OnSourceModAllInitialized() g_RootMenu.AddRootConsoleCommand("convars", "View convars created by a plugin", this); } -void CConVarManager::OnSourceModShutdown() +void ConVarManager::OnSourceModShutdown() { IChangeableForward *fwd; List::iterator i; @@ -83,7 +83,7 @@ void CConVarManager::OnSourceModShutdown() g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent); } -void CConVarManager::OnPluginDestroyed(IPlugin *plugin) +void ConVarManager::OnPluginDestroyed(IPlugin *plugin) { CVector *cvarList; @@ -94,7 +94,7 @@ void CConVarManager::OnPluginDestroyed(IPlugin *plugin) } } -void CConVarManager::OnHandleDestroy(HandleType_t type, void *object) +void ConVarManager::OnHandleDestroy(HandleType_t type, void *object) { ConVarInfo *info; ConVar *pConVar = static_cast(object); @@ -115,7 +115,7 @@ void CConVarManager::OnHandleDestroy(HandleType_t type, void *object) } } -void CConVarManager::OnRootConsoleCommand(const char *command, unsigned int argcount) +void ConVarManager::OnRootConsoleCommand(const char *command, unsigned int argcount) { if (argcount >= 3) { @@ -162,7 +162,7 @@ void CConVarManager::OnRootConsoleCommand(const char *command, unsigned int argc g_RootMenu.ConsolePrint("[SM] Usage: sm convars "); } -Handle_t CConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *helpText, int flags, bool hasMin, float min, bool hasMax, float max) +Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *helpText, int flags, bool hasMin, float min, bool hasMax, float max) { ConVar *pConVar = NULL; ConVarInfo *info = NULL; @@ -246,7 +246,7 @@ Handle_t CConVarManager::CreateConVar(IPluginContext *pContext, const char *name return hndl; } -Handle_t CConVarManager::FindConVar(const char *name) +Handle_t ConVarManager::FindConVar(const char *name) { ConVar *pConVar = NULL; ConVarInfo *info = NULL; @@ -285,7 +285,7 @@ Handle_t CConVarManager::FindConVar(const char *name) return hndl; } -void CConVarManager::HookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) +void ConVarManager::HookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) { IPluginFunction *func = pContext->GetFunctionById(funcid); IChangeableForward *fwd = NULL; @@ -329,7 +329,7 @@ void CConVarManager::HookConVarChange(IPluginContext *pContext, ConVar *pConVar, fwd->AddFunction(func); } -void CConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) +void ConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *pConVar, funcid_t funcid) { IPluginFunction *func = pContext->GetFunctionById(funcid); IChangeableForward *fwd = NULL; @@ -375,7 +375,7 @@ void CConVarManager::UnhookConVarChange(IPluginContext *pContext, ConVar *pConVa } } -void CConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue) +void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue) { // If the values are the same... if (strcmp(pConVar->GetString(), oldValue) == 0) diff --git a/core/CConVarManager.h b/core/ConVarManager.h similarity index 88% rename from core/CConVarManager.h rename to core/ConVarManager.h index aeecbf74..1ac8b1f9 100644 --- a/core/CConVarManager.h +++ b/core/ConVarManager.h @@ -11,8 +11,8 @@ * Version: $Id$ */ -#ifndef _INCLUDE_SOURCEMOD_CCONVARMANAGER_H_ -#define _INCLUDE_SOURCEMOD_CCONVARMANAGER_H_ +#ifndef _INCLUDE_SOURCEMOD_CONVARMANAGER_H_ +#define _INCLUDE_SOURCEMOD_CONVARMANAGER_H_ #include "sm_globals.h" #include "sourcemm_api.h" @@ -36,15 +36,15 @@ struct ConVarInfo FnChangeCallback origCallback; /**< The original callback function */ }; -class CConVarManager : +class ConVarManager : public SMGlobalClass, public IHandleTypeDispatch, public IPluginsListener, public IRootConsoleCommand { public: - CConVarManager(); - ~CConVarManager(); + ConVarManager(); + ~ConVarManager(); public: // SMGlobalClass void OnSourceModAllInitialized(); void OnSourceModShutdown(); @@ -102,7 +102,7 @@ private: Trie *m_ConVarCache; }; -extern CConVarManager g_ConVarManager; +extern ConVarManager g_ConVarManager; -#endif // _INCLUDE_SOURCEMOD_CCONVARMANAGER_H_ +#endif // _INCLUDE_SOURCEMOD_CONVARMANAGER_H_ diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj index f46797f1..5ee357db 100644 --- a/core/msvc8/sourcemod_mm.vcproj +++ b/core/msvc8/sourcemod_mm.vcproj @@ -183,10 +183,6 @@ RelativePath="..\AdminCache.cpp" > - - @@ -211,6 +207,10 @@ RelativePath="..\ConCmdManager.cpp" > + + @@ -269,10 +269,6 @@ RelativePath="..\AdminCache.h" > - - @@ -305,6 +301,10 @@ RelativePath="..\ConCmdManager.h" > + + diff --git a/core/smn_console.cpp b/core/smn_console.cpp index 497e93f7..b0de00c0 100644 --- a/core/smn_console.cpp +++ b/core/smn_console.cpp @@ -14,7 +14,7 @@ #include "sm_globals.h" #include "sourcemm_api.h" #include "HandleSys.h" -#include "CConVarManager.h" +#include "ConVarManager.h" #include "ConCmdManager.h" #include "PluginSys.h" #include "sm_stringutil.h"