mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using explicit namespaces

Browse Source
This commit is contained in:
qPCR4vir
2016-06-24 14:22:04 +02:00
parent 2f86b26075
commit 3b6718d67f
5 changed files with 48 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/paint/image.cpp
View File

@@ -36,6 +36,8 @@
#include "image_accessor.hpp"
namespace fs = nana::experimental::filesystem;
namespace nana
{
namespace paint
@@ -60,7 +62,7 @@ namespace paint
//class image_ico
image_ico::image_ico(bool is_ico): is_ico_(is_ico){}
bool image_ico::open(const nana::experimental::filesystem::path& file)
bool image_ico::open(const fs::path& file)
{
close();
#if defined(NANA_WINDOWS)
@@ -231,7 +233,7 @@ namespace paint
return *this;
}
std::shared_ptr<image::image_impl_interface> create_image(const ::nana::experimental::filesystem::path & p)
std::shared_ptr<image::image_impl_interface> create_image(const fs::path & p)
{
std::shared_ptr<image::image_impl_interface> ptr;
@@ -314,14 +316,14 @@ namespace paint
bool image::open(const ::std::string& file)
{
::nana::experimental::filesystem::path path(file);
fs::path path(file);
image_ptr_ = create_image(path);
return (image_ptr_ ? image_ptr_->open(path) : false);
}
bool image::open(const std::wstring& file)
{
::nana::experimental::filesystem::path path(file);
fs::path path(file);
image_ptr_ = create_image(path);
return (image_ptr_ ? image_ptr_->open(path) : false);
}