From ff064ba37aa158a46acc8cae459df21c2521d8c9 Mon Sep 17 00:00:00 2001
From: Nathan Woods <npwoods@mess.org>
Date: Thu, 4 Aug 2016 07:21:27 -0400
Subject: [PATCH] More conversion of 'const char *' --> std::string in diimage

---
 src/emu/diimage.cpp               | 4 ++--
 src/emu/diimage.h                 | 8 ++++----
 src/emu/image.cpp                 | 2 +-
 src/frontend/mame/ui/imgcntrl.cpp | 4 ++--
 src/frontend/mame/ui/inifile.cpp  | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp
index 748d455c665..087fefc20e3 100644
--- a/src/emu/diimage.cpp
+++ b/src/emu/diimage.cpp
@@ -398,13 +398,13 @@ void device_image_interface::setup_working_directory()
 //  valid even if not mounted
 //-------------------------------------------------
 
-const char * device_image_interface::working_directory()
+const std::string &device_image_interface::working_directory()
 {
 	// check to see if we've never initialized the working directory
 	if (m_working_directory.empty())
 		setup_working_directory();
 
-	return m_working_directory.c_str();
+	return m_working_directory;
 }
 
 
diff --git a/src/emu/diimage.h b/src/emu/diimage.h
index 1d066527b49..fa30dc71cad 100644
--- a/src/emu/diimage.h
+++ b/src/emu/diimage.h
@@ -195,9 +195,9 @@ public:
 	// configuration access
 	void set_init_phase() { m_init_phase = true; }
 
-	const char* longname() const { return m_longname.c_str(); }
-	const char* manufacturer() const { return m_manufacturer.c_str(); }
-	const char* year() const { return m_year.c_str(); }
+	const std::string &longname() const { return m_longname; }
+	const std::string &manufacturer() const { return m_manufacturer; }
+	const std::string &year() const { return m_year; }
 	UINT32 supported() const { return m_supported; }
 
 	const software_info *software_entry() const { return m_software_info_ptr; }
@@ -206,7 +206,7 @@ public:
 	bool loaded_through_softlist() const { return m_software_info_ptr != nullptr; }
 
 	void set_working_directory(const char *working_directory) { m_working_directory = working_directory; }
-	const char * working_directory();
+	const std::string &working_directory();
 
 	UINT8 *get_software_region(const char *tag);
 	UINT32 get_software_region_length(const char *tag);
diff --git a/src/emu/image.cpp b/src/emu/image.cpp
index af46f9d51f3..a08acad47cf 100644
--- a/src/emu/image.cpp
+++ b/src/emu/image.cpp
@@ -145,7 +145,7 @@ void image_manager::config_save(config_type cfg_type, xml_data_node *parentnode)
 			if (node != nullptr)
 			{
 				xml_set_attribute(node, "instance", dev_instance);
-				xml_set_attribute(node, "directory", image.working_directory());
+				xml_set_attribute(node, "directory", image.working_directory().c_str());
 			}
 		}
 	}
diff --git a/src/frontend/mame/ui/imgcntrl.cpp b/src/frontend/mame/ui/imgcntrl.cpp
index ca6d4f55724..0fabfc57d5d 100644
--- a/src/frontend/mame/ui/imgcntrl.cpp
+++ b/src/frontend/mame/ui/imgcntrl.cpp
@@ -51,7 +51,7 @@ menu_control_device_image::menu_control_device_image(mame_ui_manager &mui, rende
 	if (m_swi != nullptr)
 	{
 		m_state = START_OTHER_PART;
-		m_current_directory.assign(m_image.working_directory());
+		m_current_directory = m_image.working_directory();
 	}
 	else
 	{
@@ -65,7 +65,7 @@ menu_control_device_image::menu_control_device_image(mame_ui_manager &mui, rende
 		}
 		else
 		{
-			m_current_directory.assign(m_image.working_directory());
+			m_current_directory = m_image.working_directory();
 		}
 
 		// check to see if the path exists; if not clear it
diff --git a/src/frontend/mame/ui/inifile.cpp b/src/frontend/mame/ui/inifile.cpp
index fd93bb6d1f7..c9b99153522 100644
--- a/src/frontend/mame/ui/inifile.cpp
+++ b/src/frontend/mame/ui/inifile.cpp
@@ -195,10 +195,10 @@ void favorite_manager::add_favorite_game()
 			auto part = image.part_entry();
 			ui_software_info tmpmatches;
 			tmpmatches.shortname = swinfo->shortname();
-			tmpmatches.longname = strensure(image.longname());
+			tmpmatches.longname = image.longname();
 			tmpmatches.parentname = swinfo->parentname();
-			tmpmatches.year = strensure(image.year());
-			tmpmatches.publisher = strensure(image.manufacturer());
+			tmpmatches.year = image.year();
+			tmpmatches.publisher = image.manufacturer();
 			tmpmatches.supported = image.supported();
 			tmpmatches.part = part->name();
 			tmpmatches.driver = &machine().system();