summaryrefslogtreecommitdiffstatshomepage
path: root/src/frontend
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-06-18 10:59:37 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-06-18 15:32:15 +0200
commitd705e4a28d49b9eeeadc9c019a12cf580ae5ee8f (patch)
tree9f5c5e7c75d3799a398d84fa3f0153ee417eb4c0 /src/frontend
parentcb9d158d572edbf2dc665d87d993dc729a85b6ae (diff)
ioport tagged_list to unordered_map (nw)
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/mame/info.cpp30
-rw-r--r--src/frontend/mame/luaengine.cpp8
-rw-r--r--src/frontend/mame/ui/cheatopt.cpp4
-rw-r--r--src/frontend/mame/ui/devopt.cpp4
-rw-r--r--src/frontend/mame/ui/inputmap.cpp12
-rw-r--r--src/frontend/mame/ui/ui.cpp8
6 files changed, 33 insertions, 33 deletions
diff --git a/src/frontend/mame/info.cpp b/src/frontend/mame/info.cpp
index 423eda91680..db9f003f09d 100644
--- a/src/frontend/mame/info.cpp
+++ b/src/frontend/mame/info.cpp
@@ -261,9 +261,9 @@ void info_xml_creator::output_one()
{
int nplayers = 0;
bool new_kbd = false;
- for (ioport_port &port : portlist)
- if (&port.device() == &device)
- for (ioport_field &field : port.fields())
+ for (auto &port : portlist)
+ if (&port.second->device() == &device)
+ for (ioport_field &field : port.second->fields())
if (field.type() >= IPT_START && field.type() < IPT_ANALOG_LAST)
{
if (field.type() == IPT_KEYBOARD)
@@ -366,8 +366,8 @@ void info_xml_creator::output_one_device(device_t &device, const char *devtag)
for (device_t &dev : device_iterator(device))
portlist.append(dev, errors);
// check if the device adds player inputs (other than dsw and configs) to the system
- for (ioport_port &port : portlist)
- for (ioport_field &field : port.fields())
+ for (auto &port : portlist)
+ for (ioport_field &field : port.second->fields())
if (field.type() >= IPT_START1 && field.type() < IPT_UI_FIRST)
{
has_input = TRUE;
@@ -891,11 +891,11 @@ void info_xml_creator::output_input(const ioport_list &portlist)
bool tilt = false;
// iterate over the ports
- for (ioport_port &port : portlist)
+ for (auto &port : portlist)
{
int ctrl_type = CTRL_DIGITAL_BUTTONS;
bool ctrl_analog = FALSE;
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
// track the highest player number
if (nplayer < field.player() + 1)
@@ -1317,13 +1317,13 @@ void info_xml_creator::output_input(const ioport_list &portlist)
void info_xml_creator::output_switches(const ioport_list &portlist, const char *root_tag, int type, const char *outertag, const char *innertag)
{
// iterate looking for DIP switches
- for (ioport_port &port : portlist)
- for (ioport_field &field : port.fields())
+ for (auto &port : portlist)
+ for (ioport_field &field : port.second->fields())
if (field.type() == type)
{
std::ostringstream output;
- std::string newtag(port.tag()), oldtag(":");
+ std::string newtag(port.second->tag()), oldtag(":");
newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
// output the switch name information
@@ -1351,10 +1351,10 @@ void info_xml_creator::output_switches(const ioport_list &portlist, const char *
void info_xml_creator::output_ports(const ioport_list &portlist)
{
// cycle through ports
- for (ioport_port &port : portlist)
+ for (auto &port : portlist)
{
- fprintf(m_output,"\t\t<port tag=\"%s\">\n", xml_normalize_string(port.tag()));
- for (ioport_field &field : port.fields())
+ fprintf(m_output,"\t\t<port tag=\"%s\">\n", xml_normalize_string(port.second->tag()));
+ for (ioport_field &field : port.second->fields())
{
if(field.is_analog())
fprintf(m_output,"\t\t\t<analog mask=\"%u\"/>\n", field.mask());
@@ -1373,8 +1373,8 @@ void info_xml_creator::output_ports(const ioport_list &portlist)
void info_xml_creator::output_adjusters(const ioport_list &portlist)
{
// iterate looking for Adjusters
- for (ioport_port &port : portlist)
- for (ioport_field &field : port.fields())
+ for (auto &port : portlist)
+ for (ioport_field &field : port.second->fields())
if (field.type() == IPT_ADJUSTER)
fprintf(m_output, "\t\t<adjuster name=\"%s\" default=\"%d\"/>\n", xml_normalize_string(field.name()), field.defvalue());
}
diff --git a/src/frontend/mame/luaengine.cpp b/src/frontend/mame/luaengine.cpp
index 1ab9ba8cc1a..be9a1e5f60d 100644
--- a/src/frontend/mame/luaengine.cpp
+++ b/src/frontend/mame/luaengine.cpp
@@ -644,8 +644,8 @@ luabridge::LuaRef lua_engine::l_ioport_get_ports(const ioport_manager *m)
lua_State *L = luaThis->m_lua_state;
luabridge::LuaRef port_table = luabridge::LuaRef::newTable(L);
- for (ioport_port &port : im->ports()) {
- port_table[port.tag()] = &port;
+ for (auto &port : im->ports()) {
+ port_table[port.second->tag()] = &port;
}
return port_table;
@@ -1977,9 +1977,9 @@ void lua_engine::update_machine()
if (m_machine!=nullptr)
{
// Create the ioport array
- for (ioport_port &port : machine().ioport().ports())
+ for (auto &port : machine().ioport().ports())
{
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
if (field.type_class() != INPUT_CLASS_INTERNAL)
{
diff --git a/src/frontend/mame/ui/cheatopt.cpp b/src/frontend/mame/ui/cheatopt.cpp
index fdcf26ea0ea..f72eed5d20f 100644
--- a/src/frontend/mame/ui/cheatopt.cpp
+++ b/src/frontend/mame/ui/cheatopt.cpp
@@ -276,10 +276,10 @@ void menu_autofire::populate()
/* iterate over the input ports and add autofire toggle items */
int menu_items = 0;
- for (ioport_port &port : machine().ioport().ports())
+ for (auto &port : machine().ioport().ports())
{
bool is_first_button = true;
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
if (field.type() >= IPT_BUTTON1 && field.type() <= IPT_BUTTON16)
{
diff --git a/src/frontend/mame/ui/devopt.cpp b/src/frontend/mame/ui/devopt.cpp
index 3b8fa1442c1..52e0264b43f 100644
--- a/src/frontend/mame/ui/devopt.cpp
+++ b/src/frontend/mame/ui/devopt.cpp
@@ -176,8 +176,8 @@ void menu_device_config::populate()
portlist.append(iptdev, errors);
// check if the device adds inputs to the system
- for (ioport_port &port : portlist)
- for (ioport_field &field : port.fields())
+ for (auto &port : portlist)
+ for (ioport_field &field : port.second->fields())
{
if (field.type() >= IPT_MAHJONG_FIRST && field.type() < IPT_MAHJONG_LAST)
input_mj++;
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp
index 5552f46d38c..766ce7cd05c 100644
--- a/src/frontend/mame/ui/inputmap.cpp
+++ b/src/frontend/mame/ui/inputmap.cpp
@@ -164,10 +164,10 @@ void menu_input_specific::populate()
suborder[SEQ_TYPE_INCREMENT] = 2;
/* iterate over the input ports and add menu items */
- for (ioport_port &port : machine().ioport().ports())
+ for (auto &port : machine().ioport().ports())
{
port_count++;
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
ioport_type_class type_class = field.type_class();
@@ -548,8 +548,8 @@ void menu_settings::populate()
diplist_tailptr = &diplist;
/* loop over input ports and set up the current values */
- for (ioport_port &port : machine().ioport().ports())
- for (ioport_field &field : port.fields())
+ for (auto &port : machine().ioport().ports())
+ for (ioport_field &field : port.second->fields())
if (field.type() == type && field.enabled())
{
UINT32 flags = 0;
@@ -818,8 +818,8 @@ void menu_analog::populate()
bool first_entry = true;
/* loop over input ports and add the items */
- for (ioport_port &port : machine().ioport().ports())
- for (ioport_field &field : port.fields())
+ for (auto &port : machine().ioport().ports())
+ for (ioport_field &field : port.second->fields())
if (field.is_analog() && field.enabled())
{
ioport_field::user_settings settings;
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index dd99faa9b63..21759412710 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -1657,9 +1657,9 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
// add analog adjusters
int slider_index = 0;
- for (ioport_port &port : machine.ioport().ports())
+ for (auto &port : machine.ioport().ports())
{
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
if (field.type() == IPT_ADJUSTER)
{
@@ -1763,9 +1763,9 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
#ifdef MAME_DEBUG
slider_index = 0;
// add crosshair adjusters
- for (ioport_port &port : machine.ioport().ports())
+ for (auto &port : machine.ioport().ports())
{
- for (ioport_field &field : port.fields())
+ for (ioport_field &field : port.second->fields())
{
if (field.crosshair_axis() != CROSSHAIR_AXIS_NONE && field.player() == 0)
{