Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename static wxModule::m_modules to use "ms_" prefix

Browse Source 
No real changes, just use consisting naming convention.

Better late than never.
This commit is contained in:
Vadim Zeitlin
2021-03-07 20:07:42 +01:00
parent 8d01aaf783
commit 628514bcd3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/module.h
View File

@@ -54,14 +54,14 @@ public:
static void RegisterModule(wxModule *module); static void RegisterModule(wxModule *module);
static void RegisterModules(); static void RegisterModules();
static bool InitializeModules(); static bool InitializeModules();
static void CleanUpModules() { DoCleanUpModules(m_modules); } static void CleanUpModules() { DoCleanUpModules(ms_modules); }
// used by wxObjectLoader when unloading shared libs's // used by wxObjectLoader when unloading shared libs's
static void UnregisterModule(wxModule *module); static void UnregisterModule(wxModule *module);
protected: protected:
static wxModuleList m_modules; static wxModuleList ms_modules;
// the function to call from constructor of a deriving class add module // the function to call from constructor of a deriving class add module
// dependency which will be initialized before the module and unloaded // dependency which will be initialized before the module and unloaded
@@ -89,7 +89,7 @@ private:
// cleanup the modules in the specified list (which may not contain all // cleanup the modules in the specified list (which may not contain all
// modules if we're called during initialization because not all modules // modules if we're called during initialization because not all modules
// could be initialized) and also empty m_modules itself // could be initialized) and also empty ms_modules itself
static void DoCleanUpModules(const wxModuleList& modules); static void DoCleanUpModules(const wxModuleList& modules);
// resolve all named dependencies and add them to the normal m_dependencies // resolve all named dependencies and add them to the normal m_dependencies

14
src/common/module.cpp
View File

@@ -28,17 +28,17 @@ WX_DEFINE_LIST(wxModuleList)
wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject) wxIMPLEMENT_ABSTRACT_CLASS(wxModule, wxObject)
wxModuleList wxModule::m_modules; wxModuleList wxModule::ms_modules;
void wxModule::RegisterModule(wxModule* module) void wxModule::RegisterModule(wxModule* module)
{ {
module->m_state = State_Registered; module->m_state = State_Registered;
m_modules.Append(module); ms_modules.Append(module);
} }
void wxModule::UnregisterModule(wxModule* module) void wxModule::UnregisterModule(wxModule* module)
{ {
m_modules.DeleteObject(module); ms_modules.DeleteObject(module);
delete module; delete module;
} }
@@ -101,7 +101,7 @@ bool wxModule::DoInitializeModule(wxModule *module,
} }
// find the module in the registered modules list // find the module in the registered modules list
for ( node = m_modules.GetFirst(); node; node = node->GetNext() ) for ( node = ms_modules.GetFirst(); node; node = node->GetNext() )
{ {
wxModule *moduleDep = node->GetData(); wxModule *moduleDep = node->GetData();
if ( moduleDep->GetClassInfo() == cinfo ) if ( moduleDep->GetClassInfo() == cinfo )
@@ -146,7 +146,7 @@ bool wxModule::InitializeModules()
{ {
wxModuleList initializedModules; wxModuleList initializedModules;
for ( wxModuleList::compatibility_iterator node = m_modules.GetFirst(); for ( wxModuleList::compatibility_iterator node = ms_modules.GetFirst();
node; node;
node = node->GetNext() ) node = node->GetNext() )
{ {
@@ -168,7 +168,7 @@ bool wxModule::InitializeModules()
} }
// remember the real initialisation order // remember the real initialisation order
m_modules = initializedModules; ms_modules = initializedModules;
return true; return true;
} }
@@ -195,7 +195,7 @@ void wxModule::DoCleanUpModules(const wxModuleList& modules)
} }
// clear all modules, even the non-initialized ones // clear all modules, even the non-initialized ones
WX_CLEAR_LIST(wxModuleList, m_modules); WX_CLEAR_LIST(wxModuleList, ms_modules);
} }
bool wxModule::ResolveNamedDependencies() bool wxModule::ResolveNamedDependencies()