summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/ui/filemngr.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/emu/ui/filemngr.cpp
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/emu/ui/filemngr.cpp')
-rw-r--r--src/emu/ui/filemngr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/emu/ui/filemngr.cpp b/src/emu/ui/filemngr.cpp
index cccc92888c4..d46199793ce 100644
--- a/src/emu/ui/filemngr.cpp
+++ b/src/emu/ui/filemngr.cpp
@@ -68,7 +68,7 @@ void ui_menu_file_manager::custom_render(void *selectedref, float top, float bot
void ui_menu_file_manager::fill_image_line(device_image_interface *img, std::string &instance, std::string &filename)
{
// get the image type/id
- strprintf(instance,"%s (%s)", img->instance_name(), img->brief_instance_name());
+ instance = string_format("%s (%s)", img->instance_name(), img->brief_instance_name());
// get the base name
if (img->basename() != nullptr)
@@ -103,7 +103,7 @@ void ui_menu_file_manager::fill_image_line(device_image_interface *img, std::str
void ui_menu_file_manager::populate()
{
- std::string buffer, tmp_inst, tmp_name;
+ std::string tmp_inst, tmp_name;
bool first_entry = true;
if (!m_warnings.empty())
@@ -140,8 +140,7 @@ void ui_menu_file_manager::populate()
first_entry = false;
else
item_append(MENU_SEPARATOR_ITEM, nullptr, 0, nullptr);
- strprintf(buffer, "[root%s]", dev->tag());
- item_append(buffer.c_str(), nullptr, 0, nullptr);
+ item_append(string_format("[root%s]", dev->tag()).c_str(), nullptr, 0, nullptr);
tag_appended = true;
}
// finally, append the image interface to the menu