From ceea2cbb5cfe115b73289b8ff8bb5a28604999b9 Mon Sep 17 00:00:00 2001 From: pifopi Date: Mon, 8 Sep 2025 01:21:40 +0200 Subject: [PATCH 1/3] Add ifdef guard to prevent including dpp stuff --- SerialPrograms/Source/CommonFramework/Main.cpp | 5 +++-- .../CommonFramework/Notifications/ProgramNotifications.cpp | 2 +- .../Source/Integrations/DiscordIntegrationSettings.cpp | 2 +- .../Source/Integrations/DppIntegration/DppClient.cpp | 4 ++-- .../Source/Integrations/DppIntegration/DppClient.h | 3 +++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp index 54337fb752..33bd0130d9 100644 --- a/SerialPrograms/Source/CommonFramework/Main.cpp +++ b/SerialPrograms/Source/CommonFramework/Main.cpp @@ -4,8 +4,6 @@ #include //#include #include -#include -#include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/ImageResolution.h" #include "PersistentSettings.h" @@ -13,6 +11,9 @@ #include "ErrorReports/ProgramDumper.h" #include "ErrorReports/ErrorReports.h" #include "Environment/HardwareValidation.h" +#include "Integrations/DiscordSettingsOption.h" +#include "Integrations/DiscordSocial/DiscordSocial.h" +#include "Integrations/DppIntegration/DppClient.h" #include "Logging/Logger.h" #include "Logging/OutputRedirector.h" //#include "Tools/StatsDatabase.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index dc73cf51d2..2a3d4041f5 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -5,7 +5,6 @@ */ #include -#include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" #include "Common/Cpp/Json/JsonArray.h" @@ -15,6 +14,7 @@ #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonFramework/ProgramStats/StatsTracking.h" #include "Integrations/DiscordWebhook.h" +#include "Integrations/DppIntegration/DppClient.h" #include "ProgramNotifications.h" //#include diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index b2b538a435..a2465d37de 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -10,7 +10,7 @@ #include "Common/Qt/StringToolsQt.h" //#include "CommonFramework/Globals.h" //#include "CommonFramework/GlobalSettingsPanel.h" -#include "DppIntegration/DppClient.h" +#include "Integrations/DppIntegration/DppClient.h" #include "DiscordIntegrationSettings.h" //#include diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp index 8b3e0329c0..ef471dce52 100644 --- a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp +++ b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp @@ -2,13 +2,13 @@ #include #include -#include -#include #include "Common/Cpp/Json/JsonArray.h" #include "Common/Cpp/Json/JsonObject.h" #include "Common/Qt/StringToolsQt.h" #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Notifications/EventNotificationOption.h" +#include "Integrations/DppIntegration/DppClient.h" +#include "Integrations/DppIntegration/DppCommandHandler.h" using namespace dpp; namespace PokemonAutomation{ diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h index f0b830f923..6c6e318cc3 100644 --- a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h +++ b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h @@ -2,6 +2,7 @@ #ifndef DPP_CLIENT_H #define DPP_CLIENT_H +#ifdef PA_DPP #include #include #include @@ -49,3 +50,5 @@ class Client : protected DppCommandHandler::Handler{ } } #endif + +#endif From a1e7a895a5324654f3331de27689567b73e5c50b Mon Sep 17 00:00:00 2001 From: pifopi Date: Mon, 8 Sep 2025 10:36:04 +0200 Subject: [PATCH 2/3] a --- .../CommonFramework/Notifications/ProgramNotifications.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index 2a3d4041f5..2604cc93bd 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -13,6 +13,7 @@ #include "CommonFramework/GlobalSettingsPanel.h" #include "CommonFramework/Tools/ProgramEnvironment.h" #include "CommonFramework/ProgramStats/StatsTracking.h" +#include "Integrations/DiscordSettingsOption.h" #include "Integrations/DiscordWebhook.h" #include "Integrations/DppIntegration/DppClient.h" #include "ProgramNotifications.h" From 71a77b6f43f5873041a857b6f0d8a2eaa2ed9f55 Mon Sep 17 00:00:00 2001 From: pifopi Date: Mon, 8 Sep 2025 10:45:47 +0200 Subject: [PATCH 3/3] AsyncTask --- SerialPrograms/Source/CommonFramework/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp index 33bd0130d9..f120ba0eab 100644 --- a/SerialPrograms/Source/CommonFramework/Main.cpp +++ b/SerialPrograms/Source/CommonFramework/Main.cpp @@ -4,6 +4,7 @@ #include //#include #include +#include "Common/Cpp/Concurrency/AsyncTask.h" #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/ImageResolution.h" #include "PersistentSettings.h" @@ -24,7 +25,6 @@ #include "Startup/NewVersionCheck.h" #include "Windows/MainWindow.h" - #include using std::cout; using std::endl;