more srcclean (nw)

This commit is contained in:
Vas Crabb 2017-06-25 15:21:44 +10:00
parent 41e1555242
commit fb61e98cc5
6 changed files with 25 additions and 25 deletions

View File

@ -276,9 +276,9 @@ public:
enum class option_support
{
FULL, // full option support
GENERAL_AND_SYSTEM, // support for general options and system (no softlist)
GENERAL_ONLY // only support for general options
FULL, // full option support
GENERAL_AND_SYSTEM, // support for general options and system (no softlist)
GENERAL_ONLY // only support for general options
};
// construction/destruction
@ -501,7 +501,7 @@ private:
static const options_entry s_option_entries[];
// the basics
option_support m_support;
option_support m_support;
const game_driver * m_system;
// slots and devices
@ -517,7 +517,7 @@ private:
ui_option m_ui;
// special option; the system name we tried to specify
std::string m_attempted_system_name;
std::string m_attempted_system_name;
// special option; the software set name that we did specify
std::string m_software_name;

View File

@ -185,11 +185,11 @@ void image_manager::options_extract()
{
// There are two scenarios where we want to extract the option:
//
// 1. When for the device, is_reset_on_load() is false (mounting devices for which is reset_and_load()
// is true forces a reset, hence the name)
// 1. When for the device, is_reset_on_load() is false (mounting devices for which is reset_and_load()
// is true forces a reset, hence the name)
//
// 2. When is_reset_on_load(), and this results in a device being unmounted (unmounting is_reset_and_load()
// doesn't force an unmount)
// 2. When is_reset_on_load(), and this results in a device being unmounted (unmounting is_reset_and_load()
// doesn't force an unmount)
if (!image.is_reset_on_load()
|| (!image.exists() && !machine().options().image_option(image.instance_name()).value().empty()))
{

View File

@ -208,7 +208,7 @@ void menu_slot_devices::set_slot_device(device_slot_interface &slot, const char
//-------------------------------------------------
// record_current_options
// record_current_options
//-------------------------------------------------
void menu_slot_devices::record_current_options()
@ -230,7 +230,7 @@ void menu_slot_devices::record_current_options()
//-------------------------------------------------
// try_refresh_current_options
// try_refresh_current_options
//-------------------------------------------------
bool menu_slot_devices::try_refresh_current_options()

View File

@ -37,8 +37,8 @@ private:
bool try_refresh_current_options();
// variables
std::unique_ptr<machine_config> m_config;
std::unordered_map<std::string, std::string> m_slot_options;
std::unique_ptr<machine_config> m_config;
std::unordered_map<std::string, std::string> m_slot_options;
};
} // namespace ui

View File

@ -2,9 +2,9 @@
// copyright-holders:Nathan Woods
/***************************************************************************
ui/state.h
ui/state.h
Menus for saving and loading state
Menus for saving and loading state
***************************************************************************/
@ -45,19 +45,19 @@ private:
const std::chrono::system_clock::time_point &last_modified() const { return m_last_modified; }
private:
std::string m_file_name; // filename for the state itself
std::string m_visible_name; // how it appears in the dialog
std::string m_file_name; // filename for the state itself
std::string m_visible_name; // how it appears in the dialog
std::chrono::system_clock::time_point m_last_modified;
};
static std::string s_last_file_selected;
static std::string s_last_file_selected;
std::unordered_map<std::string, file_entry> m_file_entries;
std::unordered_map<std::string, std::string> m_filename_to_code_map;
const char * m_header;
const char * m_footer;
bool m_must_exist;
bool m_was_paused;
std::unordered_map<std::string, file_entry> m_file_entries;
std::unordered_map<std::string, std::string> m_filename_to_code_map;
const char * m_header;
const char * m_footer;
bool m_must_exist;
bool m_was_paused;
static void *itemref_from_file_entry(const file_entry &entry);
static const file_entry &file_entry_from_itemref(void *itemref);

View File

@ -248,7 +248,7 @@ private:
std::vector<entry::shared_ptr> m_entries; // cannonical list of entries
std::unordered_map<std::string, entry::weak_ptr> m_entrymap; // map for fast lookup
std::string m_command; // command found
std::vector<std::string> m_command_arguments; // command arguments
std::vector<std::string> m_command_arguments; // command arguments
static const char *const s_option_unadorned[]; // array of unadorned option "names"
};