diff options
Diffstat (limited to 'src/osd/modules/osdmodule.cpp')
-rw-r--r-- | src/osd/modules/osdmodule.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/osd/modules/osdmodule.cpp b/src/osd/modules/osdmodule.cpp index e0d7781ace0..1c745effc6c 100644 --- a/src/osd/modules/osdmodule.cpp +++ b/src/osd/modules/osdmodule.cpp @@ -11,13 +11,13 @@ osd_module_manager::osd_module_manager() { for (int i=0; i<MAX_MODULES; i++) { - m_modules[i] = NULL; - m_selected[i] = NULL; + m_modules[i] = nullptr; + m_selected[i] = nullptr; } } osd_module_manager::~osd_module_manager() { - for (int i = 0; m_modules[i] != NULL; i++) + for (int i = 0; m_modules[i] != nullptr; i++) { m_modules[i]->~osd_module(); osd_free(m_modules[i]); @@ -32,7 +32,7 @@ void osd_module_manager::register_module(const module_type &mod_type) osd_printf_verbose("===> registered module %s %s\n", module->name(), module->type()); int i; - for (i = 0; m_modules[i] != NULL; i++) + for (i = 0; m_modules[i] != nullptr; i++) ; m_modules[i] = module; } @@ -55,7 +55,7 @@ osd_module *osd_module_manager::get_module_generic(const char *type, const char if (i>=0) return m_modules[i]; else - return NULL; + return nullptr; } osd_module *osd_module_manager::select_module(const char *type, const char *name) @@ -64,7 +64,7 @@ osd_module *osd_module_manager::select_module(const char *type, const char *name // FIXME: check if already exists! int i; - for (i = 0; m_selected[i] != NULL; i++) + for (i = 0; m_selected[i] != nullptr; i++) ; m_selected[i] = m; return m; @@ -72,7 +72,7 @@ osd_module *osd_module_manager::select_module(const char *type, const char *name void osd_module_manager::init(const osd_options &options) { - for (int i = 0; m_selected[i] != NULL; i++) + for (int i = 0; m_selected[i] != nullptr; i++) { m_selected[i]->init(options); } @@ -82,18 +82,18 @@ void osd_module_manager::exit() { // Find count int cnt; - for (cnt = 0; m_selected[cnt] != NULL; cnt++) + for (cnt = 0; m_selected[cnt] != nullptr; cnt++) ; for (int i = cnt - 1; i >= 0; i--) { m_selected[i]->exit(); - m_selected[i] = NULL; + m_selected[i] = nullptr; } } int osd_module_manager::get_module_index(const char *type, const char *name) { - for (int i = 0; m_modules[i] != NULL; i++) + for (int i = 0; m_modules[i] != nullptr; i++) { if (strcmp(m_modules[i]->type(), type) == 0 && ((name[0] == 0) || (strcmp(name, m_modules[i]->name())==0))) return i; @@ -104,7 +104,7 @@ int osd_module_manager::get_module_index(const char *type, const char *name) void osd_module_manager::get_module_names(const char *type, const int max, int *num, const char *names[]) { *num = 0; - for (int i = 0; m_modules[i] != NULL; i++) + for (int i = 0; m_modules[i] != nullptr; i++) { if ((strcmp(m_modules[i]->type(), type) == 0) && (*num < max)) { |