Skip to content

Add ifdef guard to prevent including dpp stuff #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pifopi merged 3 commits into from
Sep 8, 2025
Merged

Add ifdef guard to prevent including dpp stuff #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceea2cb
Add ifdef guard to prevent including dpp stuff
pifopi Sep 7, 2025
a1e7a89
a
pifopi Sep 8, 2025
71a77b6
AsyncTask
pifopi Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions SerialPrograms/Source/CommonFramework/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@
#include <QFileInfo>
//#include <QTextStream>
#include <QMessageBox>
#include <Integrations/DppIntegration/DppClient.h>
#include <Integrations/DiscordSocial/DiscordSocial.h>
#include "Common/Cpp/Concurrency/AsyncTask.h"
#include "Common/Cpp/Exceptions.h"
#include "Common/Cpp/ImageResolution.h"
#include "PersistentSettings.h"
#include "Tests/CommandLineTests.h"
#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"
Expand All @@ -23,7 +25,6 @@
#include "Startup/NewVersionCheck.h"
#include "Windows/MainWindow.h"


#include <iostream>
using std::cout;
using std::endl;
Expand Down
3 changes: 2 additions & 1 deletion SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

#include <QFile>
#include <Integrations/DppIntegration/DppClient.h>
#include "Common/Cpp/PrettyPrint.h"
#include "Common/Cpp/Json/JsonValue.h"
#include "Common/Cpp/Json/JsonArray.h"
Expand All @@ -14,7 +13,9 @@
#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"

//#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <iostream>
Expand Down
4 changes: 2 additions & 2 deletions SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

#include <set>
#include <dpp/dpp.h>
#include <Integrations/DppIntegration/DppClient.h>
#include <Integrations/DppIntegration/DppCommandHandler.h>
#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{
Expand Down
3 changes: 3 additions & 0 deletions SerialPrograms/Source/Integrations/DppIntegration/DppClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#ifndef DPP_CLIENT_H
#define DPP_CLIENT_H

#ifdef PA_DPP
#include <atomic>
#include <dpp/dpp.h>
#include <Integrations/DppIntegration/DppCommandHandler.h>
Expand Down Expand Up @@ -49,3 +50,5 @@ class Client : protected DppCommandHandler::Handler{
}
}
#endif

#endif