Update laf library (base/path is gone, use base/fs)

laf

@@ -1 +1 @@
-Subproject commit 266312171630996d2823958d598514a6a5638060
+Subproject commit 88dd1683c05e6da7d8bea781a0e6ef32d28f8b94

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"

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"

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"

src/app/app_options.cpp

@@ -10,7 +10,7 @@
 
 #include "app/app_options.h"
 
-#include "base/path.h"
+#include "base/fs.h"
 
 #include <cstdlib>
 #include <iostream>

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"
 

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 {

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"

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"

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"

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"

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"

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"

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"

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 <cmath>

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 <cstring>

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;
 

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"

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 <cstdlib>

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;
 

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"

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"

src/app/recent_files.cpp

@@ -12,7 +12,6 @@
 
 #include "app/ini_file.h"
 #include "base/fs.h"
-#include "base/path.h"
 
 #include <cstdio>
 #include <cstring>

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"

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"
 

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 {

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 <cstdio>

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"

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"

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"

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"

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"

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"
 

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 <algorithm>

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"
 

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"

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"

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"
 

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"

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)
 {

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 <Cocoa/Cocoa.h>
 #include <vector>
 
+#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;

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"

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 <iostream>

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 {

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"