mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
* [DeckList] Apply include-what-you-use to libcockatrice_deck_list * [IWYU] Apply include-what-you-use across the tree Run one whole-tree IWYU pass over the libcockatrice_* libraries, the Cockatrice client, Oracle, Servatrice and the test suite, so each translation unit includes what it uses directly and forward-declares what it does not need. IWYU only analyses real translation units, never the moc code CMake generates from Q_OBJECT headers, so it strips includes that moc output silently relies on. Where a type is passed by value (or nested in a QList/QMap) in a signal or slot signature, the generated moc code needs the complete type; those includes are kept with an explanatory `// IWYU pragma: keep`. The same holds for Q_DECLARE_METATYPE targets such as QSqlDatabase. A handful of includes are added by hand where callers brace-initialize a const-reference parameter, which also requires the complete type. Applied as a single commit on purpose: stripping includes from the libcockatrice_* headers is precisely what breaks the client, test and server translation units, and the fixes for those live in the same translation units. Splitting by component would therefore leave intermediate commits that do not compile. All 426 modified Q_OBJECT/Q_GADGET headers were verified to be moc-self-contained by compiling each generated moc_*.cpp standalone; several built only because of moc include ordering in mocs_compilation.cpp before the keep-includes were added. * [Tooling] Emit public Qt headers and fix IWYU fallout CI found Three problems the local build could not see, all because a green local build only proves the configuration it was run under. Private Qt headers. IWYU emitted private, lowercase Qt headers, and qtypes.h does not exist at all before Qt 6.9, so the Debian 12 and Ubuntu 24.04 jobs on Qt 6.4.2 failed to compile. The generator only emitted a mapping when the capital header name mirrored the private one (QAbstractAnimation for qabstractanimation.h), so qtypes.h, which is wrapped by QtTypes instead, got no mapping and kept the private spelling. Map it explicitly to <QtTypes>, which is public since Qt 5 and provides the same typedefs either way, and rewrite the 100 affected includes. Do not generalize this to "prefer any Qt* wrapper". The table is generated from whichever Qt is installed, and the wrappers are not equally old: QtLogging only appeared in Qt 6.8 and QtMinMax in 6.5, so that heuristic trades one breakage for another. Every other lowercase header still in the tree has shipped publicly since Qt 5, so those are left alone. Platform-guarded includes. IWYU only sees the preprocessor configuration it is handed, so it dropped an include that only the macOS branch of main.cpp needs, and the macOS jobs failed on an undeclared UrlSchemeEventFilter. Restore the include. Force-compiling every file that carries a platform guard under Q_OS_MAC, Q_OS_MACOS and __APPLE__ reports nothing else, so the macOS branches are covered rather than assumed. shellcheck. Drop a leftover variable and stop assigning the include-what-you-use lookup, which was only ever an existence check. * [Tooling] Map Qt 6.5+ split headers to QtGlobal for Qt 6.4 compatibility IWYU emitted QtTypes, QtPreprocessorSupport, QtVersionChecks, QtAssert, QtMinMax, QtClassHelperMacros, QtEnvironmentVariables and QtTranslation. Qt 6.5 split those declarations out of qglobal.h into separate headers, so neither the Qt* wrapper nor the q*.h private name exists on the oldest Qt we support (6.4.2), and Debian 12 / Ubuntu 24.04 fail with "No such file or directory". qtypes.h is worse still: it only appeared in Qt 6.9. QtGlobal is the one spelling that works across the whole supported range. It has been public since Qt 5, defines these declarations itself up to Qt 6.4, and includes the split headers from Qt 6.5 on, so redirect all eight private headers to it and collapse the affected includes in the tree. Curated overrides now take precedence over the name-mirroring rule, which cannot know about Qt version floors because the mapping is generated from whatever Qt is installed. That rule was mapping qtversionchecks.h to <QtVersionChecks> even with an override present, because the override was only consulted as a fallback. A curated key that matches nothing is now a hard error rather than a silent fallback, and the redirected headers are no longer advertised as the home of a symbol. Verified every Qt include in the tree resolves against the real qt6-base-dev 6.4.2 package: 15 distinct includes, 0 missing. * [Tooling] Map QOverload to QtGlobal and drop the QMetaMethodArgument include Two more headers IWYU emitted do not exist on Qt 6.4.2: QOverload was split out of qglobal.h in Qt 6.5, so on 6.4.2 it is declared in qglobal.h directly and the standalone header is a hard error. QtGlobal covers both, so map qoverload.h to it like the other 6.5+ split headers. QMetaMethodArgument is never referenced anywhere in the tree. It is a bare forwarder for qobjectdefs.h that our generator advertised as a class symbol, which is how IWYU came to add the include at all. The symbol mappings are generated from header names, so they cannot tell a forwarder that happens to be capitalised from a real class; removing the unused include is the fix, and the generic case stays a known limitation of the generator. Extending the audit to every Q* header (an earlier pass only matched headers starting with "Qt" or lowercase q*.h, so it missed all of them) against the real qt6-base-dev, qt6-multimedia-dev, qt6-declarative-dev, qt6-svg-dev and qt6-websockets-dev 6.4.2 packages: 341 distinct Qt includes, 0 missing. * [Game] Give moc the complete CardItem type in player_actions.h player_actions.h forward declares CardItem but passes QList<CardItem *> by value in actPlay/actPlayFacedown/actHide. moc instantiates the metatype for those parameters, and on Qt 6.4 that expands to sizeof(CardItem), so Ubuntu 24.04 fails with "invalid application of 'sizeof' to incomplete type 'CardItem'". Newer Qt tolerates the incomplete type, which is why only the 6.4.2 jobs failed. Include the defining header with an IWYU pragma keep, matching how the other MOC-required includes in this area are handled. * [Game] Give moc the complete ServerInfo_Card type player_logic.h, game_scene.h, view_zone.h and view_zone_widget.h forward declare ServerInfo_Card but pass QList<const ServerInfo_Card *> through signal and slot signatures. moc instantiates the metatype for those parameters, which Qt 6.4 expands to sizeof(ServerInfo_Card), so the connect in game_scene.cpp fails on Debian 12 and Ubuntu 24.04 with "invalid application of 'sizeof' to incomplete type 'const ServerInfo_Card'". Newer Qt tolerates it, so only the 6.4.2 jobs failed. Include the generated protobuf header with an IWYU pragma keep, following the pattern already used for ServerInfo_Player and ServerInfo_User in game_event_handler.h. * [Client] Complete the types Qt 6.4 needs for connect and moc Qt 6.4 expands QMetaType::fromType on the normalised argument list of a PMF connect and on moc-generated metatypes, which requires sizeof on every signal and slot parameter. Newer Qt tolerates forward declarations there, so only the Debian 12 and Ubuntu 24.04 jobs failed, with "invalid application of 'sizeof' to incomplete type" for QMouseEvent, QPrinter and GameReplay. Replace the forward declarations with the real includes: - QMouseEvent in the nine widget headers that pass it through signals - QPrinter in abstract_tab_deck_editor.cpp, for the actPrintDeck lambda - game_replay.pb.h in tab_replays.h. GameReplay is a protobuf message, so the project's game/replay.h only forward declares it and cannot supply the complete type. Found by recompiling all 1918 project TUs against the Debian Qt 6.4.2 headers, which reproduces those two CI jobs locally in one pass. * [Client] Complete Release and QMenu for Qt 6.4 moc and connect Continuing the Qt 6.4 complete-type sweep: - window_main.cpp connects ClientUpdateChecker::finishedCheck to MainWindow::checkClientUpdatesFinished, whose Release * parameter made moc 6.4 instantiate the metatype. GameReplay turned out to be a protobuf message, so Release likewise needed release_channel.h in the three headers declaring those signals: window_main.h, dlg_update.h and client_update_checker.h. - moc 6.4 also needs sizeof(QMenu) for the QList<QMenu *> carried by TabSupervisor::setMenu and MainWindow::updateTabMenu. Verified by regenerating moc output with the Debian moc 6.4.2 for all 434 Q_OBJECT/Q_GADGET classes and compiling it, plus recompiling all 1612 source TUs, against the Qt 6.4.2 headers: no remaining failures. --------- Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
241 lines
8.6 KiB
C++
241 lines
8.6 KiB
C++
#ifndef COCKATRICE_CARD_DATABASE_QUERIER_H
|
|
#define COCKATRICE_CARD_DATABASE_QUERIER_H
|
|
|
|
#include "../card_info.h"
|
|
#include "../printing/exact_card.h"
|
|
#include "libcockatrice/card/printing/printing_info.h"
|
|
|
|
#include <QList>
|
|
#include <QMap>
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QStringList>
|
|
#include <qtmetamacros.h>
|
|
|
|
class CardDatabase;
|
|
class ICardPreferenceProvider;
|
|
struct CardRef;
|
|
|
|
/**
|
|
* @class CardDatabaseQuerier
|
|
* @ingroup CardDatabase
|
|
* @brief Provides lookup and convenience functions for querying cards and their printings.
|
|
*
|
|
* The CardDatabaseQuerier class offers various lookup helpers for retrieving card information
|
|
* (e.g., CardInfoPtr, ExactCard, and PrintingInfo) from a CardDatabase. It also applies user
|
|
* printing preferences via ICardPreferenceProvider when determining preferred printings.
|
|
*/
|
|
class CardDatabaseQuerier : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
/**
|
|
* @brief Constructs a CardDatabaseQuerier.
|
|
*
|
|
* @param parent Parent QObject.
|
|
* @param db Pointer to the CardDatabase used for lookups.
|
|
* @param prefs Pointer to card preference provider which supplies user-preference for printings.
|
|
*/
|
|
explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db, const ICardPreferenceProvider *prefs);
|
|
|
|
/**
|
|
* @brief Retrieves a card by its exact name.
|
|
*
|
|
* @param cardName Exact card name.
|
|
* @return A CardInfoPtr, or null if no matching card exists.
|
|
*/
|
|
[[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const;
|
|
|
|
/**
|
|
* @brief Retrieves multiple cards by their exact names.
|
|
*
|
|
* Failed lookups are skipped and not included in the result.
|
|
*
|
|
* @param cardNames List of exact card names.
|
|
* @return List of CardInfoPtr objects for which a match was found.
|
|
*/
|
|
[[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const;
|
|
|
|
/**
|
|
* @brief Retrieves a card using simplified name matching.
|
|
*
|
|
* The name is automatically normalized, so callers do not need to simplify it.
|
|
*
|
|
* @param cardName A (possibly simplified or misspelled) card name.
|
|
* @return A CardInfoPtr, or null if not found.
|
|
*/
|
|
[[nodiscard]] CardInfoPtr getCardBySimpleName(const QString &cardName) const;
|
|
|
|
/**
|
|
* @brief Looks up a card using exact name first, then simplified matching as fallback.
|
|
*
|
|
* @param name Raw card name input.
|
|
* @return The best-match CardInfoPtr, or null if no match is found.
|
|
*/
|
|
[[nodiscard]] CardInfoPtr lookupCardByName(const QString &name) const;
|
|
|
|
/**
|
|
* @brief Converts a CardRef into an ExactCard.
|
|
*
|
|
* If the providerId is empty, the preferred printing is used.
|
|
* If providerId exists but cannot be found, an ExactCard with an empty PrintingInfo is returned.
|
|
*
|
|
* @param cardRef Card reference with name and optional providerId.
|
|
* @return The resolved ExactCard, or empty if no card was found.
|
|
*/
|
|
[[nodiscard]] ExactCard getCard(const CardRef &cardRef) const;
|
|
|
|
/**
|
|
* @brief Resolves multiple CardRefs into ExactCards.
|
|
*
|
|
* Failed entries are not included in the result.
|
|
*
|
|
* @param cardRefs List of card references.
|
|
* @return List of successfully resolved ExactCards.
|
|
*/
|
|
[[nodiscard]] QList<ExactCard> getCards(const QList<CardRef> &cardRefs) const;
|
|
|
|
/**
|
|
* @brief Attempts a more flexible card lookup using both simple name matching and CardRef rules.
|
|
*
|
|
* If providerId is missing, uses preferred printing. If lookup fails, attempts simplified name.
|
|
*
|
|
* @param cardRef Card reference to resolve.
|
|
* @return The best-guess ExactCard, or empty if unresolved.
|
|
*/
|
|
[[nodiscard]] ExactCard guessCard(const CardRef &cardRef) const;
|
|
|
|
/**
|
|
* @brief Returns a random card from the database using the preferred printing.
|
|
*
|
|
* @return A random ExactCard, or empty if the database is empty.
|
|
*/
|
|
[[nodiscard]] ExactCard getRandomCard() const;
|
|
|
|
/**
|
|
* @brief Returns a printing of a card from the same set as another given printing when possible.
|
|
*
|
|
* If no matching printing exists, falls back to a standard lookup.
|
|
*
|
|
* @param cardName Card to retrieve.
|
|
* @param otherPrinting Printing to match the set against.
|
|
* @return Matching ExactCard if found, otherwise fallback ExactCard.
|
|
*/
|
|
[[nodiscard]] ExactCard getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const;
|
|
|
|
/**
|
|
* @brief Returns the preferred printing of a card based on user preferences and set priority.
|
|
*
|
|
* @param cardName Name of the card.
|
|
* @return The preferred ExactCard.
|
|
*/
|
|
[[nodiscard]] ExactCard getPreferredCard(const QString &cardName) const;
|
|
|
|
/**
|
|
* @brief Returns the preferred printing of a card based on user preferences and set priority.
|
|
*
|
|
* @param cardInfo Card information object.
|
|
* @return The preferred ExactCard.
|
|
*/
|
|
[[nodiscard]] ExactCard getPreferredCard(const CardInfoPtr &cardInfo) const;
|
|
|
|
/**
|
|
* @brief Checks whether the CardRef refers to the preferred printing.
|
|
*
|
|
* @param cardRef Card reference to test.
|
|
* @return True if providerId matches the preferred printing.
|
|
*/
|
|
[[nodiscard]] bool isPreferredPrinting(const CardRef &cardRef) const;
|
|
|
|
/**
|
|
* @brief Returns the preferred printing for the given card name.
|
|
*
|
|
* @param cardName Card name.
|
|
* @return Preferred PrintingInfo, or empty if not found.
|
|
*/
|
|
[[nodiscard]] PrintingInfo getPreferredPrinting(const QString &cardName) const;
|
|
|
|
/**
|
|
* @brief Returns the preferred printing for the given card.
|
|
*
|
|
* @param cardInfo Card information object.
|
|
* @return Preferred PrintingInfo, or empty if not applicable.
|
|
*/
|
|
[[nodiscard]] PrintingInfo getPreferredPrinting(const CardInfoPtr &cardInfo) const;
|
|
|
|
/**
|
|
* @brief Returns the providerId of the preferred printing.
|
|
*
|
|
* @param cardName Card name.
|
|
* @return ProviderId string for preferred printing.
|
|
*/
|
|
[[nodiscard]] QString getPreferredPrintingProviderId(const QString &cardName) const;
|
|
|
|
/**
|
|
* @brief Retrieves a specific printing referenced by CardRef.
|
|
*
|
|
* @param cardRef Card reference including providerId.
|
|
* @return Matching PrintingInfo, or empty if not found.
|
|
*/
|
|
[[nodiscard]] PrintingInfo getSpecificPrinting(const CardRef &cardRef) const;
|
|
|
|
/**
|
|
* @brief Searches for a specific printing by set code and collector number.
|
|
*
|
|
* @param cardName Card name to search.
|
|
* @param setCode Set (short) code to match.
|
|
* @param collectorNumber Collector number. If empty, any printing from the set is returned.
|
|
* @return Matching PrintingInfo, or empty if not found.
|
|
*/
|
|
[[nodiscard]] PrintingInfo
|
|
getSpecificPrinting(const QString &cardName, const QString &setCode, const QString &collectorNumber) const;
|
|
|
|
/**
|
|
* @brief Searches for a printing that matches a given providerId.
|
|
*
|
|
* @param card Card to search.
|
|
* @param providerId Provider identifier to match.
|
|
* @return Matching PrintingInfo, or empty if not found.
|
|
*/
|
|
[[nodiscard]] PrintingInfo findPrintingWithId(const CardInfoPtr &card, const QString &providerId) const;
|
|
|
|
/**
|
|
* @brief Returns a list of all main card types present in the database.
|
|
*
|
|
* @return List of main card type strings.
|
|
*/
|
|
[[nodiscard]] QStringList getAllMainCardTypes() const;
|
|
|
|
/**
|
|
* @brief Returns a mapping of main card types to their occurrence counts.
|
|
*
|
|
* @return Map of main card type to count.
|
|
*/
|
|
[[nodiscard]] QMap<QString, int> getAllMainCardTypesWithCount() const;
|
|
|
|
/**
|
|
* @brief Returns a mapping of card subtypes to their occurrence counts.
|
|
*
|
|
* @return Map of subtype string to count.
|
|
*/
|
|
[[nodiscard]] QMap<QString, int> getAllSubCardTypesWithCount() const;
|
|
FormatRulesPtr getFormat(const QString &formatName) const;
|
|
QMap<QString, int> getAllFormatsWithCount() const;
|
|
|
|
private:
|
|
const CardDatabase *db; //!< Card database used for all lookups.
|
|
const ICardPreferenceProvider *prefs; //!< Preference provider for preferred printings.
|
|
|
|
// Count maps are expensive to compute (they iterate the whole database) and are
|
|
// queried every time a filter widget is built, so cache them and invalidate on
|
|
// any database mutation. Only the main thread reads or writes these.
|
|
mutable QMap<QString, int> mainCardTypeCountsCache;
|
|
mutable QMap<QString, int> subCardTypeCountsCache;
|
|
mutable QMap<QString, int> formatsCountCache;
|
|
|
|
private slots:
|
|
void invalidateCaches();
|
|
};
|
|
|
|
#endif // COCKATRICE_CARD_DATABASE_QUERIER_H
|