mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-10 20:13:24 -08:00
Apply override across the tree (#7891)
Some checks are pending
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
Build Desktop / Configure (push) Waiting to run
Build Desktop / vcpkg baseline (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Fedora 45 release (push) Blocked by required conditions
Build Desktop / Fedora 45 debug (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 sanitize (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 cover (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 27 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / Prune caches (push) Waiting to run
Build Docker / Servatrice (arm) (push) Waiting to run
Build Docker / Servatrice (x86) (push) Waiting to run
Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions
Some checks are pending
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
Build Desktop / Configure (push) Waiting to run
Build Desktop / vcpkg baseline (push) Waiting to run
Build Desktop / Debian 13 (push) Blocked by required conditions
Build Desktop / Fedora 45 release (push) Blocked by required conditions
Build Desktop / Fedora 45 debug (push) Blocked by required conditions
Build Desktop / Servatrice_Debian 12 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 (push) Blocked by required conditions
Build Desktop / Arch (push) Blocked by required conditions
Build Desktop / Debian 12 (push) Blocked by required conditions
Build Desktop / Fedora 44 (push) Blocked by required conditions
Build Desktop / Ubuntu 24.04 (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 sanitize (push) Blocked by required conditions
Build Desktop / Ubuntu 26.04 cover (push) Blocked by required conditions
Build Desktop / macOS 14 (push) Blocked by required conditions
Build Desktop / macOS 15 (push) Blocked by required conditions
Build Desktop / macOS 27 Debug (push) Blocked by required conditions
Build Desktop / Windows 10 (push) Blocked by required conditions
Build Desktop / macOS 13 Intel (push) Blocked by required conditions
Build Desktop / Prune caches (push) Waiting to run
Build Docker / Servatrice (arm) (push) Waiting to run
Build Docker / Servatrice (x86) (push) Waiting to run
Build Docker / Publish multi-platform Servatrice image (push) Blocked by required conditions
This commit is contained in:
parent
23906ef978
commit
4581e649ac
12 changed files with 40 additions and 40 deletions
|
|
@ -27,7 +27,7 @@ public:
|
|||
int maxRows = 2,
|
||||
Qt::Orientation overlapDirection = Qt::Vertical,
|
||||
Qt::Orientation flowDirection = Qt::Horizontal);
|
||||
~OverlapLayout();
|
||||
~OverlapLayout() override;
|
||||
void insertWidgetAtIndex(QWidget *toInsert, int index);
|
||||
|
||||
void addItem(QLayoutItem *item) override;
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ signals:
|
|||
|
||||
private:
|
||||
void buildGrid(QWidget *host);
|
||||
void changeEvent(QEvent *e);
|
||||
void changeEvent(QEvent *e) override;
|
||||
void refreshChromePalettes();
|
||||
|
||||
private slots:
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ class ManaCurveTotalWidget : public QWidget
|
|||
|
||||
public:
|
||||
explicit ManaCurveTotalWidget(QWidget *parent);
|
||||
QSize sizeHint() const;
|
||||
QSize minimumSizeHint() const;
|
||||
QSize sizeHint() const override;
|
||||
QSize minimumSizeHint() const override;
|
||||
void updateDisplay(const QString &categoryName,
|
||||
int minCmc,
|
||||
int maxCmc,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class DynamicFontSizeLabel : public QLabel
|
|||
public:
|
||||
explicit DynamicFontSizeLabel(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
|
||||
|
||||
~DynamicFontSizeLabel()
|
||||
~DynamicFontSizeLabel() override
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -37,17 +37,17 @@ signals:
|
|||
void clicked();
|
||||
|
||||
protected:
|
||||
void mousePressEvent(QMouseEvent *event);
|
||||
void mousePressEvent(QMouseEvent *event) override;
|
||||
QColor textColor;
|
||||
|
||||
// QWidget interface
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event);
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
|
||||
// QWidget interface
|
||||
public:
|
||||
QSize minimumSizeHint() const;
|
||||
QSize sizeHint() const;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const override;
|
||||
};
|
||||
|
||||
#endif // DYNAMICFONTSIZELABEL_H
|
||||
|
|
@ -25,11 +25,11 @@ public:
|
|||
void setTextAndColor(const QString &text, QColor color = QColor::Invalid);
|
||||
|
||||
// QWidget interface
|
||||
QSize minimumSizeHint() const;
|
||||
QSize sizeHint() const;
|
||||
QSize minimumSizeHint() const override;
|
||||
QSize sizeHint() const override;
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent *event);
|
||||
void paintEvent(QPaintEvent *event) override;
|
||||
|
||||
private:
|
||||
QColor textColor;
|
||||
|
|
|
|||
|
|
@ -90,13 +90,13 @@ public:
|
|||
virtual void createMenus() = 0;
|
||||
|
||||
/** @brief Returns the display text for the tab. */
|
||||
[[nodiscard]] virtual QString getTabText() const override = 0;
|
||||
[[nodiscard]] QString getTabText() const override = 0;
|
||||
|
||||
/** @brief Confirms whether the tab can be safely closed. */
|
||||
bool confirmClose();
|
||||
|
||||
/** @brief Retranslates the UI text. Pure virtual. */
|
||||
virtual void retranslateUi() override = 0;
|
||||
void retranslateUi() override = 0;
|
||||
|
||||
/** @brief Opens a deck in this tab.
|
||||
* @param deck The deck to open
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class FilterDisplayWidget : public QWidget
|
|||
|
||||
public:
|
||||
explicit FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel);
|
||||
~FilterDisplayWidget() = default;
|
||||
~FilterDisplayWidget() override = default;
|
||||
|
||||
QSize sizeHint() const override;
|
||||
|
||||
|
|
|
|||
|
|
@ -75,19 +75,19 @@ public:
|
|||
virtual void setName(const QString &_name) = 0;
|
||||
|
||||
/** @return The provider identifier for this card (e.g., UUID). */
|
||||
[[nodiscard]] virtual QString getCardProviderId() const override = 0;
|
||||
[[nodiscard]] QString getCardProviderId() const override = 0;
|
||||
|
||||
/** @param _cardProviderId Set the provider identifier for this card. */
|
||||
virtual void setCardProviderId(const QString &_cardProviderId) = 0;
|
||||
|
||||
/** @return The abbreviated set code (e.g., "NEO"). */
|
||||
[[nodiscard]] virtual QString getCardSetShortName() const override = 0;
|
||||
[[nodiscard]] QString getCardSetShortName() const override = 0;
|
||||
|
||||
/** @param _cardSetShortName Set the abbreviated set code. */
|
||||
virtual void setCardSetShortName(const QString &_cardSetShortName) = 0;
|
||||
|
||||
/** @return The collector number of the card within its set. */
|
||||
[[nodiscard]] virtual QString getCardCollectorNumber() const override = 0;
|
||||
[[nodiscard]] QString getCardCollectorNumber() const override = 0;
|
||||
|
||||
/** @param _cardSetNumber Set the collector number. */
|
||||
virtual void setCardCollectorNumber(const QString &_cardSetNumber) = 0;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public:
|
|||
{
|
||||
return oldRow;
|
||||
}
|
||||
[[nodiscard]] QStringList formats() const
|
||||
[[nodiscard]] QStringList formats() const override
|
||||
{
|
||||
return QStringList() << "application/x-cockatricecardset";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ public:
|
|||
const QString &attrValue,
|
||||
Server_Card *unzonedCard = nullptr);
|
||||
|
||||
virtual Response::ResponseCode
|
||||
Response::ResponseCode
|
||||
cmdConcede(const Command_Concede &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
|
||||
virtual Response::ResponseCode
|
||||
cmdUnconcede(const Command_Unconcede &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
|
||||
|
|
@ -177,14 +177,14 @@ public:
|
|||
cmdRevealCards(const Command_RevealCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
|
||||
Response::ResponseCode
|
||||
cmdRevealRandomCards(const Command_RevealRandomCards &cmd, ResponseContainer &rc, GameEventStorage &ges) override;
|
||||
virtual Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
|
||||
ResponseContainer &rc,
|
||||
GameEventStorage &ges) override;
|
||||
Response::ResponseCode cmdChangeZoneProperties(const Command_ChangeZoneProperties &cmd,
|
||||
ResponseContainer &rc,
|
||||
GameEventStorage &ges) override;
|
||||
|
||||
virtual void getInfo(ServerInfo_Player *info,
|
||||
Server_AbstractParticipant *playerWhosAsking,
|
||||
bool omniscient,
|
||||
bool withUserInfo) override;
|
||||
void getInfo(ServerInfo_Player *info,
|
||||
Server_AbstractParticipant *playerWhosAsking,
|
||||
bool omniscient,
|
||||
bool withUserInfo) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ public slots:
|
|||
|
||||
public:
|
||||
Server_ProtocolHandler(Server *_server, Server_DatabaseInterface *_databaseInterface, QObject *parent = nullptr);
|
||||
~Server_ProtocolHandler();
|
||||
~Server_ProtocolHandler() override;
|
||||
|
||||
bool getAcceptsUserListChanges() const
|
||||
{
|
||||
|
|
@ -153,17 +153,17 @@ public:
|
|||
/** @brief Invalidate the pending nonce (single-use). */
|
||||
void clearAuthNonce();
|
||||
|
||||
int getLastCommandTime() const
|
||||
int getLastCommandTime() const override
|
||||
{
|
||||
return timeRunning - lastDataReceived;
|
||||
}
|
||||
bool addSaidMessageSize(int size);
|
||||
bool addSaidMessageSize(int size) override;
|
||||
virtual void processCommandContainer(const CommandContainer &cont);
|
||||
|
||||
void sendProtocolItem(const Response &item);
|
||||
void sendProtocolItem(const SessionEvent &item);
|
||||
void sendProtocolItem(const GameEventContainer &item);
|
||||
void sendProtocolItem(const RoomEvent &item);
|
||||
void sendProtocolItem(const Response &item) override;
|
||||
void sendProtocolItem(const SessionEvent &item) override;
|
||||
void sendProtocolItem(const GameEventContainer &item) override;
|
||||
void sendProtocolItem(const RoomEvent &item) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -14,19 +14,19 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
int getLastCommandTime() const
|
||||
int getLastCommandTime() const override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
bool addSaidMessageSize(int /*size*/)
|
||||
bool addSaidMessageSize(int /*size*/) override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void sendProtocolItem(const Response &item);
|
||||
void sendProtocolItem(const SessionEvent &item);
|
||||
void sendProtocolItem(const GameEventContainer &item);
|
||||
void sendProtocolItem(const RoomEvent &item);
|
||||
void sendProtocolItem(const Response &item) override;
|
||||
void sendProtocolItem(const SessionEvent &item) override;
|
||||
void sendProtocolItem(const GameEventContainer &item) override;
|
||||
void sendProtocolItem(const RoomEvent &item) override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue