diff options
author | 2016-03-18 22:41:17 +0100 | |
---|---|---|
committer | 2016-03-18 22:41:17 +0100 | |
commit | e39daaf5bdcf21d64abf239e1133963643dc6df1 (patch) | |
tree | 1f1b5f333e84bf056ce82c27bebdbad933f26c0d /src/emu/ui/filesel.cpp | |
parent | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (diff) | |
parent | b79020559ea3617b2d6bd4c92041d314045e2938 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/emu/ui/filesel.cpp')
-rw-r--r-- | src/emu/ui/filesel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/ui/filesel.cpp b/src/emu/ui/filesel.cpp index 89658407279..7a8cd32ec94 100644 --- a/src/emu/ui/filesel.cpp +++ b/src/emu/ui/filesel.cpp @@ -2,7 +2,7 @@ // copyright-holders:Nathan Woods /*************************************************************************** - ui/filesel.c + ui/filesel.cpp MESS's clunky built-in file manager @@ -474,7 +474,7 @@ ui_menu_file_selector::file_selector_entry *ui_menu_file_selector::append_dirent } // determine the full path - zippath_combine(buffer, m_current_directory.c_str(), dirent->name); + util::zippath_combine(buffer, m_current_directory.c_str(), dirent->name); // create the file selector entry entry = append_entry( @@ -535,7 +535,7 @@ void ui_menu_file_selector::append_entry_menu_item(const file_selector_entry *en void ui_menu_file_selector::populate() { - zippath_directory *directory = nullptr; + util::zippath_directory *directory = nullptr; osd_file::error err; const osd_directory_entry *dirent; const file_selector_entry *entry; @@ -545,7 +545,7 @@ void ui_menu_file_selector::populate() const char *path = m_current_directory.c_str(); // open the directory - err = zippath_opendir(path, &directory); + err = util::zippath_opendir(path, &directory); // clear out the menu entries m_entrylist = nullptr; @@ -581,7 +581,7 @@ void ui_menu_file_selector::populate() // build the menu for each item if (err == osd_file::error::NONE) { - while((dirent = zippath_readdir(directory)) != nullptr) + while((dirent = util::zippath_readdir(directory)) != nullptr) { // append a dirent entry entry = append_dirent_entry(dirent); @@ -611,7 +611,7 @@ void ui_menu_file_selector::populate() customtop = machine().ui().get_line_height() + 3.0f * UI_BOX_TB_BORDER; if (directory != nullptr) - zippath_closedir(directory); + util::zippath_closedir(directory); } @@ -656,7 +656,7 @@ void ui_menu_file_selector::handle() case SELECTOR_ENTRY_TYPE_DRIVE: case SELECTOR_ENTRY_TYPE_DIRECTORY: // drive/directory - first check the path - err = zippath_opendir(entry->fullpath, nullptr); + err = util::zippath_opendir(entry->fullpath, nullptr); if (err != osd_file::error::NONE) { // this path is problematic; present the user with an error and bail |