From d96fc6d41b4d35b7610f993e6d09f2e7bfed609e Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Sun, 14 May 2023 21:50:58 +0200
Subject: [PATCH] fix: Compilation on macOS

---
 lib/libimhex/include/hex/api/imhex_api.hpp                    | 1 -
 lib/libimhex/source/api/imhex_api.cpp                         | 1 +
 lib/libimhex/source/helpers/utils_macos.mm                    | 2 ++
 main/source/init/splash_window.cpp                            | 2 ++
 main/source/main.cpp                                          | 1 +
 plugins/builtin/include/content/providers/file_provider.hpp   | 2 --
 plugins/builtin/include/content/views/view_data_inspector.hpp | 1 +
 plugins/builtin/include/content/views/view_disassembler.hpp   | 2 ++
 plugins/builtin/include/content/views/view_find.hpp           | 3 ++-
 plugins/builtin/source/content/pl_visualizers.cpp             | 1 +
 plugins/builtin/source/content/providers.cpp                  | 1 +
 plugins/windows/source/views/view_tty_console.cpp             | 1 +
 12 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/libimhex/include/hex/api/imhex_api.hpp b/lib/libimhex/include/hex/api/imhex_api.hpp
index bda9213c7..b2cee1646 100644
--- a/lib/libimhex/include/hex/api/imhex_api.hpp
+++ b/lib/libimhex/include/hex/api/imhex_api.hpp
@@ -10,7 +10,6 @@
 #include <map>
 
 #include <hex/helpers/concepts.hpp>
-#include <hex/api/task.hpp>
 #include <hex/api/keybinding.hpp>
 
 #include <wolv/io/fs.hpp>
diff --git a/lib/libimhex/source/api/imhex_api.cpp b/lib/libimhex/source/api/imhex_api.cpp
index 54407f3a7..63e937a00 100644
--- a/lib/libimhex/source/api/imhex_api.cpp
+++ b/lib/libimhex/source/api/imhex_api.cpp
@@ -2,6 +2,7 @@
 #include <hex/api/content_registry.hpp>
 
 #include <hex/api/event.hpp>
+#include <hex/api/task.hpp>
 #include <hex/providers/provider.hpp>
 
 #include <utility>
diff --git a/lib/libimhex/source/helpers/utils_macos.mm b/lib/libimhex/source/helpers/utils_macos.mm
index 2daed76d2..12c9e15b0 100644
--- a/lib/libimhex/source/helpers/utils_macos.mm
+++ b/lib/libimhex/source/helpers/utils_macos.mm
@@ -13,6 +13,8 @@
     #include <hex/api/event.hpp>
 
     #include <string>
+
+    #import <Cocoa/Cocoa.h>
     #import <Foundation/Foundation.h>
 
     static std::string nsurl_to_string(NSURL* url) {
diff --git a/main/source/init/splash_window.cpp b/main/source/init/splash_window.cpp
index 551dec29a..f5324fcc4 100644
--- a/main/source/init/splash_window.cpp
+++ b/main/source/init/splash_window.cpp
@@ -1,6 +1,8 @@
 #include "init/splash_window.hpp"
 
 #include <hex/api/imhex_api.hpp>
+#include <hex/api/task.hpp>
+
 #include <hex/helpers/utils.hpp>
 #include <hex/helpers/utils_macos.hpp>
 #include <hex/helpers/fmt.hpp>
diff --git a/main/source/main.cpp b/main/source/main.cpp
index 704ba7687..7d3a33c6d 100644
--- a/main/source/main.cpp
+++ b/main/source/main.cpp
@@ -7,6 +7,7 @@
 #include "init/splash_window.hpp"
 #include "init/tasks.hpp"
 
+#include <hex/api/task.hpp>
 #include <hex/api/project_file_manager.hpp>
 
 #include <wolv/io/fs.hpp>
diff --git a/plugins/builtin/include/content/providers/file_provider.hpp b/plugins/builtin/include/content/providers/file_provider.hpp
index af85fd6e1..4c3c7c5bd 100644
--- a/plugins/builtin/include/content/providers/file_provider.hpp
+++ b/plugins/builtin/include/content/providers/file_provider.hpp
@@ -61,8 +61,6 @@ namespace hex::plugin::builtin {
         wolv::io::File m_file;
         size_t m_fileSize = 0;
 
-        std::atomic<u32> m_mapCounter = 0;
-
         std::optional<struct stat> m_fileStats;
 
         bool m_readable = false, m_writable = false;
diff --git a/plugins/builtin/include/content/views/view_data_inspector.hpp b/plugins/builtin/include/content/views/view_data_inspector.hpp
index 565461d8b..ea5a4ba07 100644
--- a/plugins/builtin/include/content/views/view_data_inspector.hpp
+++ b/plugins/builtin/include/content/views/view_data_inspector.hpp
@@ -3,6 +3,7 @@
 #include <hex/ui/view.hpp>
 
 #include <hex/api/content_registry.hpp>
+#include <hex/api/task.hpp>
 
 #include <bit>
 #include <cstdio>
diff --git a/plugins/builtin/include/content/views/view_disassembler.hpp b/plugins/builtin/include/content/views/view_disassembler.hpp
index 58e5c04bf..a7a73b591 100644
--- a/plugins/builtin/include/content/views/view_disassembler.hpp
+++ b/plugins/builtin/include/content/views/view_disassembler.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <hex/api/task.hpp>
+
 #include <hex/ui/view.hpp>
 #include <ui/widgets.hpp>
 
diff --git a/plugins/builtin/include/content/views/view_find.hpp b/plugins/builtin/include/content/views/view_find.hpp
index 23a316a32..f0aedb703 100644
--- a/plugins/builtin/include/content/views/view_find.hpp
+++ b/plugins/builtin/include/content/views/view_find.hpp
@@ -2,7 +2,7 @@
 
 #include <hex.hpp>
 
-#include <imgui.h>
+#include <hex/api/task.hpp>
 #include <hex/ui/view.hpp>
 #include <ui/widgets.hpp>
 
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include <wolv/container/interval_tree.hpp>
+#include <imgui.h>
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/pl_visualizers.cpp b/plugins/builtin/source/content/pl_visualizers.cpp
index d47374e6b..4cae09ffa 100644
--- a/plugins/builtin/source/content/pl_visualizers.cpp
+++ b/plugins/builtin/source/content/pl_visualizers.cpp
@@ -1,5 +1,6 @@
 #include <hex/api/content_registry.hpp>
 #include <hex/api/localization.hpp>
+#include <hex/api/task.hpp>
 
 #include <hex/helpers/disassembler.hpp>
 #include <hex/helpers/utils.hpp>
diff --git a/plugins/builtin/source/content/providers.cpp b/plugins/builtin/source/content/providers.cpp
index e3bdbf314..d07d7307c 100644
--- a/plugins/builtin/source/content/providers.cpp
+++ b/plugins/builtin/source/content/providers.cpp
@@ -10,6 +10,7 @@
 #include "content/providers/view_provider.hpp"
 
 #include <hex/api/project_file_manager.hpp>
+#include <hex/api/task.hpp>
 #include <hex/helpers/fmt.hpp>
 
 #include <nlohmann/json.hpp>
diff --git a/plugins/windows/source/views/view_tty_console.cpp b/plugins/windows/source/views/view_tty_console.cpp
index 154f871dc..5c3713eff 100644
--- a/plugins/windows/source/views/view_tty_console.cpp
+++ b/plugins/windows/source/views/view_tty_console.cpp
@@ -2,6 +2,7 @@
 
 #include <imgui_internal.h>
 
+#include <hex/api/task.hpp>
 #include <hex/helpers/utils.hpp>
 
 #include <wolv/utils/guards.hpp>