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/utils.h | |
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/utils.h')
-rw-r--r-- | src/frontend/mame/ui/utils.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/frontend/mame/ui/utils.h b/src/frontend/mame/ui/utils.h index 5e6c2f6acfd..29ce34abe87 100644 --- a/src/frontend/mame/ui/utils.h +++ b/src/frontend/mame/ui/utils.h @@ -19,7 +19,7 @@ #define MAX_CUST_FILTER 8 // GLOBAL ENUMERATORS -enum : UINT16 +enum : uint16_t { FILTER_FIRST = 0, FILTER_ALL = FILTER_FIRST, @@ -84,7 +84,7 @@ enum HIDE_BOTH }; -enum : UINT16 +enum : uint16_t { UI_SW_FIRST = 0, UI_SW_ALL = UI_SW_FIRST, @@ -130,7 +130,7 @@ struct ui_software_info { ui_software_info() {} ui_software_info(std::string sname, std::string lname, std::string pname, std::string y, std::string pub, - UINT8 s, std::string pa, const game_driver *d, std::string li, std::string i, std::string is, UINT8 em, + uint8_t s, std::string pa, const game_driver *d, std::string li, std::string i, std::string is, uint8_t em, std::string plong, std::string u, std::string de, bool av) { shortname = sname; longname = lname; parentname = pname; year = y; publisher = pub; @@ -142,13 +142,13 @@ struct ui_software_info std::string parentname; std::string year; std::string publisher; - UINT8 supported = 0; + uint8_t supported = 0; std::string part; const game_driver *driver = nullptr; std::string listname; std::string interface; std::string instance; - UINT8 startempty = 0; + uint8_t startempty = 0; std::string parentlongname; std::string usage; std::string devicetype; @@ -174,7 +174,7 @@ struct c_mnfct static std::string getname(const char *str); static std::vector<std::string> ui; static std::unordered_map<std::string, int> uimap; - static UINT16 actual; + static uint16_t actual; }; // Years @@ -182,23 +182,23 @@ struct c_year { static void set(const char *str); static std::vector<std::string> ui; - static UINT16 actual; + static uint16_t actual; }; // GLOBAL CLASS struct ui_globals { - static UINT8 curimage_view, curdats_view, curdats_total, cur_sw_dats_view, cur_sw_dats_total, rpanel; + static uint8_t curimage_view, curdats_view, curdats_total, cur_sw_dats_view, cur_sw_dats_total, rpanel; static bool switch_image, redraw_icon, default_image, reset; static int visible_main_lines, visible_sw_lines; - static UINT16 panels_status; + static uint16_t panels_status; static bool has_icons; }; #define main_struct(name) \ struct name##_filters \ { \ - static UINT16 actual; \ + static uint16_t actual; \ static const char *text[]; \ static size_t length; \ }; @@ -209,25 +209,25 @@ main_struct(sw); // Custom filter struct custfltr { - static UINT16 main; - static UINT16 numother; - static UINT16 other[MAX_CUST_FILTER]; - static UINT16 mnfct[MAX_CUST_FILTER]; - static UINT16 screen[MAX_CUST_FILTER]; - static UINT16 year[MAX_CUST_FILTER]; + static uint16_t main; + static uint16_t numother; + static uint16_t other[MAX_CUST_FILTER]; + static uint16_t mnfct[MAX_CUST_FILTER]; + static uint16_t screen[MAX_CUST_FILTER]; + static uint16_t year[MAX_CUST_FILTER]; }; // Software custom filter struct sw_custfltr { - static UINT16 main; - static UINT16 numother; - static UINT16 other[MAX_CUST_FILTER]; - static UINT16 mnfct[MAX_CUST_FILTER]; - static UINT16 year[MAX_CUST_FILTER]; - static UINT16 region[MAX_CUST_FILTER]; - static UINT16 type[MAX_CUST_FILTER]; - static UINT16 list[MAX_CUST_FILTER]; + static uint16_t main; + static uint16_t numother; + static uint16_t other[MAX_CUST_FILTER]; + static uint16_t mnfct[MAX_CUST_FILTER]; + static uint16_t year[MAX_CUST_FILTER]; + static uint16_t region[MAX_CUST_FILTER]; + static uint16_t type[MAX_CUST_FILTER]; + static uint16_t list[MAX_CUST_FILTER]; }; // GLOBAL FUNCTIONS |