diff -r 7d3a2a8d5bf5 -r 4c46acf7e76f sourcemm/CPlugin.h --- a/sourcemm/CPlugin.h Fri Aug 12 17:33:59 2005 +0000 +++ b/sourcemm/CPlugin.h Fri Aug 12 17:44:53 2005 +0000 @@ -21,8 +21,8 @@ #include #include "IPluginManager.h" #include "oslink.h" -#include "smm_list.h" -#include "smm_string.h" +#include "sh_list.h" +#include "sh_string.h" /** * History of plugin versions: (M=min, C=current) @@ -54,14 +54,14 @@ CPlugin(); public: PluginId m_Id; - String m_File; + SourceHook::String m_File; Pl_Status m_Status; PluginId m_Source; ISmmPlugin *m_API; HINSTANCE m_Lib; factories fac_list; - List m_Cvars; - List m_Cmds; + SourceHook::List m_Cvars; + SourceHook::List m_Cmds; }; public: CPluginManager(); @@ -102,8 +102,8 @@ bool Retry(PluginId id, char *error, size_t len); //Internal iterators - List::iterator _begin(); - List::iterator _end(); + SourceHook::List::iterator _begin(); + SourceHook::List::iterator _end(); private: //These are identical internal functions for the wrappers above. CPlugin *_Load(const char *file, PluginId source, char *error, size_t maxlen); @@ -113,12 +113,12 @@ void UnregAllConCmds(CPlugin *pl); private: PluginId m_LastId; - List m_Plugins; + SourceHook::List m_Plugins; bool m_AllLoaded; }; }; -typedef List::iterator PluginIter; +typedef SourceHook::List::iterator PluginIter; /** @brief Singleton for plugin manager */ extern SourceMM::CPluginManager g_PluginMngr;