Refactored libimhex to and includes to better represent it as library

external/ImGui/include/imgui_memory_editor.h

@@ -46,9 +46,9 @@
 
 #include <stdio.h>      // sprintf, scanf
 #include <stdint.h>     // uint8_t, etc.
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #ifdef _MSC_VER
 #define _PRISizeT   "I"

include/helpers/plugin_handler.hpp

@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <string_view>
 

include/helpers/project_file_handler.hpp

@@ -5,7 +5,7 @@
 #include <string_view>
 
 #include "patches.hpp"
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 

include/providers/file_provider.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <string_view>
 

include/views/view_bookmarks.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <vector>
 #include <list>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 

include/views/view_command_palette.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <hex.hpp>
+#include <hex/views/view.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "views/view.hpp"
+#include <hex/lang/pattern_data.hpp>
-#include "lang/pattern_data.hpp"
 
 #include <vector>
 #include <tuple>

include/views/view_data_inspector.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
 
 #include <bit>
 #include <cstdio>

include/views/view_disassembler.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
+#include <hex/views/view.hpp>
+
 #include "helpers/disassembler.hpp"
-#include "views/view.hpp"
 
 #include <capstone/capstone.h>
 

include/views/view_hashes.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 

include/views/view_help.hpp

@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
 
 #include <vector>
 #include <tuple>

include/views/view_hexeditor.hpp

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
-#include "imgui_memory_editor.h"
+#include <imgui_memory_editor.h>
-#include "ImGuiFileBrowser.h"
+#include <ImGuiFileBrowser.h>
 
 #include <list>
 #include <tuple>
 #include <random>
 #include <vector>
 
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
 
 namespace hex {
 

include/views/view_information.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <array>
 #include <cstdio>

include/views/view_patches.hpp

@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <optional>
 

include/views/view_pattern.hpp

@@ -1,17 +1,17 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
-#include "lang/evaluator.hpp"
+#include <hex/lang/evaluator.hpp>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <cstring>
 #include <filesystem>
 #include <thread>
 
-#include "ImGuiFileBrowser.h"
+#include <ImGuiFileBrowser.h>
-#include "TextEditor.h"
+#include <TextEditor.h>
 
 namespace hex {
 

include/views/view_pattern_data.hpp

@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
 
 #include <vector>
 #include <tuple>

include/views/view_settings.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 #include <string>

include/views/view_strings.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 #include <string>

include/views/view_tools.hpp

@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 #include "helpers/math_evaluator.hpp"
 
 #include <array>

include/window.hpp

@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 struct GLFWwindow;
 struct ImGuiSettingsHandler;

plugins/example/source/plugin_example.cpp

@@ -1,6 +1,6 @@
-#include <plugin.hpp>
+#include <hex/plugin.hpp>
 
-#include <views/view.hpp>
+#include <hex/views/view.hpp>
 
 class ViewExample : public hex::View {
 public:

plugins/libimhex/CMakeLists.txt

@@ -16,9 +16,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 add_library(libimhex SHARED
-        source/helpers/event.cpp
+        source/api/event.cpp
+        source/api/content_registry.cpp
         source/helpers/utils.cpp
-        source/helpers/content_registry.cpp
         source/helpers/shared_data.cpp
 
         source/lang/preprocessor.cpp

plugins/libimhex/include/hex/helpers/shared_data.hpp

@@ -5,9 +5,9 @@
 #include <vector>
 #include <map>
 
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
-#include <helpers/event.hpp>
+#include <hex/api/event.hpp>
-#include <views/view.hpp>
+#include <hex/views/view.hpp>
 
 #include <imgui.h>
 #include <nlohmann/json.hpp>

plugins/libimhex/include/hex/lang/evaluator.hpp

@@ -2,10 +2,10 @@
 
 #include <hex.hpp>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
-#include "ast_node.hpp"
+#include <hex/lang/ast_node.hpp>
 
 #include <bit>
 #include <string>

plugins/libimhex/include/hex/lang/parser.hpp

@@ -5,7 +5,7 @@
 #include "token.hpp"
 #include "ast_node.hpp"
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <unordered_map>
 #include <stdexcept>

plugins/libimhex/include/hex/lang/pattern_data.hpp

@@ -4,10 +4,10 @@
 
 #include <imgui.h>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "lang/token.hpp"
+#include <hex/lang/token.hpp>
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstring>
 #include <random>

plugins/libimhex/include/hex/lang/token.hpp

@@ -2,7 +2,7 @@
 
 #include <hex.hpp>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <utility>
 #include <string>

plugins/libimhex/include/hex/plugin.hpp

@@ -4,10 +4,10 @@
 #include <imgui.h>
 
 #include <hex.hpp>
-#include <views/view.hpp>
+#include <hex/api/content_registry.hpp>
-#include <providers/provider.hpp>
+#include <hex/views/view.hpp>
-#include <helpers/shared_data.hpp>
+#include <hex/providers/provider.hpp>
-#include <helpers/content_registry.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 #define IMHEX_PLUGIN_SETUP      namespace hex::plugin::internal {               \
                                     void initializePlugin();                    \

plugins/libimhex/include/hex/providers/provider.hpp

@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex::prv {
 

plugins/libimhex/include/hex/views/view.hpp

@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
 
-#include "helpers/event.hpp"
+#include <hex/api/event.hpp>
 
 #include <functional>
 #include <string>

plugins/libimhex/source/api/content_registry.cpp

@@ -1,6 +1,6 @@
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 #include <filesystem>
 #include <fstream>

plugins/libimhex/source/api/event.cpp

@@ -1,6 +1,6 @@
-#include "helpers/event.hpp"
+#include <hex/api/event.hpp>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 

plugins/libimhex/source/helpers/shared_data.cpp

@@ -1,4 +1,4 @@
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 

plugins/libimhex/source/helpers/utils.cpp

@@ -1,4 +1,4 @@
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <cstdio>
 #include <codecvt>

plugins/libimhex/source/lang/builtin_functions.cpp

@@ -1,5 +1,5 @@
-#include "lang/evaluator.hpp"
+#include <hex/lang/evaluator.hpp>
-#include "helpers/content_registry.hpp"
+#include <hex/api/content_registry.hpp>
 
 namespace hex::lang {
 

plugins/libimhex/source/lang/evaluator.cpp

@@ -1,8 +1,8 @@
-#include "lang/evaluator.hpp"
+#include <hex/lang/evaluator.hpp>
 
-#include "lang/token.hpp"
+#include <hex/lang/token.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "helpers/content_registry.hpp"
+#include <hex/api/content_registry.hpp>
 
 #include <bit>
 #include <algorithm>

plugins/libimhex/source/lang/lexer.cpp

@@ -1,4 +1,4 @@
-#include "lang/lexer.hpp"
+#include <hex/lang/lexer.hpp>
 
 #include <algorithm>
 #include <functional>

plugins/libimhex/source/lang/parser.cpp

@@ -1,4 +1,4 @@
-#include "lang/parser.hpp"
+#include <hex/lang/parser.hpp>
 
 #include <optional>
 #include <variant>

plugins/libimhex/source/lang/preprocessor.cpp

@@ -1,4 +1,4 @@
-#include "lang/preprocessor.hpp"
+#include <hex/lang/preprocessor.hpp>
 
 namespace hex::lang {
 

plugins/libimhex/source/lang/validator.cpp

@@ -1,9 +1,9 @@
-#include "lang/validator.hpp"
+#include <hex/lang/validator.hpp>
 
 #include <unordered_set>
 #include <string>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex::lang {
 

plugins/libimhex/source/providers/provider.cpp

@@ -1,4 +1,4 @@
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <hex.hpp>
 

plugins/libimhex/source/views/view.cpp

@@ -1,12 +1,12 @@
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
 
 #include <functional>
 #include <string>
 #include <vector>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 

source/helpers/crypto.cpp

@@ -1,6 +1,6 @@
 #include "helpers/crypto.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <openssl/md4.h>
 #include <openssl/md5.h>

source/helpers/loader_script_handler.cpp

@@ -1,8 +1,8 @@
 #include "helpers/loader_script_handler.hpp"
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>

source/helpers/patches.cpp

@@ -4,7 +4,7 @@
 #include <string_view>
 #include <type_traits>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 

source/main.cpp

@@ -1,10 +1,10 @@
-#include "helpers/utils.hpp"
 #include "window.hpp"
 
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
-#include <providers/provider.hpp>
+#include <hex/providers/provider.hpp>
+#include <hex/lang/pattern_data.hpp>
+#include <hex/helpers/utils.hpp>
 
-#include "lang/pattern_data.hpp"
 #include "views/view_hexeditor.hpp"
 #include "views/view_pattern.hpp"
 #include "views/view_pattern_data.hpp"
@@ -20,34 +20,35 @@
 #include "views/view_command_palette.hpp"
 #include "views/view_settings.hpp"
 
-
 #include <vector>
 
 int main(int argc, char **argv) {
-    hex::Window window(argc, argv);
+    using namespace hex;
+
+    Window window(argc, argv);
 
     // Shared Data
-    std::vector<hex::lang::PatternData*> patternData;
+    std::vector<lang::PatternData*> patternData;
-    std::list<hex::Bookmark> bookmarks;
+    std::list<Bookmark> bookmarks;
 
     // Create views
-    hex::ContentRegistry::Views::add<hex::ViewHexEditor>(patternData, bookmarks);
+    ContentRegistry::Views::add<ViewHexEditor>(patternData, bookmarks);
-    hex::ContentRegistry::Views::add<hex::ViewPattern>(patternData);
+    ContentRegistry::Views::add<ViewPattern>(patternData);
-    hex::ContentRegistry::Views::add<hex::ViewPatternData>(patternData);
+    ContentRegistry::Views::add<ViewPatternData>(patternData);
-    hex::ContentRegistry::Views::add<hex::ViewDataInspector>();
+    ContentRegistry::Views::add<ViewDataInspector>();
-    hex::ContentRegistry::Views::add<hex::ViewHashes>();
+    ContentRegistry::Views::add<ViewHashes>();
-    hex::ContentRegistry::Views::add<hex::ViewInformation>();
+    ContentRegistry::Views::add<ViewInformation>();
-    hex::ContentRegistry::Views::add<hex::ViewStrings>();
+    ContentRegistry::Views::add<ViewStrings>();
-    hex::ContentRegistry::Views::add<hex::ViewDisassembler>();
+    ContentRegistry::Views::add<ViewDisassembler>();
-    hex::ContentRegistry::Views::add<hex::ViewBookmarks>(bookmarks);
+    ContentRegistry::Views::add<ViewBookmarks>(bookmarks);
-    hex::ContentRegistry::Views::add<hex::ViewPatches>();
+    ContentRegistry::Views::add<ViewPatches>();
-    hex::ContentRegistry::Views::add<hex::ViewTools>();
+    ContentRegistry::Views::add<ViewTools>();
-    hex::ContentRegistry::Views::add<hex::ViewCommandPalette>();
+    ContentRegistry::Views::add<ViewCommandPalette>();
-    hex::ContentRegistry::Views::add<hex::ViewHelp>();
+    ContentRegistry::Views::add<ViewHelp>();
-    hex::ContentRegistry::Views::add<hex::ViewSettings>();
+    ContentRegistry::Views::add<ViewSettings>();
 
     if (argc > 1)
-        hex::View::postEvent(hex::Events::FileDropped, argv[1]);
+        View::postEvent(Events::FileDropped, argv[1]);
 
     window.initPlugins();
     window.loop();

source/views/view_bookmarks.cpp

@@ -1,6 +1,6 @@
 #include "views/view_bookmarks.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 #include "helpers/project_file_handler.hpp"
 
 #include <cstring>

source/views/view_data_inspector.cpp

@@ -1,7 +1,7 @@
 #include "views/view_data_inspector.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 

source/views/view_disassembler.cpp

@@ -1,7 +1,7 @@
 #include "views/view_disassembler.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 

source/views/view_hashes.cpp

@@ -1,12 +1,12 @@
 #include "views/view_hashes.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include "helpers/crypto.hpp"
 
 #include <vector>
 
-#include "helpers/utils.hpp"
 
 namespace hex {
 

source/views/view_hexeditor.cpp

@@ -1,6 +1,6 @@
 #include "views/view_hexeditor.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 #include "providers/file_provider.hpp"
 
 #include <GLFW/glfw3.h>

source/views/view_information.cpp

@@ -1,8 +1,7 @@
 #include "views/view_information.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-
+#include <hex/helpers/utils.hpp>
-#include "helpers/utils.hpp"
 
 #include <cstring>
 #include <cmath>

source/views/view_patches.cpp

@@ -1,8 +1,8 @@
 #include "views/view_patches.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 #include "helpers/project_file_handler.hpp"
 
 #include <string>

source/views/view_pattern.cpp

@@ -1,13 +1,13 @@
 #include "views/view_pattern.hpp"
 
-#include "lang/preprocessor.hpp"
+#include <hex/lang/preprocessor.hpp>
-#include "lang/parser.hpp"
+#include <hex/lang/parser.hpp>
-#include "lang/lexer.hpp"
+#include <hex/lang/lexer.hpp>
-#include "lang/validator.hpp"
+#include <hex/lang/validator.hpp>
-#include "lang/evaluator.hpp"
+#include <hex/lang/evaluator.hpp>
 
 #include "helpers/project_file_handler.hpp"
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <magic.h>
 

source/views/view_pattern_data.cpp

@@ -1,7 +1,7 @@
 #include "views/view_pattern_data.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
 
 namespace hex {
 

source/views/view_settings.cpp

@@ -1,6 +1,6 @@
 #include "views/view_settings.hpp"
 
-#include "helpers/content_registry.hpp"
+#include <hex/api/content_registry.hpp>
 
 namespace hex {
 

source/views/view_strings.cpp

@@ -1,7 +1,7 @@
 #include "views/view_strings.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 

source/views/view_tools.cpp

@@ -4,9 +4,10 @@
 #include <regex>
 #include <optional>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
+
 #include "helpers/plugin_handler.hpp"
-#include "helpers/utils.hpp"
 
 #include <llvm/Demangle/Demangle.h>
 

source/window.cpp

@@ -1,18 +1,18 @@
 #include "window.hpp"
 
 #include <hex.hpp>
+#include <hex/api/content_registry.hpp>
 
 #include <iostream>
 #include <numeric>
 
-#include "imgui.h"
+#include <imgui.h>
-#include "imgui_internal.h"
+#include <imgui_internal.h>
-#include "imgui_impl_glfw.h"
+#include <imgui_impl_glfw.h>
-#include "imgui_impl_opengl3.h"
+#include <imgui_impl_opengl3.h>
-#include "imgui_freetype.h"
+#include <imgui_freetype.h>
 
 #include "helpers/plugin_handler.hpp"
-#include "helpers/content_registry.hpp"
 
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>