Merge pull request #1167 from npwoods/make_diimage_members_private

Made a bunch of device_image_interface members private
This commit is contained in:
Vas Crabb 2016-08-01 09:56:52 +10:00 committed by GitHub
commit 2c9966e3c9

View File

@ -292,15 +292,21 @@ protected:
std::string m_basename_noext;
std::string m_filetype;
// working directory; persists across mounts
std::string m_working_directory;
// Software information
std::string m_full_software_name;
const software_info *m_software_info_ptr;
const software_part *m_software_part_ptr;
std::string m_software_list_name;
private:
static image_error_t image_error_from_file_error(osd_file::error filerr);
// creation info
formatlist_type m_formatlist;
// working directory; persists across mounts
std::string m_working_directory;
// info read from the hash file/software list
std::string m_longname;
std::string m_manufacturer;
@ -326,12 +332,6 @@ protected:
bool m_user_loadable;
bool m_is_loading;
private:
static image_error_t image_error_from_file_error(osd_file::error filerr);
// creation info
formatlist_type m_formatlist;
};
// iterator