diff options
author | 2016-10-22 13:13:17 +0200 | |
---|---|---|
committer | 2016-10-22 13:13:17 +0200 | |
commit | ddb290d5f615019c33c42b8d94e5a5254cabcf33 (patch) | |
tree | a70f688b0df3acd19da7b1151e5902e3c6af3fa5 /src/frontend/mame/ui/inputmap.cpp | |
parent | 333bff8de64dfaeb98134000412796b4fdef970b (diff) |
NOTICE (TYPE NAME CONSOLIDATION)
Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8
also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8
Diffstat (limited to 'src/frontend/mame/ui/inputmap.cpp')
-rw-r--r-- | src/frontend/mame/ui/inputmap.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp index a45438f38ba..c4071f503be 100644 --- a/src/frontend/mame/ui/inputmap.cpp +++ b/src/frontend/mame/ui/inputmap.cpp @@ -174,7 +174,7 @@ void menu_input_specific::populate() if (field.enabled() && (type_class == INPUT_CLASS_CONTROLLER || type_class == INPUT_CLASS_MISC || type_class == INPUT_CLASS_KEYBOARD)) { input_seq_type seqtype; - UINT32 sortorder; + uint32_t sortorder; /* determine the sorting order */ if (type_class == INPUT_CLASS_CONTROLLER) @@ -405,7 +405,7 @@ void menu_input::populate_and_sort(input_item_data *itemlist) /* build the menu */ for (curitem = 0; curitem < numitems; curitem++) { - UINT32 flags = 0; + uint32_t flags = 0; /* generate the name of the item itself, based off the base name and the type */ item = itemarray[curitem]; @@ -533,7 +533,7 @@ void menu_settings::handle() switches menus -------------------------------------------------*/ -menu_settings::menu_settings(mame_ui_manager &mui, render_container &container, UINT32 _type) : menu(mui, container), diplist(nullptr), dipcount(0) +menu_settings::menu_settings(mame_ui_manager &mui, render_container &container, uint32_t _type) : menu(mui, container), diplist(nullptr), dipcount(0) { type = _type; } @@ -554,7 +554,7 @@ void menu_settings::populate() for (ioport_field &field : port.second->fields()) if (field.type() == type && field.enabled()) { - UINT32 flags = 0; + uint32_t flags = 0; /* set the left/right flags appropriately */ if (field.has_previous_setting()) @@ -580,7 +580,7 @@ void menu_settings::populate() if (type == IPT_DIPSWITCH && !field.diplocations().empty()) { ioport_field::user_settings settings; - UINT32 accummask = field.mask(); + uint32_t accummask = field.mask(); /* get current settings */ field.get_user_settings(settings); @@ -588,7 +588,7 @@ void menu_settings::populate() /* iterate over each bit in the field */ for (const ioport_diplocation &diploc : field.diplocations()) { - UINT32 mask = accummask & ~(accummask - 1); + uint32_t mask = accummask & ~(accummask - 1); dip_descriptor *dip; /* find the matching switch name */ @@ -651,7 +651,7 @@ void menu_settings_dip_switches::custom_render(void *selectedref, float top, flo // iterate over DIP switches for (dip_descriptor *dip = diplist; dip != nullptr; dip = dip->next) { - UINT32 selectedmask = 0; + uint32_t selectedmask = 0; // determine the mask of selected bits if ((uintptr_t)selectedref != 1) @@ -676,7 +676,7 @@ void menu_settings_dip_switches::custom_render(void *selectedref, float top, flo DIP switch -------------------------------------------------*/ -void menu_settings_dip_switches::custom_render_one(float x1, float y1, float x2, float y2, const dip_descriptor *dip, UINT32 selectedmask) +void menu_settings_dip_switches::custom_render_one(float x1, float y1, float x2, float y2, const dip_descriptor *dip, uint32_t selectedmask) { float switch_field_width = SINGLE_TOGGLE_SWITCH_FIELD_WIDTH * container().manager().ui_aspect(); float switch_width = SINGLE_TOGGLE_SWITCH_WIDTH * container().manager().ui_aspect(); @@ -857,7 +857,7 @@ void menu_analog::populate() if (type != ANALOG_ITEM_CENTERSPEED || use_autocenter) { analog_item_data *data; - UINT32 flags = 0; + uint32_t flags = 0; std::string text; std::string subtext; if (strcmp(field.device().tag(), prev_owner.c_str()) != 0) |