diff options
author | 2016-01-10 16:36:18 -0500 | |
---|---|---|
committer | 2016-01-10 16:36:18 -0500 | |
commit | 115db95642ad6d861aad63775b92350e0491f2dd (patch) | |
tree | 8e7538ca804610335bff1927dc3b4d974b4c06da /src/devices/bus/astrocde | |
parent | 2a2a4a3c6e255c479d5072d02c2a40949f611ea6 (diff) |
Return std::string objects by value rather than pass by reference
- strprintf is unaltered, but strformat now takes one fewer argument
- state_string_export still fills a buffer, but has been made const
- get_default_card_software now takes no arguments but returns a string
Diffstat (limited to 'src/devices/bus/astrocde')
-rw-r--r-- | src/devices/bus/astrocde/slot.cpp | 7 | ||||
-rw-r--r-- | src/devices/bus/astrocde/slot.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 80b429a18c3..02d2294b7b5 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -198,7 +198,7 @@ bool astrocade_cart_slot_device::call_softlist_load(software_list_device &swlist get default card software -------------------------------------------------*/ -void astrocade_cart_slot_device::get_default_card_software(std::string &result) +std::string astrocade_cart_slot_device::get_default_card_software() { if (open_image_file(mconfig().options())) { @@ -216,11 +216,10 @@ void astrocade_cart_slot_device::get_default_card_software(std::string &result) //printf("type: %s\n", slot_string); clear(); - result.assign(slot_string); - return; + return std::string(slot_string); } - software_get_default_slot(result, "rom"); + return software_get_default_slot("rom"); } /*------------------------------------------------- diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index 76eb2f8ed20..1a28ccf4b96 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -73,7 +73,7 @@ public: virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result) override; + virtual std::string get_default_card_software() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); |