diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-04-01 06:50:56 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-04-01 06:50:56 +0000 |
commit | 8409f7d3233f0dd5d211f68e564ca4ebb662f8bf (patch) | |
tree | 3edea78fc971015d4b0799f6c5999657685df573 /src/mame/includes/ccastles.h | |
parent | 86afc9b913dd13338a8888f27bb13d1548ef8f33 (diff) |
Final bulk rename for 0.142: ensure that all members of
driver_device classes have an m_ prefix on them. When we
eventually move functions using these into member functions,
we will be able to remove the state-> pointers, and having
the member variables prefixed will allow them to be
distinguished from local variables.
Some regex'es used (plus manually fixing the remaining stuff):
In src/mame/...
state->([a-zA-Z_][^_][a-zA-Z0-9_]*)
state->m_\1
state->([^m]_[a-zA-Z0-9_]*)
state->m_\1
state->m_save_item
state->save_item
state->m_save_pointer
state->save_pointer
(AM_BASE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_])
\1m_\2
(AM_BASE_SIZE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_][a-zA-Z0-9_]* *, *)([a-zA-Z_][^_])
\1m_\2m_\3
(AM_SIZE_MEMBER *\( *[a-zA-Z0-9_]+ *, *)([a-zA-Z_][^_])
\1m_\2
m__
m_
In src/mame/includes/...
(\t[a-zA-Z0-9_<>]+[ \t]+[&*]*[ \t]*)([a-zA-Z_][^_][][a-zA-Z0-9_]*;)$
\1m_\2
(\t[a-zA-Z0-9_<>]+[ \t]*[&*]*[ \t]+)([a-zA-Z_][^_][][a-zA-Z0-9_]*;)$
\1m_\2
Diffstat (limited to 'src/mame/includes/ccastles.h')
-rw-r--r-- | src/mame/includes/ccastles.h | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 7c5793ad5a9..56bc7273a0c 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -12,36 +12,38 @@ class ccastles_state : public driver_device public: ccastles_state(running_machine &machine, const driver_device_config_base &config) : driver_device(machine, config), - maincpu(*this, "maincpu"), - nvram_4b(*this, "nvram_4b"), - nvram_4a(*this, "nvram_4a") { } + m_maincpu(*this, "maincpu"), + m_nvram_4b(*this, "nvram_4b"), + m_nvram_4a(*this, "nvram_4a") { } /* memory pointers */ - UINT8 * videoram; - UINT8 * spriteram; + UINT8 * m_videoram; + UINT8 * m_spriteram; /* video-related */ - const UINT8 *syncprom; - const UINT8 *wpprom; - const UINT8 *priprom; - bitmap_t *spritebitmap; - double rweights[3], gweights[3], bweights[3]; - UINT8 video_control[8]; - UINT8 bitmode_addr[2]; - UINT8 hscroll; - UINT8 vscroll; + const UINT8 *m_syncprom; + const UINT8 *m_wpprom; + const UINT8 *m_priprom; + bitmap_t *m_spritebitmap; + double m_rweights[3]; + double m_gweights[3]; + double m_bweights[3]; + UINT8 m_video_control[8]; + UINT8 m_bitmode_addr[2]; + UINT8 m_hscroll; + UINT8 m_vscroll; /* misc */ - int vblank_start; - int vblank_end; - emu_timer *irq_timer; - UINT8 irq_state; - UINT8 nvram_store[2]; + int m_vblank_start; + int m_vblank_end; + emu_timer *m_irq_timer; + UINT8 m_irq_state; + UINT8 m_nvram_store[2]; /* devices */ - required_device<m6502_device> maincpu; - required_device<x2212_device> nvram_4b; - required_device<x2212_device> nvram_4a; + required_device<m6502_device> m_maincpu; + required_device<x2212_device> m_nvram_4b; + required_device<x2212_device> m_nvram_4a; }; |