jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-27 09:03:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Cleanup two includes.

Browse source 
Took 3 minutes
This commit is contained in:
Lukas Brübach 2025-11-06 21:00:35 +01:00
parent 1913b52da7
commit e965e3bf82
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/CMakeLists.txt
View file

@ -368,6 +368,7 @@ if(Qt5_FOUND)
libcockatrice_network libcockatrice_network
libcockatrice_models libcockatrice_models
libcockatrice_rng libcockatrice_rng
libcockatrice_settings
${COCKATRICE_QT_MODULES} ${COCKATRICE_QT_MODULES}
) )
else() else()
@ -379,6 +380,7 @@ else()
libcockatrice_network libcockatrice_network
libcockatrice_models libcockatrice_models
libcockatrice_rng libcockatrice_rng
libcockatrice_settings
${COCKATRICE_QT_MODULES} ${COCKATRICE_QT_MODULES}
) )
endif() endif()

2
cockatrice/src/client/settings/cache_settings.cpp
View file

@ -1,6 +1,5 @@
#include "cache_settings.h" #include "cache_settings.h"
#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h"
#include "../network/update/client/release_channel.h" #include "../network/update/client/release_channel.h"
#include "card_counter_settings.h" #include "card_counter_settings.h"
@ -12,6 +11,7 @@
#include <QGlobalStatic> #include <QGlobalStatic>
#include <QSettings> #include <QSettings>
#include <QStandardPaths> #include <QStandardPaths>
#include <libcockatrice/settings/card_override_settings.h>
#include <utility> #include <utility>
QSharedPointer<SettingsCache> SettingsCache::settingsInstance = nullptr; QSharedPointer<SettingsCache> SettingsCache::settingsInstance = nullptr;

3
tests/carddatabase/mocks.h
View file

@ -10,7 +10,8 @@
#define PICTURELOADER_H #define PICTURELOADER_H
#include <../../cockatrice/src/client/settings/cache_settings.h> #include "../../cockatrice/src/client/settings/cache_settings.h"
#include <libcockatrice/card/database/card_database.h> #include <libcockatrice/card/database/card_database.h>
#include <libcockatrice/utility/macros.h> #include <libcockatrice/utility/macros.h>