From 361689a945957b31958698942a8d41a62c6b820a Mon Sep 17 00:00:00 2001 From: blankie Date: Wed, 22 Feb 2023 16:33:36 +0700 Subject: [PATCH] Use forward declarations --- arb.h | 1 - event_loop.h | 6 +++--- fragments/filters.h | 2 +- group_panel.h | 2 +- logcat_thread.h | 1 + misc.h | 3 ++- myimconfig.h | 3 ++- windows/debug.h | 2 +- windows/exclusions.h | 2 +- windows/filters.h | 2 +- windows/logs.h | 2 +- windows/main.cpp | 3 ++- windows/main.h | 6 +++--- windows/settings.h | 2 +- 14 files changed, 20 insertions(+), 17 deletions(-) diff --git a/arb.h b/arb.h index c797d5c..3dde7b3 100644 --- a/arb.h +++ b/arb.h @@ -1,7 +1,6 @@ #pragma once #include -#include "logcat_thread.h" #define ARB_MAX_SIZE 255 diff --git a/event_loop.h b/event_loop.h index ee1dcf9..bbd0178 100644 --- a/event_loop.h +++ b/event_loop.h @@ -1,8 +1,8 @@ #pragma once -#include +struct ImFont; // forward declaration from imgui/imgui.h -#include "config.h" -#include "logcat_thread.h" +struct Config; // forward declaration from config.h +class LogcatThread; // forward declaration from logcat_thread.h void event_loop(ImFont* monospace_font, Config& active_config, LogcatThread& logcat_thread); diff --git a/fragments/filters.h b/fragments/filters.h index 9c1c211..8b4071f 100644 --- a/fragments/filters.h +++ b/fragments/filters.h @@ -1,7 +1,7 @@ #pragma once #include -#include "../config.h" +struct Config; // forward declaration from ../config.h #include "../filters.h" void filters_fragment(Config& active_config, Filters& __restrict active_filters, Filters& __restrict inactive_filters, diff --git a/group_panel.h b/group_panel.h index b5f2a4b..b99cc1b 100644 --- a/group_panel.h +++ b/group_panel.h @@ -1,6 +1,6 @@ #pragma once -#include +struct ImVec2; // forward declaration from imgui/imgui.h // The following code is slightly modified public domain code from https://github.com/thedmd // All modifications have an inline comment with "[CUSTOM]" diff --git a/logcat_thread.h b/logcat_thread.h index 85ad304..ed94d58 100644 --- a/logcat_thread.h +++ b/logcat_thread.h @@ -3,6 +3,7 @@ #include #include #include "arb.h" +#include "log.h" #include "logcat_entry.h" typedef std::variant LogcatThreadItem; diff --git a/misc.h b/misc.h index b4eca48..1647c62 100644 --- a/misc.h +++ b/misc.h @@ -1,7 +1,8 @@ #pragma once #include -#include +typedef int ImGuiWindowFlags; // forward declaration from imgui/imgui.h +typedef int ImGuiKeyChord; // forward declaration from imgui/imgui.h std::string quote(const std::string& str); void throw_system_error(int err, const char* what); diff --git a/myimconfig.h b/myimconfig.h index c74db57..6bdef6d 100644 --- a/myimconfig.h +++ b/myimconfig.h @@ -1,6 +1,7 @@ #pragma once -#include "log.h" +#include +void log(std::string message); // forward declaration from log.h #define IM_ASSERT_USER_ERROR(expr,msg) do { if (!(expr)) { log(msg); } } while (0); #define IMGUI_DISABLE_OBSOLETE_FUNCTIONS diff --git a/windows/debug.h b/windows/debug.h index 3e2f8d8..d73e390 100644 --- a/windows/debug.h +++ b/windows/debug.h @@ -1,5 +1,5 @@ #pragma once -#include "../logcat_thread.h" +class LogcatThread; // forward declaration from ../logcat_thread.h void debug_window(LogcatThread& logcat_thread); diff --git a/windows/exclusions.h b/windows/exclusions.h index 59d33b6..f2c3682 100644 --- a/windows/exclusions.h +++ b/windows/exclusions.h @@ -2,8 +2,8 @@ #include +struct Config; // forward declaration from ../config.h #include "../logcat_entry.h" -#include "../config.h" void exclusions_window(Config& __restrict active_config, Config& __restrict inactive_config, const std::vector& logcat_entries, std::vector& filtered_logcat_entry_offsets, diff --git a/windows/filters.h b/windows/filters.h index 28f6227..2ba1b6c 100644 --- a/windows/filters.h +++ b/windows/filters.h @@ -2,8 +2,8 @@ #include +struct Config; // forward declaration from ../config.h #include "../logcat_entry.h" -#include "../config.h" void filters_window(Config& __restrict active_config, Config& __restrict inactive_config, const std::vector& logcat_entries, std::vector& filtered_logcat_entry_offsets, diff --git a/windows/logs.h b/windows/logs.h index 085efec..390c862 100644 --- a/windows/logs.h +++ b/windows/logs.h @@ -1,5 +1,5 @@ #pragma once -#include +struct ImFont; // forward declaration from imgui/imgui.h void logs_window(ImFont* monospace_font, bool* __restrict autoscrolling, bool* __restrict p_open); diff --git a/windows/main.cpp b/windows/main.cpp index 9ec8b3e..daeee98 100644 --- a/windows/main.cpp +++ b/windows/main.cpp @@ -4,6 +4,7 @@ #include #include "../misc.h" +#include "../config.h" #include "../logcat_entry.h" #include "../logcat_thread.h" #include "main.h" @@ -113,7 +114,7 @@ void main_window(bool latest_log_entries_read, ImFont* monospace_font, LogcatThr ImGui::SetNextWindowPos(ImGui::GetMainViewport()->WorkPos); ImGui::SetNextWindowSize(ImGui::GetMainViewport()->WorkSize); - if (!ImGui::BeginWithCloseShortcut("LogMeow", nullptr, + if (!ImGui::Begin("LogMeow", nullptr, ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBringToFrontOnFocus)) { ImGui::End(); return; diff --git a/windows/main.h b/windows/main.h index 0472601..d69bad5 100644 --- a/windows/main.h +++ b/windows/main.h @@ -1,11 +1,11 @@ #pragma once -#include +struct ImFont; // forward declaration from imgui/imgui.h #include -#include "../config.h" +struct Config; // forward declaration from ../config.h +class LogcatThread; // forward declaration from ../logcat_thread.h #include "../logcat_entry.h" -#include "../logcat_thread.h" void main_window(bool latest_log_entries_read, ImFont* monospace_font, LogcatThread& logcat_thread, std::vector& logcat_entries, std::vector& filtered_logcat_entry_offsets, diff --git a/windows/settings.h b/windows/settings.h index 078afe4..0bd6907 100644 --- a/windows/settings.h +++ b/windows/settings.h @@ -1,5 +1,5 @@ #pragma once -#include "../config.h" +struct Config; // forward declaration from ../config.h void settings_window(Config& __restrict active_config, Config& __restrict inactive_config, bool* p_open);