Fix erroneous include renaming

albin-johansson · Jul 11, 2023 · ab42be8 · ab42be8
1 parent 0b9e0dc
commit ab42be8
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 29 deletions.
diff --git a/source/lib/io/export/tactile_yaml_exporter.cpp b/source/lib/io/export/tactile_yaml_exporter.cpp
@@ -33,8 +33,8 @@
 #include "io/base64_tiles.hpp"
 #include "io/compression.hpp"
 #include "io/ir/map/map_ir.hpp"
-#include "ui/stream_utils.hpp"
-#include "ui/yaml_utils.hpp"
+#include "io/stream_utils.hpp"
+#include "io/yaml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/export/tiled_json_exporter.cpp b/source/lib/io/export/tiled_json_exporter.cpp
@@ -29,7 +29,7 @@
 #include "io/base64_tiles.hpp"
 #include "io/export/tiled_info.hpp"
 #include "io/ir/map/map_ir.hpp"
-#include "ui/json_utils.hpp"
+#include "io/json_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/export/tiled_xml_exporter.cpp b/source/lib/io/export/tiled_xml_exporter.cpp
@@ -33,8 +33,8 @@
 #include "io/export/tiled_info.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/save_formats.hpp"
-#include "ui/stream_utils.hpp"
-#include "ui/xml_utils.hpp"
+#include "io/stream_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/file_history_io.cpp b/source/lib/io/file_history_io.cpp
@@ -25,7 +25,7 @@
 
 #include "io/directories.hpp"
 #include "io/protobuf_types.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/ir/godot/godot_writer.cpp b/source/lib/io/ir/godot/godot_writer.cpp
@@ -32,7 +32,7 @@
 #include "common/util/filesystem.hpp"
 #include "io/ir/godot/godot_options.hpp"
 #include "io/ir/godot/godot_scene.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/json_utils.cpp b/source/lib/io/json_utils.cpp
@@ -28,7 +28,7 @@
 #include "common/debug/panic.hpp"
 #include "common/util/filesystem.hpp"
 #include "io/save_formats.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/lang/language_parser.cpp b/source/lib/io/lang/language_parser.cpp
@@ -26,7 +26,7 @@
 #include "common/predef.hpp"
 #include "common/type/string.hpp"
 #include "io/directories.hpp"
-#include "ui/json_utils.hpp"
+#include "io/json_utils.hpp"
 #include "ui/style/icons.hpp"
 
 namespace tactile {

diff --git a/source/lib/io/map/parse/json/json_parser.cpp b/source/lib/io/map/parse/json/json_parser.cpp
@@ -22,7 +22,7 @@
 #include <string>  // string
 
 #include "common/type/string.hpp"
-#include "ui/json_utils.hpp"
+#include "io/json_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/json/json_parser.hpp b/source/lib/io/map/parse/json/json_parser.hpp
@@ -22,7 +22,7 @@
 #include "common/type/path.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/parse_error.hpp"
-#include "ui/json_utils.hpp"
+#include "io/json_utils.hpp"
 
 namespace tactile {
 

diff --git a/source/lib/io/map/parse/json/json_tileset_parser.cpp b/source/lib/io/map/parse/json/json_tileset_parser.cpp
@@ -26,7 +26,7 @@
 #include "common/type/string.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/json/json_parser.hpp"
-#include "ui/json_utils.hpp"
+#include "io/json_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/xml/xml_attribute_parser.cpp b/source/lib/io/map/parse/xml/xml_attribute_parser.cpp
@@ -25,7 +25,7 @@
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/xml/xml_parser.hpp"
 #include "io/save_formats.hpp"
-#include "ui/xml_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/xml/xml_layer_parser.cpp b/source/lib/io/map/parse/xml/xml_layer_parser.cpp
@@ -30,7 +30,7 @@
 #include "io/base64_tiles.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/xml/xml_parser.hpp"
-#include "ui/xml_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/xml/xml_parser.cpp b/source/lib/io/map/parse/xml/xml_parser.cpp
@@ -21,7 +21,7 @@
 
 #include <utility>  // move
 
-#include "ui/xml_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/xml/xml_parser.hpp b/source/lib/io/map/parse/xml/xml_parser.hpp
@@ -23,7 +23,7 @@
 #include "common/type/path.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/parse_error.hpp"
-#include "ui/xml_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 

diff --git a/source/lib/io/map/parse/xml/xml_tileset_parser.cpp b/source/lib/io/map/parse/xml/xml_tileset_parser.cpp
@@ -22,7 +22,7 @@
 #include "common/debug/assert.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/xml/xml_parser.hpp"
-#include "ui/xml_utils.hpp"
+#include "io/xml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/yaml/yaml_attribute_parser.cpp b/source/lib/io/map/parse/yaml/yaml_attribute_parser.cpp
@@ -26,7 +26,7 @@
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/yaml/yaml_parser.hpp"
 #include "io/save_formats.hpp"
-#include "ui/yaml_utils.hpp"
+#include "io/yaml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/yaml/yaml_layer_parser.cpp b/source/lib/io/map/parse/yaml/yaml_layer_parser.cpp
@@ -27,7 +27,7 @@
 #include "io/base64_tiles.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/yaml/yaml_parser.hpp"
-#include "ui/yaml_utils.hpp"
+#include "io/yaml_utils.hpp"
 
 using namespace std::string_literals;
 

diff --git a/source/lib/io/map/parse/yaml/yaml_parser.cpp b/source/lib/io/map/parse/yaml/yaml_parser.cpp
@@ -26,7 +26,7 @@
 
 #include "common/type/expected.hpp"
 #include "io/compression.hpp"
-#include "ui/yaml_utils.hpp"
+#include "io/yaml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/map/parse/yaml/yaml_tileset_parser.cpp b/source/lib/io/map/parse/yaml/yaml_tileset_parser.cpp
@@ -23,7 +23,7 @@
 #include "common/type/string.hpp"
 #include "io/ir/map/map_ir.hpp"
 #include "io/map/parse/yaml/yaml_parser.hpp"
-#include "ui/yaml_utils.hpp"
+#include "io/yaml_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/session_io.cpp b/source/lib/io/session_io.cpp
@@ -28,7 +28,7 @@
 #include "io/protobuf_types.hpp"
 #include "model/documents/document_components.hpp"
 #include "model/model.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/settings_io.cpp b/source/lib/io/settings_io.cpp
@@ -26,7 +26,7 @@
 #include "common/type/path.hpp"
 #include "io/directories.hpp"
 #include "io/protobuf_types.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 namespace {

diff --git a/source/lib/io/xml_utils.cpp b/source/lib/io/xml_utils.cpp
@@ -27,7 +27,7 @@
 
 #include "common/debug/assert.hpp"
 #include "ui/constants.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 

diff --git a/source/lib/io/yaml_utils.cpp b/source/lib/io/yaml_utils.cpp
@@ -25,7 +25,7 @@
 #include "common/debug/panic.hpp"
 #include "common/util/filesystem.hpp"
 #include "io/save_formats.hpp"
-#include "ui/stream_utils.hpp"
+#include "io/stream_utils.hpp"
 
 namespace tactile {
 

diff --git a/source/lib/ui/dialog/save_as_dialog.cpp b/source/lib/ui/dialog/save_as_dialog.cpp
@@ -24,10 +24,10 @@
 #include <fmt/std.h>
 #include <spdlog/spdlog.h>
 
+#include "io/file_dialog.hpp"
 #include "io/save_formats.hpp"
 #include "model/events/file_events.hpp"
 #include "model/persistence/settings.hpp"
-#include "ui/file_dialog.hpp"
 
 namespace tactile::ui {
 

diff --git a/source/lib/ui/dock/tileset/dialogs/new_tileset_dialog.cpp b/source/lib/ui/dock/tileset/dialogs/new_tileset_dialog.cpp
@@ -21,10 +21,10 @@
 
 #include <imgui.h>
 
+#include "io/file_dialog.hpp"
 #include "model/events/tileset_events.hpp"
 #include "model/i18n/language_system.hpp"
 #include "ui/dialog/dialog.hpp"
-#include "ui/file_dialog.hpp"
 #include "ui/widget/widgets.hpp"
 
 namespace tactile::ui {

diff --git a/source/lib/ui/ui.cpp b/source/lib/ui/ui.cpp
@@ -19,6 +19,7 @@
 
 #include "ui.hpp"
 
+#include "io/file_dialog.hpp"
 #include "model/documents/document_system.hpp"
 #include "model/events/map_events.hpp"
 #include "ui/dialog/about_dialog.hpp"
@@ -37,7 +38,6 @@
 #include "ui/dock/log/log_dock.hpp"
 #include "ui/dock/property/property_dock.hpp"
 #include "ui/dock/tileset/tileset_dock.hpp"
-#include "ui/file_dialog.hpp"
 #include "ui/menu/menu_bar.hpp"
 #include "ui/style/alignment.hpp"
 #include "ui/style/colors.hpp"

diff --git a/source/lib/ui/widget/attribute_widgets.cpp b/source/lib/ui/widget/attribute_widgets.cpp
@@ -27,8 +27,8 @@
 #include "common/type/array.hpp"
 #include "common/util/filesystem.hpp"
 #include "common/util/string_buffer.hpp"
+#include "io/file_dialog.hpp"
 #include "ui/constants.hpp"
-#include "ui/file_dialog.hpp"
 #include "ui/style/colors.hpp"
 #include "ui/style/icons.hpp"
 #include "ui/widget/scoped.hpp"