diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/inputseq.h | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff) |
BIG update.
Remove redundant machine items from address_space and device_t.
Neither machine nor m_machine are directly accessible anymore.
Instead a new getter machine() is available which returns a
machine reference. So:
space->machine->xxx ==> space->machine().xxx
device->machine->yyy ==> device->machine().yyy
Globally changed all running_machine pointers to running_machine
references. Any function/method that takes a running_machine takes
it as a required parameter (1 or 2 exceptions). Being consistent
here gets rid of a lot of odd &machine or *machine, but it does
mean a very large bulk change across the project.
Structs which have a running_machine * now have that variable
renamed to m_machine, and now have a shiny new machine() method
that works like the space and device methods above. Since most of
these are things that should eventually be devices anyway, consider
this a step in that direction.
98% of the update was done with regex searches. The changes are
architected such that the compiler will catch the remaining
errors:
// find things that use an embedded machine directly and replace
// with a machine() getter call
S: ->machine->
R: ->machine\(\)\.
// do the same if via a reference
S: \.machine->
R: \.machine\(\)\.
// convert function parameters to running_machine &
S: running_machine \*machine([^;])
R: running_machine \&machine\1
// replace machine-> with machine.
S: machine->
R: machine\.
// replace &machine() with machine()
S: \&([()->a-z0-9_]+machine\(\))
R: \1
// sanity check: look for this used as a cast
(running_machine &)
// and change to this:
*(running_machine *)
Diffstat (limited to 'src/emu/inputseq.h')
-rw-r--r-- | src/emu/inputseq.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/inputseq.h b/src/emu/inputseq.h index aa1f65f841d..d0d344ee12d 100644 --- a/src/emu/inputseq.h +++ b/src/emu/inputseq.h @@ -71,33 +71,33 @@ struct _input_seq /* ----- state queries ----- */ /* return TRUE if the given switch sequence has been pressed */ -int input_seq_pressed(running_machine *machine, const input_seq *seq); +int input_seq_pressed(running_machine &machine, const input_seq *seq); /* return the value of an axis sequence */ -INT32 input_seq_axis_value(running_machine *machine, const input_seq *seq, input_item_class *itemclass_ptr); +INT32 input_seq_axis_value(running_machine &machine, const input_seq *seq, input_item_class *itemclass_ptr); /* ----- sequence polling ----- */ /* begin polling for a new sequence of the given itemclass */ -void input_seq_poll_start(running_machine *machine, input_item_class itemclass, const input_seq *startseq); +void input_seq_poll_start(running_machine &machine, input_item_class itemclass, const input_seq *startseq); /* continue polling for a sequence */ -int input_seq_poll(running_machine *machine, input_seq *finalseq); +int input_seq_poll(running_machine &machine, input_seq *finalseq); /* ----- strings and tokenization ----- */ /* generate the friendly name of an input sequence */ -astring &input_seq_name(running_machine *machine, astring &string, const input_seq *seq); +astring &input_seq_name(running_machine &machine, astring &string, const input_seq *seq); /* convert an input sequence to tokens, returning the length */ -astring &input_seq_to_tokens(running_machine *machine, astring &string, const input_seq *seq); +astring &input_seq_to_tokens(running_machine &machine, astring &string, const input_seq *seq); /* convert a set of tokens back to an input sequence */ -int input_seq_from_tokens(running_machine *machine, const char *string, input_seq *seq); +int input_seq_from_tokens(running_machine &machine, const char *string, input_seq *seq); |