diff --git a/laf b/laf index 266312171..88dd1683c 160000 --- a/laf +++ b/laf @@ -1 +1 @@ -Subproject commit 266312171630996d2823958d598514a6a5638060 +Subproject commit 88dd1683c05e6da7d8bea781a0e6ef32d28f8b94 diff --git a/src/app/app.cpp b/src/app/app.cpp index ae53544a7..c5803261c 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -56,7 +56,6 @@ #include "base/convert_to.h" #include "base/exception.h" #include "base/fs.h" -#include "base/path.h" #include "base/split_string.h" #include "base/unique_ptr.h" #include "doc/document_observer.h" diff --git a/src/app/app_brushes.cpp b/src/app/app_brushes.cpp index bf2c92a00..c9b0faf4a 100644 --- a/src/app/app_brushes.cpp +++ b/src/app/app_brushes.cpp @@ -16,7 +16,6 @@ #include "base/base64.h" #include "base/convert_to.h" #include "base/fs.h" -#include "base/path.h" #include "base/serialization.h" #include "doc/brush.h" #include "doc/color.h" diff --git a/src/app/app_menus.cpp b/src/app/app_menus.cpp index ac441ca6d..f9a733857 100644 --- a/src/app/app_menus.cpp +++ b/src/app/app_menus.cpp @@ -26,7 +26,6 @@ #include "app/util/filetoks.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "ui/ui.h" #include "tinyxml.h" diff --git a/src/app/app_options.cpp b/src/app/app_options.cpp index abc6ce528..07a7c6ef0 100644 --- a/src/app/app_options.cpp +++ b/src/app/app_options.cpp @@ -10,7 +10,7 @@ #include "app/app_options.h" -#include "base/path.h" +#include "base/fs.h" #include #include diff --git a/src/app/commands/cmd_duplicate_sprite.cpp b/src/app/commands/cmd_duplicate_sprite.cpp index d1d287b1f..b3dc6382b 100644 --- a/src/app/commands/cmd_duplicate_sprite.cpp +++ b/src/app/commands/cmd_duplicate_sprite.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -14,7 +14,7 @@ #include "app/ini_file.h" #include "app/modules/editors.h" #include "app/ui_context.h" -#include "base/path.h" +#include "base/fs.h" #include "doc/sprite.h" #include "ui/ui.h" diff --git a/src/app/commands/cmd_export_sprite_sheet.cpp b/src/app/commands/cmd_export_sprite_sheet.cpp index fc19ac39a..c8b98cfd8 100644 --- a/src/app/commands/cmd_export_sprite_sheet.cpp +++ b/src/app/commands/cmd_export_sprite_sheet.cpp @@ -25,7 +25,6 @@ #include "base/bind.h" #include "base/convert_to.h" #include "base/fs.h" -#include "base/path.h" #include "doc/frame_tag.h" #include "doc/layer.h" diff --git a/src/app/commands/cmd_keyboard_shortcuts.cpp b/src/app/commands/cmd_keyboard_shortcuts.cpp index 79d9759ef..53ca073de 100644 --- a/src/app/commands/cmd_keyboard_shortcuts.cpp +++ b/src/app/commands/cmd_keyboard_shortcuts.cpp @@ -22,7 +22,6 @@ #include "app/ui/skin/skin_theme.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "base/scoped_value.h" #include "base/split_string.h" #include "base/string.h" diff --git a/src/app/commands/cmd_new_sprite_from_selection.cpp b/src/app/commands/cmd_new_sprite_from_selection.cpp index 68ac095f5..4b126c750 100644 --- a/src/app/commands/cmd_new_sprite_from_selection.cpp +++ b/src/app/commands/cmd_new_sprite_from_selection.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -12,7 +12,7 @@ #include "app/context.h" #include "app/document.h" #include "app/util/new_image_from_mask.h" -#include "base/path.h" +#include "base/fs.h" #include "doc/cel.h" #include "doc/mask.h" #include "doc/palette.h" diff --git a/src/app/commands/cmd_open_file.cpp b/src/app/commands/cmd_open_file.cpp index a693ee22e..9a50e1fb0 100644 --- a/src/app/commands/cmd_open_file.cpp +++ b/src/app/commands/cmd_open_file.cpp @@ -22,7 +22,7 @@ #include "app/ui/status_bar.h" #include "app/ui_context.h" #include "base/bind.h" -#include "base/path.h" +#include "base/fs.h" #include "base/thread.h" #include "base/unique_ptr.h" #include "doc/sprite.h" diff --git a/src/app/commands/cmd_options.cpp b/src/app/commands/cmd_options.cpp index 7a800d950..977d58eac 100644 --- a/src/app/commands/cmd_options.cpp +++ b/src/app/commands/cmd_options.cpp @@ -20,7 +20,6 @@ #include "base/bind.h" #include "base/convert_to.h" #include "base/fs.h" -#include "base/path.h" #include "doc/image.h" #include "render/render.h" #include "she/display.h" diff --git a/src/app/commands/cmd_palette_editor.cpp b/src/app/commands/cmd_palette_editor.cpp index 3065a47fb..1cb18c8a7 100644 --- a/src/app/commands/cmd_palette_editor.cpp +++ b/src/app/commands/cmd_palette_editor.cpp @@ -36,7 +36,6 @@ #include "app/ui_context.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "doc/image.h" #include "doc/palette.h" #include "doc/sprite.h" diff --git a/src/app/commands/cmd_paste_text.cpp b/src/app/commands/cmd_paste_text.cpp index 2c91ff38b..c7609b951 100644 --- a/src/app/commands/cmd_paste_text.cpp +++ b/src/app/commands/cmd_paste_text.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -20,7 +20,7 @@ #include "app/ui/font_popup.h" #include "app/util/freetype_utils.h" #include "base/bind.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include "base/unique_ptr.h" #include "doc/image.h" diff --git a/src/app/commands/cmd_run_script.cpp b/src/app/commands/cmd_run_script.cpp index ee5314ace..27c68115f 100644 --- a/src/app/commands/cmd_run_script.cpp +++ b/src/app/commands/cmd_run_script.cpp @@ -13,7 +13,7 @@ #include "app/console.h" #include "app/resource_finder.h" #include "app/script/app_scripting.h" -#include "base/path.h" +#include "base/fs.h" #include "script/engine_delegate.h" #include "ui/manager.h" diff --git a/src/app/commands/cmd_save_file.cpp b/src/app/commands/cmd_save_file.cpp index bb3d0a8a1..ae81c21c1 100644 --- a/src/app/commands/cmd_save_file.cpp +++ b/src/app/commands/cmd_save_file.cpp @@ -26,7 +26,6 @@ #include "base/bind.h" #include "base/convert_to.h" #include "base/fs.h" -#include "base/path.h" #include "base/thread.h" #include "base/unique_ptr.h" #include "doc/sprite.h" diff --git a/src/app/commands/cmd_save_mask.cpp b/src/app/commands/cmd_save_mask.cpp index cc2768d5d..72a84e1b1 100644 --- a/src/app/commands/cmd_save_mask.cpp +++ b/src/app/commands/cmd_save_mask.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -13,7 +13,6 @@ #include "app/file_selector.h" #include "app/util/msk_file.h" #include "base/fs.h" -#include "base/path.h" #include "doc/mask.h" #include "doc/sprite.h" #include "ui/alert.h" diff --git a/src/app/commands/cmd_save_palette.cpp b/src/app/commands/cmd_save_palette.cpp index 867d8f9cf..ff50d6ec9 100644 --- a/src/app/commands/cmd_save_palette.cpp +++ b/src/app/commands/cmd_save_palette.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -16,7 +16,6 @@ #include "app/file_selector.h" #include "app/modules/palettes.h" #include "base/fs.h" -#include "base/path.h" #include "doc/palette.h" #include "ui/alert.h" diff --git a/src/app/crash/data_recovery.cpp b/src/app/crash/data_recovery.cpp index 0b3e9d2e7..c9a3138c4 100644 --- a/src/app/crash/data_recovery.cpp +++ b/src/app/crash/data_recovery.cpp @@ -14,7 +14,6 @@ #include "app/crash/session.h" #include "app/resource_finder.h" #include "base/fs.h" -#include "base/path.h" #include "base/time.h" namespace app { diff --git a/src/app/crash/read_document.cpp b/src/app/crash/read_document.cpp index ed9f16639..369d879d2 100644 --- a/src/app/crash/read_document.cpp +++ b/src/app/crash/read_document.cpp @@ -17,7 +17,6 @@ #include "base/exception.h" #include "base/fs.h" #include "base/fstream_path.h" -#include "base/path.h" #include "base/serialization.h" #include "base/string.h" #include "base/unique_ptr.h" diff --git a/src/app/crash/session.cpp b/src/app/crash/session.cpp index dea81ee31..fd076d784 100644 --- a/src/app/crash/session.cpp +++ b/src/app/crash/session.cpp @@ -22,7 +22,6 @@ #include "base/convert_to.h" #include "base/fs.h" #include "base/fstream_path.h" -#include "base/path.h" #include "base/process.h" #include "base/split_string.h" #include "base/string.h" diff --git a/src/app/crash/write_document.cpp b/src/app/crash/write_document.cpp index 33b41d3bf..dae1700de 100644 --- a/src/app/crash/write_document.cpp +++ b/src/app/crash/write_document.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -15,7 +15,6 @@ #include "base/convert_to.h" #include "base/fs.h" #include "base/fstream_path.h" -#include "base/path.h" #include "base/serialization.h" #include "base/string.h" #include "base/unique_ptr.h" diff --git a/src/app/document_exporter.cpp b/src/app/document_exporter.cpp index 50c0f4084..691e2ffcb 100644 --- a/src/app/document_exporter.cpp +++ b/src/app/document_exporter.cpp @@ -17,8 +17,8 @@ #include "app/filename_formatter.h" #include "app/ui_context.h" #include "base/convert_to.h" +#include "base/fs.h" #include "base/fstream_path.h" -#include "base/path.h" #include "base/replace_string.h" #include "base/shared_ptr.h" #include "base/string.h" diff --git a/src/app/file/ase_format.cpp b/src/app/file/ase_format.cpp index 1db1f49a3..7d14567c7 100644 --- a/src/app/file/ase_format.cpp +++ b/src/app/file/ase_format.cpp @@ -16,7 +16,7 @@ #include "base/cfile.h" #include "base/exception.h" #include "base/file_handle.h" -#include "base/path.h" +#include "base/fs.h" #include "doc/doc.h" #include "ui/alert.h" #include "zlib.h" diff --git a/src/app/file/file.cpp b/src/app/file/file.cpp index a3083e531..f6519473d 100644 --- a/src/app/file/file.cpp +++ b/src/app/file/file.cpp @@ -23,7 +23,6 @@ #include "app/ui/status_bar.h" #include "base/fs.h" #include "base/mutex.h" -#include "base/path.h" #include "base/scoped_lock.h" #include "base/shared_ptr.h" #include "base/string.h" diff --git a/src/app/file/palette_file.cpp b/src/app/file/palette_file.cpp index 5c11c749b..f44a87f93 100644 --- a/src/app/file/palette_file.cpp +++ b/src/app/file/palette_file.cpp @@ -13,7 +13,7 @@ #include "app/file/file.h" #include "app/file/file_format.h" #include "app/file/file_formats_manager.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include "doc/cel.h" #include "doc/file/col_file.h" diff --git a/src/app/file/pixly_format.cpp b/src/app/file/pixly_format.cpp index c5bc5e581..6f0a7a1f4 100644 --- a/src/app/file/pixly_format.cpp +++ b/src/app/file/pixly_format.cpp @@ -14,11 +14,11 @@ #include "app/file/file.h" #include "app/file/file_format.h" #include "app/xml_document.h" -#include "base/file_handle.h" #include "base/convert_to.h" -#include "base/path.h" -#include "doc/doc.h" +#include "base/file_handle.h" +#include "base/fs.h" #include "doc/algorithm/shrink_bounds.h" +#include "doc/doc.h" #include "doc/primitives.h" #include diff --git a/src/app/file/split_filename.cpp b/src/app/file/split_filename.cpp index 60231a578..e0b8bf3ce 100644 --- a/src/app/file/split_filename.cpp +++ b/src/app/file/split_filename.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -10,7 +10,7 @@ #include "app/file/split_filename.h" #include "base/convert_to.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include diff --git a/src/app/file/split_filename_tests.cpp b/src/app/file/split_filename_tests.cpp index c91b6deb9..23045e895 100644 --- a/src/app/file/split_filename_tests.cpp +++ b/src/app/file/split_filename_tests.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -8,7 +8,7 @@ #include "app/file/split_filename.h" -#include "base/path.h" +#include "base/fs.h" using namespace app; diff --git a/src/app/file_system.cpp b/src/app/file_system.cpp index b84acc9e5..279eec774 100644 --- a/src/app/file_system.cpp +++ b/src/app/file_system.cpp @@ -17,7 +17,6 @@ #include "app/file_system.h" #include "base/fs.h" -#include "base/path.h" #include "base/string.h" #include "she/display.h" #include "she/surface.h" diff --git a/src/app/filename_formatter.cpp b/src/app/filename_formatter.cpp index f2a3a30fc..ecf81241d 100644 --- a/src/app/filename_formatter.cpp +++ b/src/app/filename_formatter.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -11,7 +11,7 @@ #include "app/filename_formatter.h" #include "base/convert_to.h" -#include "base/path.h" +#include "base/fs.h" #include "base/replace_string.h" #include diff --git a/src/app/filename_formatter_tests.cpp b/src/app/filename_formatter_tests.cpp index 43824b887..c95dab26c 100644 --- a/src/app/filename_formatter_tests.cpp +++ b/src/app/filename_formatter_tests.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -8,7 +8,7 @@ #include "app/filename_formatter.h" -#include "base/path.h" +#include "base/fs.h" using namespace app; diff --git a/src/app/ini_file.cpp b/src/app/ini_file.cpp index e05172022..ec717a392 100644 --- a/src/app/ini_file.cpp +++ b/src/app/ini_file.cpp @@ -11,7 +11,7 @@ #include "app/ini_file.h" #include "app/resource_finder.h" -#include "base/path.h" +#include "base/fs.h" #include "base/split_string.h" #include "base/string.h" #include "cfg/cfg.h" diff --git a/src/app/modules/palettes.cpp b/src/app/modules/palettes.cpp index f51eef8a0..eedbeb03c 100644 --- a/src/app/modules/palettes.cpp +++ b/src/app/modules/palettes.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -14,7 +14,6 @@ #include "app/file/palette_file.h" #include "app/resource_finder.h" #include "base/fs.h" -#include "base/path.h" #include "doc/image.h" #include "doc/palette.h" #include "doc/sprite.h" diff --git a/src/app/recent_files.cpp b/src/app/recent_files.cpp index fd661bb40..b63c4f72c 100644 --- a/src/app/recent_files.cpp +++ b/src/app/recent_files.cpp @@ -12,7 +12,6 @@ #include "app/ini_file.h" #include "base/fs.h" -#include "base/path.h" #include #include diff --git a/src/app/res/http_loader.cpp b/src/app/res/http_loader.cpp index aca5b21ff..dc39d4be6 100644 --- a/src/app/res/http_loader.cpp +++ b/src/app/res/http_loader.cpp @@ -13,7 +13,6 @@ #include "base/bind.h" #include "base/fs.h" #include "base/fstream_path.h" -#include "base/path.h" #include "base/replace_string.h" #include "base/scoped_value.h" #include "base/string.h" diff --git a/src/app/res/palettes_loader_delegate.cpp b/src/app/res/palettes_loader_delegate.cpp index 162948413..b8eb65752 100644 --- a/src/app/res/palettes_loader_delegate.cpp +++ b/src/app/res/palettes_loader_delegate.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is distributed under the terms of // the End-User License Agreement for Aseprite. @@ -16,7 +16,6 @@ #include "app/resource_finder.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "base/scoped_value.h" #include "doc/palette.h" diff --git a/src/app/res/resources_loader.cpp b/src/app/res/resources_loader.cpp index 2b841301e..760f1d7d6 100644 --- a/src/app/res/resources_loader.cpp +++ b/src/app/res/resources_loader.cpp @@ -16,7 +16,6 @@ #include "app/resource_finder.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "base/scoped_value.h" namespace app { diff --git a/src/app/resource_finder.cpp b/src/app/resource_finder.cpp index 491a88cb0..4ba8cf567 100644 --- a/src/app/resource_finder.cpp +++ b/src/app/resource_finder.cpp @@ -12,7 +12,6 @@ #include "app/app.h" #include "base/fs.h" -#include "base/path.h" #include "base/string.h" #include diff --git a/src/app/ui/document_view.cpp b/src/app/ui/document_view.cpp index 96a0ffa57..a1c5a0a48 100644 --- a/src/app/ui/document_view.cpp +++ b/src/app/ui/document_view.cpp @@ -32,7 +32,7 @@ #include "app/ui/workspace.h" #include "app/ui_context.h" #include "app/util/clipboard.h" -#include "base/path.h" +#include "base/fs.h" #include "doc/document_event.h" #include "doc/layer.h" #include "doc/sprite.h" diff --git a/src/app/ui/file_selector.cpp b/src/app/ui/file_selector.cpp index cb48710cc..bb8f2c3e1 100644 --- a/src/app/ui/file_selector.cpp +++ b/src/app/ui/file_selector.cpp @@ -26,7 +26,6 @@ #include "base/bind.h" #include "base/convert_to.h" #include "base/fs.h" -#include "base/path.h" #include "base/split_string.h" #include "base/unique_ptr.h" #include "ui/ui.h" diff --git a/src/app/ui/font_popup.cpp b/src/app/ui/font_popup.cpp index 8c89f9d06..8de0fd937 100644 --- a/src/app/ui/font_popup.cpp +++ b/src/app/ui/font_popup.cpp @@ -18,7 +18,6 @@ #include "app/util/freetype_utils.h" #include "base/bind.h" #include "base/fs.h" -#include "base/path.h" #include "base/string.h" #include "base/unique_ptr.h" #include "doc/conversion_she.h" diff --git a/src/app/ui/main_window.cpp b/src/app/ui/main_window.cpp index 273abfc8b..5efcc84cd 100644 --- a/src/app/ui/main_window.cpp +++ b/src/app/ui/main_window.cpp @@ -36,7 +36,7 @@ #include "app/ui/workspace_tabs.h" #include "app/ui_context.h" #include "base/bind.h" -#include "base/path.h" +#include "base/fs.h" #include "she/display.h" #include "ui/message.h" #include "ui/splitter.h" diff --git a/src/app/ui/recent_listbox.cpp b/src/app/ui/recent_listbox.cpp index 236b188ae..1c3108fd5 100644 --- a/src/app/ui/recent_listbox.cpp +++ b/src/app/ui/recent_listbox.cpp @@ -19,7 +19,7 @@ #include "app/ui/skin/style.h" #include "app/ui_context.h" #include "base/bind.h" -#include "base/path.h" +#include "base/fs.h" #include "ui/graphics.h" #include "ui/link_label.h" #include "ui/listitem.h" diff --git a/src/doc/document.cpp b/src/doc/document.cpp index c8d4d57bd..6259c63cb 100644 --- a/src/doc/document.cpp +++ b/src/doc/document.cpp @@ -10,7 +10,7 @@ #include "doc/document.h" -#include "base/path.h" +#include "base/fs.h" #include "doc/context.h" #include "doc/sprite.h" diff --git a/src/doc/documents.cpp b/src/doc/documents.cpp index 74fa5f46a..d4e06be30 100644 --- a/src/doc/documents.cpp +++ b/src/doc/documents.cpp @@ -10,8 +10,8 @@ #include "doc/documents.h" +#include "base/fs.h" #include "base/mutex.h" -#include "base/path.h" #include "doc/document.h" #include diff --git a/src/docio/detect_format.cpp b/src/docio/detect_format.cpp index 686dd881c..805daba01 100644 --- a/src/docio/detect_format.cpp +++ b/src/docio/detect_format.cpp @@ -7,7 +7,7 @@ #include "docio/detect_format.h" #include "base/file_handle.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include "flic/flic_details.h" diff --git a/src/gen/gen.cpp b/src/gen/gen.cpp index 3d0bcabfc..9377f4c3d 100644 --- a/src/gen/gen.cpp +++ b/src/gen/gen.cpp @@ -5,7 +5,7 @@ // Read LICENSE.txt for more information. #include "base/file_handle.h" -#include "base/path.h" +#include "base/fs.h" #include "base/program_options.h" #include "base/string.h" #include "gen/pref_types.h" diff --git a/src/gen/pref_types.cpp b/src/gen/pref_types.cpp index 99971dd46..72b25c0ac 100644 --- a/src/gen/pref_types.cpp +++ b/src/gen/pref_types.cpp @@ -1,12 +1,12 @@ // Aseprite Code Generator -// Copyright (c) 2014, 2015 David Capello +// Copyright (c) 2014-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. #include "base/exception.h" #include "base/file_handle.h" -#include "base/path.h" +#include "base/fs.h" #include "base/split_string.h" #include "base/string.h" #include "gen/common.h" diff --git a/src/gen/ui_class.cpp b/src/gen/ui_class.cpp index 600ca6f17..9b7f1cf72 100644 --- a/src/gen/ui_class.cpp +++ b/src/gen/ui_class.cpp @@ -1,5 +1,5 @@ // Aseprite Code Generator -// Copyright (c) 2014, 2015 David Capello +// Copyright (c) 2014-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -8,7 +8,7 @@ #include "base/exception.h" #include "base/file_handle.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include "gen/common.h" diff --git a/src/she/osx/app_delegate.mm b/src/she/osx/app_delegate.mm index 667b81bdf..2b5348fb0 100644 --- a/src/she/osx/app_delegate.mm +++ b/src/she/osx/app_delegate.mm @@ -12,7 +12,7 @@ #include "she/osx/app_delegate.h" -#include "base/path.h" +#include "base/fs.h" #include "she/event.h" #include "she/event_queue.h" #include "she/osx/app.h" diff --git a/src/she/osx/generate_drop_files.h b/src/she/osx/generate_drop_files.h index 1a7ea3e11..dc483dfe4 100644 --- a/src/she/osx/generate_drop_files.h +++ b/src/she/osx/generate_drop_files.h @@ -8,7 +8,7 @@ #define SHE_OSX_APP_GENERATE_DROP_FILES_H_INCLUDED #pragma once -#include "base/path.h" +#include "base/fs.h" inline void generate_drop_files_from_nsarray(NSArray* filenames) { diff --git a/src/she/osx/native_dialogs.mm b/src/she/osx/native_dialogs.mm index 39d1a7372..0d6576c7a 100644 --- a/src/she/osx/native_dialogs.mm +++ b/src/she/osx/native_dialogs.mm @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2012-2015 David Capello +// Copyright (C) 2012-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -7,13 +7,12 @@ #include #include +#include "base/fs.h" #include "she/display.h" #include "she/keys.h" #include "she/native_cursor.h" #include "she/osx/native_dialogs.h" -#include "base/path.h" - @interface OpenSaveHelper : NSObject { @private NSSavePanel* panel; diff --git a/src/she/win/native_dialogs.cpp b/src/she/win/native_dialogs.cpp index cc67af9a1..fb95eb746 100644 --- a/src/she/win/native_dialogs.cpp +++ b/src/she/win/native_dialogs.cpp @@ -1,5 +1,5 @@ // SHE library -// Copyright (C) 2015 David Capello +// Copyright (C) 2015-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -10,7 +10,7 @@ #include "she/win/native_dialogs.h" -#include "base/path.h" +#include "base/fs.h" #include "base/string.h" #include "she/display.h" #include "she/error.h" diff --git a/src/she/win/pen.cpp b/src/she/win/pen.cpp index 8f7ce5ae5..9dbd1389d 100644 --- a/src/she/win/pen.cpp +++ b/src/she/win/pen.cpp @@ -13,7 +13,6 @@ #include "base/debug.h" #include "base/fs.h" #include "base/log.h" -#include "base/path.h" #include "base/string.h" #include diff --git a/src/steam/steam.cpp b/src/steam/steam.cpp index 7c7041539..3b9e2b5ce 100644 --- a/src/steam/steam.cpp +++ b/src/steam/steam.cpp @@ -13,7 +13,6 @@ #include "base/dll.h" #include "base/fs.h" #include "base/log.h" -#include "base/path.h" #include "base/string.h" namespace steam { diff --git a/src/ui/listbox.cpp b/src/ui/listbox.cpp index 8a277d107..91a01a044 100644 --- a/src/ui/listbox.cpp +++ b/src/ui/listbox.cpp @@ -1,5 +1,5 @@ // Aseprite UI Library -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This file is released under the terms of the MIT license. // Read LICENSE.txt for more information. @@ -10,7 +10,7 @@ #include "ui/listbox.h" -#include "base/path.h" +#include "base/fs.h" #include "ui/listitem.h" #include "ui/message.h" #include "ui/size_hint_event.h"