From 9f3060f912090c4453aeba735c4e2749d99e5897 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Sun, 14 Feb 2016 05:23:18 +0100 Subject: [PATCH] nana::experimental::filesystem --- source/filesystem/filesystem.cpp | 2 +- source/gui/filebox.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/filesystem/filesystem.cpp b/source/filesystem/filesystem.cpp index b79b9000..42691b6a 100644 --- a/source/filesystem/filesystem.cpp +++ b/source/filesystem/filesystem.cpp @@ -652,7 +652,7 @@ namespace nana { namespace experimental { auto stat = status(p, err); if (err != std::error_code()) - throw filesystem_error("nana::filesystem::status", p, err); + throw filesystem_error("nana::experimental::filesystem::status", p, err); return stat; } diff --git a/source/gui/filebox.cpp b/source/gui/filebox.cpp index b9772d23..5f8f1311 100644 --- a/source/gui/filebox.cpp +++ b/source/gui/filebox.cpp @@ -142,7 +142,7 @@ namespace nana auto path = path_.caption(); auto root = path.substr(0, path.find('/')); if(root == "HOME") - path.replace(0, 4, nana::filesystem::path_user().native()); + path.replace(0, 4, nana::experimental::filesystem::path_user().native()); else if(root == "FILESYSTEM") path.erase(0, 10); else @@ -344,7 +344,7 @@ namespace nana else dir = saved_selected_path; - _m_load_cat_path(dir.size() ? dir : nana::filesystem::path_user().native()); + _m_load_cat_path(dir.size() ? dir : nana::experimental::filesystem::path_user().native()); tb_file_.caption(file_with_path_removed); } @@ -474,7 +474,7 @@ namespace nana { auto begstr = path.substr(0, pos); if(begstr == "FS.HOME") - path.replace(0, 7, nana::filesystem::path_user().native()); + path.replace(0, 7, nana::experimental::filesystem::path_user().native()); else path.erase(0, pos); return begstr; @@ -508,13 +508,13 @@ namespace nana { m.bytes = fs::file_size(path + m.name); m.directory = fs::is_directory(fattr); - ::nana::filesystem::modified_file_time(path + m.name, m.modified_time); + ::nana::experimental::filesystem::modified_file_time(path + m.name, m.modified_time); } else { m.bytes = 0; m.directory = fs::is_directory(*i); - ::nana::filesystem::modified_file_time(path + i->path().filename().native(), m.modified_time); + ::nana::experimental::filesystem::modified_file_time(path + i->path().filename().native(), m.modified_time); } file_container_.push_back(m); @@ -534,7 +534,7 @@ namespace nana while(!beg_node.empty() && (beg_node != nodes_.home) && (beg_node != nodes_.filesystem)) beg_node = beg_node.owner(); - auto head = nana::filesystem::path_user().native(); + auto head = nana::experimental::filesystem::path_user().native(); if(path.size() >= head.size() && (path.substr(0, head.size()) == head)) {//This is HOME path_.caption("HOME");