summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-04 07:03:38 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-04 07:03:38 +0100
commit41681c1703244abe68cbcf3096ca259bd061cc08 (patch)
tree85d24789ff864e1b0f35fb87f0c58bad5925e27d /src/mame/includes
parent0c56ac848dd0eba359500d444ecbb51f215ff5b9 (diff)
clang-modernize part 4
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/apollo.h6
-rw-r--r--src/mame/includes/bullet.h2
-rw-r--r--src/mame/includes/bw2.h2
-rw-r--r--src/mame/includes/chihiro.h8
-rw-r--r--src/mame/includes/decocass.h2
-rw-r--r--src/mame/includes/fm7.h2
-rw-r--r--src/mame/includes/hp48.h4
-rw-r--r--src/mame/includes/jaguar.h6
-rw-r--r--src/mame/includes/msx.h4
-rw-r--r--src/mame/includes/namcos2.h2
-rw-r--r--src/mame/includes/osborne1.h8
-rw-r--r--src/mame/includes/sage2.h2
-rw-r--r--src/mame/includes/samcoupe.h16
-rw-r--r--src/mame/includes/segaorun.h4
-rw-r--r--src/mame/includes/segas16b.h2
-rw-r--r--src/mame/includes/segaybd.h2
-rw-r--r--src/mame/includes/sms.h2
-rw-r--r--src/mame/includes/svi318.h2
-rw-r--r--src/mame/includes/trs80.h36
-rw-r--r--src/mame/includes/trs80m2.h2
-rw-r--r--src/mame/includes/xbox.h2
21 files changed, 58 insertions, 58 deletions
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 79b884ba218..bccc6cea044 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -371,9 +371,9 @@ public:
virtual bool is_creatable() const { return 1; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 0; }
- virtual const char *image_interface() const { return NULL; }
+ virtual const char *image_interface() const { return nullptr; }
virtual const char *file_extensions() const { return "ani,bin"; }
- virtual const option_guide *create_option_guide() const { return NULL; }
+ virtual const option_guide *create_option_guide() const { return nullptr; }
DECLARE_WRITE16_MEMBER(write);
DECLARE_READ16_MEMBER(read);
@@ -615,7 +615,7 @@ public:
private:
running_machine &machine() const
{
- assert(m_machine != NULL);
+ assert(m_machine != nullptr);
return *m_machine;
}
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index 390aac07ad8..701346156c7 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -46,7 +46,7 @@ public:
m_floppy5(*this, MB8877_TAG":5"),
m_floppy6(*this, MB8877_TAG":6"),
m_floppy7(*this, MB8877_TAG":7"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_centronics(*this, CENTRONICS_TAG),
m_rom(*this, Z80_TAG),
m_sw1(*this, "SW1"),
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index 563ce4b4acd..624a086862f 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -43,7 +43,7 @@ public:
m_ram(*this, RAM_TAG),
m_floppy0(*this, WD2797_TAG":0"),
m_floppy1(*this, WD2797_TAG":1"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_rom(*this, Z80_TAG),
m_y0(*this, "Y0"),
m_y1(*this, "Y1"),
diff --git a/src/mame/includes/chihiro.h b/src/mame/includes/chihiro.h
index c91a9a23fdb..a61383cd8ca 100644
--- a/src/mame/includes/chihiro.h
+++ b/src/mame/includes/chihiro.h
@@ -228,13 +228,13 @@ public:
colorformat_rendertarget = nv2a_renderer::NV2A_COLOR_FORMAT_A8R8G8B8;
bytespixel_rendertarget = 4;
antialias_control = 0;
- rendertarget = NULL;
- depthbuffer = NULL;
- displayedtarget = NULL;
+ rendertarget = nullptr;
+ depthbuffer = nullptr;
+ displayedtarget = nullptr;
puller_channel = 0;
puller_waiting = 0;
debug_grab_texttype = -1;
- debug_grab_textfile = NULL;
+ debug_grab_textfile = nullptr;
waitvblank_used = 1;
memset(vertex_attribute_words, 0, sizeof(vertex_attribute_words));
memset(vertex_attribute_offset, 0, sizeof(vertex_attribute_offset));
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index d395ab02aec..b0f6161a7ce 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -35,7 +35,7 @@ public:
m_screen(*this, "screen"),
m_palette(*this, "palette")
{
- m_type1_map = 0;
+ m_type1_map = nullptr;
}
/* devices */
diff --git a/src/mame/includes/fm7.h b/src/mame/includes/fm7.h
index 797d19657f0..00698e8cf74 100644
--- a/src/mame/includes/fm7.h
+++ b/src/mame/includes/fm7.h
@@ -135,7 +135,7 @@ public:
m_fdc(*this, "fdc"),
m_floppy0(*this, "fdc:0"),
m_floppy1(*this, "fdc:1"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_kanji(*this, "kanji1"),
m_key1(*this, "key1"),
m_key2(*this, "key2"),
diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h
index 70780f2817d..e6a9533e004 100644
--- a/src/mame/includes/hp48.h
+++ b/src/mame/includes/hp48.h
@@ -191,9 +191,9 @@ public:
virtual bool is_creatable() const { return 1; }
virtual bool must_be_loaded() const { return 0; }
virtual bool is_reset_on_load() const { return 0; }
- virtual const char *image_interface() const { return NULL; }
+ virtual const char *image_interface() const { return nullptr; }
virtual const char *file_extensions() const { return "crd"; }
- virtual const option_guide *create_option_guide() const { return NULL; }
+ virtual const option_guide *create_option_guide() const { return nullptr; }
virtual bool call_load();
virtual void call_unload();
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index f57ebdd135c..3a85ceb106d 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -49,14 +49,14 @@ public:
m_using_cart(false),
m_misc_control_data(0),
m_eeprom_enable(true),
- m_gpu_jump_address(NULL),
+ m_gpu_jump_address(nullptr),
m_gpu_command_pending(false),
m_gpu_spin_pc(0),
- m_main_speedup(NULL),
+ m_main_speedup(nullptr),
m_main_speedup_hits(0),
m_main_speedup_last_cycles(0),
m_main_speedup_max_cycles(0),
- m_main_gpu_wait(NULL),
+ m_main_gpu_wait(nullptr),
m_joystick_data(0),
m_eeprom_bit_count(0),
m_protection_check(0) ,
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index d849693ec14..c52d8d7bef7 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -153,7 +153,7 @@ public:
{
for (int page = 0; page < 4; page++ )
{
- m_all_slots[prim][sec][page] = NULL;
+ m_all_slots[prim][sec][page] = nullptr;
}
}
}
@@ -210,7 +210,7 @@ public:
DECLARE_WRITE_LINE_MEMBER(msx_irq_source3) { msx_irq_source(3, state); } // sometimes expansion slot
protected:
- virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == 0) ? &m_switched_device_as_config : NULL; }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == 0) ? &m_switched_device_as_config : nullptr; }
private:
required_device<z80_device> m_maincpu;
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 5baea40c092..47c76014fa7 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -105,7 +105,7 @@ public:
m_gametype(0),
m_c169_roz_videoram(*this, "rozvideoram", 0),
m_c169_roz_gfxbank(0),
- m_c169_roz_mask(NULL),
+ m_c169_roz_mask(nullptr),
m_c355_obj_gfxbank(0),
m_c355_obj_palxor(0),
m_maincpu(*this, "maincpu"),
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index be11edb2927..b84cf506787 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -54,10 +54,10 @@ public:
m_bank_0xxx(*this, "bank_0xxx"),
m_bank_1xxx(*this, "bank_1xxx"),
m_bank_fxxx(*this, "bank_fxxx"),
- m_video_timer(NULL),
- m_p_chargen(NULL),
- m_tilemap(NULL),
- m_acia_rxc_txc_timer(NULL)
+ m_video_timer(nullptr),
+ m_p_chargen(nullptr),
+ m_tilemap(nullptr),
+ m_acia_rxc_txc_timer(nullptr)
{ }
diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h
index a8138e3c716..49a2b6249f8 100644
--- a/src/mame/includes/sage2.h
+++ b/src/mame/includes/sage2.h
@@ -39,7 +39,7 @@ public:
m_ram(*this, RAM_TAG),
m_floppy0(*this, UPD765_TAG ":0"),
m_floppy1(*this, UPD765_TAG ":1"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_centronics(*this, CENTRONICS_TAG),
m_ieee488(*this, IEEE488_TAG),
m_reset(1),
diff --git a/src/mame/includes/samcoupe.h b/src/mame/includes/samcoupe.h
index e576e32f782..ef72ffd10bf 100644
--- a/src/mame/includes/samcoupe.h
+++ b/src/mame/includes/samcoupe.h
@@ -77,14 +77,14 @@ public:
m_io_mouse_y(*this, "mouse_y"),
m_config(*this, "config")
{
- sam_bank_read_ptr[0] = NULL;
- sam_bank_write_ptr[0] = NULL;
- sam_bank_read_ptr[1] = NULL;
- sam_bank_write_ptr[1] = NULL;
- sam_bank_read_ptr[2] = NULL;
- sam_bank_write_ptr[2] = NULL;
- sam_bank_read_ptr[3] = NULL;
- sam_bank_write_ptr[3] = NULL;
+ sam_bank_read_ptr[0] = nullptr;
+ sam_bank_write_ptr[0] = nullptr;
+ sam_bank_read_ptr[1] = nullptr;
+ sam_bank_write_ptr[1] = nullptr;
+ sam_bank_read_ptr[2] = nullptr;
+ sam_bank_write_ptr[2] = nullptr;
+ sam_bank_read_ptr[3] = nullptr;
+ sam_bank_write_ptr[3] = nullptr;
}
virtual void video_start();
diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h
index 603faccae0b..6fd0db83b74 100644
--- a/src/mame/includes/segaorun.h
+++ b/src/mame/includes/segaorun.h
@@ -37,9 +37,9 @@ public:
m_digital_ports(*this, digital_ports),
m_adc_ports(*this, "ADC"),
m_workram(*this, "workram"),
- m_custom_map(NULL),
+ m_custom_map(nullptr),
m_shangon_video(false),
- m_scanline_timer(NULL),
+ m_scanline_timer(nullptr),
m_irq2_state(0),
m_adc_select(0),
m_vblank_irq_state(0),
diff --git a/src/mame/includes/segas16b.h b/src/mame/includes/segas16b.h
index c0b241368df..7ceba71f17d 100644
--- a/src/mame/includes/segas16b.h
+++ b/src/mame/includes/segas16b.h
@@ -43,7 +43,7 @@ public:
m_romboard(ROM_BOARD_INVALID),
m_tilemap_type(SEGAIC16_TILEMAP_16B),
m_disable_screen_blanking(false),
- m_i8751_initial_config(NULL),
+ m_i8751_initial_config(nullptr),
m_atomicp_sound_divisor(0),
m_atomicp_sound_count(0),
m_hwc_input_value(0),
diff --git a/src/mame/includes/segaybd.h b/src/mame/includes/segaybd.h
index 65b7d811adc..4fa5ec131d7 100644
--- a/src/mame/includes/segaybd.h
+++ b/src/mame/includes/segaybd.h
@@ -32,7 +32,7 @@ public:
m_digital_ports(*this, digital_ports),
m_adc_ports(*this, "ADC"),
m_pdrift_bank(0),
- m_scanline_timer(NULL),
+ m_scanline_timer(nullptr),
m_irq2_scanline(0),
m_timer_irq_state(0),
m_vblank_irq_state(0),
diff --git a/src/mame/includes/sms.h b/src/mame/includes/sms.h
index 4f2efcdbbd3..541e298b4d0 100644
--- a/src/mame/includes/sms.h
+++ b/src/mame/includes/sms.h
@@ -49,7 +49,7 @@ public:
m_port_scope_binocular(*this, "SSCOPE_BINOCULAR"),
m_port_persist(*this, "PERSISTENCE"),
m_region_maincpu(*this, "maincpu"),
- m_mainram(NULL),
+ m_mainram(nullptr),
m_is_gamegear(0),
m_is_gg_region_japan(0),
m_is_smsj(0),
diff --git a/src/mame/includes/svi318.h b/src/mame/includes/svi318.h
index a699f6e9bfb..b0d851a8f2b 100644
--- a/src/mame/includes/svi318.h
+++ b/src/mame/includes/svi318.h
@@ -51,7 +51,7 @@ public:
m_joysticks(*this, "JOYSTICKS"),
m_buttons(*this, "BUTTONS"),
m_palette(*this, "palette"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_bank1(*this, "bank1"),
m_bank2(*this, "bank2"),
m_bank3(*this, "bank3"),
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index e4ced5999ab..f4a54afd4a3 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -51,24 +51,24 @@ public:
m_io_line5(*this, "LINE5"),
m_io_line6(*this, "LINE6"),
m_io_line7(*this, "LINE7"),
- m_bank1(NULL),
- m_bank2(NULL),
- m_bank3(NULL),
- m_bank4(NULL),
- m_bank5(NULL),
- m_bank6(NULL),
- m_bank7(NULL),
- m_bank8(NULL),
- m_bank9(NULL),
- m_bank11(NULL),
- m_bank12(NULL),
- m_bank13(NULL),
- m_bank14(NULL),
- m_bank15(NULL),
- m_bank16(NULL),
- m_bank17(NULL),
- m_bank18(NULL),
- m_bank19(NULL) { }
+ m_bank1(nullptr),
+ m_bank2(nullptr),
+ m_bank3(nullptr),
+ m_bank4(nullptr),
+ m_bank5(nullptr),
+ m_bank6(nullptr),
+ m_bank7(nullptr),
+ m_bank8(nullptr),
+ m_bank9(nullptr),
+ m_bank11(nullptr),
+ m_bank12(nullptr),
+ m_bank13(nullptr),
+ m_bank14(nullptr),
+ m_bank15(nullptr),
+ m_bank16(nullptr),
+ m_bank17(nullptr),
+ m_bank18(nullptr),
+ m_bank19(nullptr) { }
DECLARE_FLOPPY_FORMATS(floppy_formats);
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 94a85e36038..9f533cb9a6f 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -52,7 +52,7 @@ public:
m_floppy1(*this, FD1791_TAG":1"),
m_floppy2(*this, FD1791_TAG":2"),
m_floppy3(*this, FD1791_TAG":3"),
- m_floppy(NULL),
+ m_floppy(nullptr),
m_ram(*this, RAM_TAG),
m_kb(*this, TRS80M2_KEYBOARD_TAG),
m_rom(*this, Z80_TAG),
diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h
index 253d903b675..85e0c85af4d 100644
--- a/src/mame/includes/xbox.h
+++ b/src/mame/includes/xbox.h
@@ -203,7 +203,7 @@ class xbox_base_state : public driver_device
public:
xbox_base_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
- nvidia_nv2a(NULL),
+ nvidia_nv2a(nullptr),
debug_irq_active(false),
debug_irq_number(0),
m_maincpu(*this, "maincpu") { }