From fd0f92cb8ccc7169baea7eb7b8269ba245244a5b Mon Sep 17 00:00:00 2001 From: AKMaily Date: Thu, 5 Sep 2024 09:32:38 +0200 Subject: [PATCH] Changed the order of the included files back --- src/handler.cpp | 12 ++++++++---- src/handler.hpp | 3 ++- src/saves_popup.cpp | 12 +++++++----- src/style.cpp | 5 +++-- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/handler.cpp b/src/handler.cpp index bf806d32..c733792b 100644 --- a/src/handler.cpp +++ b/src/handler.cpp @@ -1,10 +1,14 @@ #include "handler.hpp" -#include "../imgui-stdlib/imgui_stdlib.h" -#include "get_from_github.hpp" -#include "popups.hpp" + #include -#include #include +#include + + +#include "popups.hpp" +#include "get_from_github.hpp" + +#include "../imgui-stdlib/imgui_stdlib.h" std::vector getDeviceInfos() { std::vector axisInfos; diff --git a/src/handler.hpp b/src/handler.hpp index 831c44d1..9255510f 100644 --- a/src/handler.hpp +++ b/src/handler.hpp @@ -4,10 +4,11 @@ #include "../ai_omniscope-v2-communication_sw/src/OmniscopeSampler.hpp" #include "languages.hpp" -#include + #include #include #include +#include struct AxisInfo { std::pair> &> data; diff --git a/src/saves_popup.cpp b/src/saves_popup.cpp index e5c3e642..8b0486ab 100644 --- a/src/saves_popup.cpp +++ b/src/saves_popup.cpp @@ -1,11 +1,13 @@ +#include +#include +#include +#include "popups.hpp" +#include "look_up_saves.hpp" + #include "imgui_stdlib.h" #include "languages.hpp" -#include "look_up_saves.hpp" -#include "popups.hpp" + #include "style.hpp" -#include -#include -#include static void save(const Omniscope::Id &device, const std::vector> &values, diff --git a/src/style.cpp b/src/style.cpp index 9bde81fc..b067f468 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -4,14 +4,15 @@ #include #define IMGUI_DEFINE_MATH_OPERATORS #define STB_IMAGE_IMPLEMENTATION -#include "../imgui-filebrowser/imfilebrowser.h" +#include "style.hpp" #include "../stb_image/stb_image.h" #include "imagesHeader.hpp" #include "imgui_internal.h" #include "jasonhandler.hpp" #include "languages.hpp" +#include "../imgui-filebrowser/imfilebrowser.h" #include "popups.hpp" -#include "style.hpp" + void SetupImGuiStyle(bool bStyleDark_, float alpha_) {