jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 08:34:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Mark more functions as [[nodiscard]] (#6320)

Browse source 
* Fix local variable double declaration.

Took 44 seconds

* Mark functions as [[nodiscard]]

Took 31 minutes

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2025-11-16 01:39:24 +01:00 • committed by GitHub
parent 27708d5964
commit 73763b5ee6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
65 changed files with 258 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.h
View file

@ -20,15 +20,15 @@ public:
void toggleSymbol();
void setColorActive(bool active);
void updateOpacity();
bool isColorActive() const
[[nodiscard]] bool isColorActive() const
{
return isActive;
};
QString getSymbol() const
[[nodiscard]] QString getSymbol() const
{
return symbol;
};
QChar getSymbolChar() const
[[nodiscard]] QChar getSymbolChar() const
{
return symbol[0];
};

4
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -233,9 +233,7 @@ ExactCard DeckEditorDeckDockWidget::getCurrentCard()
const QString zoneName = gparent.sibling(gparent.row(), 1).data(Qt::EditRole).toString();
if (!current.model()->hasChildren(current.sibling(current.row(), 0))) {
QString cardName = current.sibling(current.row(), 1).data().toString();
QString providerId = current.sibling(current.row(), 4).data().toString();
if (ExactCard selectedCard = CardDatabaseManager::query()->getCard({cardName, providerId})) {
if (ExactCard selectedCard = CardDatabaseManager::query()->getCard({cardName, cardProviderID})) {
return selectedCard;
}
}

2
cockatrice/src/interface/widgets/deck_editor/deck_list_style_proxy.h
View file

@ -9,7 +9,7 @@ class DeckListStyleProxy : public QIdentityProxyModel
public:
using QIdentityProxyModel::QIdentityProxyModel;
QVariant data(const QModelIndex &index, int role) const override;
[[nodiscard]] QVariant data(const QModelIndex &index, int role) const override;
};
#endif // COCKATRICE_DECK_LIST_STYLE_PROXY_H

8
cockatrice/src/interface/widgets/dialogs/dlg_connect.h
View file

@ -34,16 +34,16 @@ signals:
public:
explicit DlgConnect(QWidget *parent = nullptr);
~DlgConnect() override;
QString getHost() const;
int getPort() const
[[nodiscard]] QString getHost() const;
[[nodiscard]] int getPort() const
{
return portEdit->text().toInt();
}
QString getPlayerName() const
[[nodiscard]] QString getPlayerName() const
{
return playernameEdit->text();
}
QString getPassword() const
[[nodiscard]] QString getPassword() const
{
return passwordEdit->text();
}

6
cockatrice/src/interface/widgets/dialogs/dlg_edit_user.h
View file

@ -23,15 +23,15 @@ public:
QString email = QString(),
QString country = QString(),
QString realName = QString());
QString getEmail() const
[[nodiscard]] QString getEmail() const
{
return emailEdit->text();
}
QString getCountry() const
[[nodiscard]] QString getCountry() const
{
return countryEdit->currentIndex() == 0 ? "" : countryEdit->currentText();
}
QString getRealName() const
[[nodiscard]] QString getRealName() const
{
return realnameEdit->text();
}

8
cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.h
View file

@ -20,19 +20,19 @@ class DlgForgotPasswordChallenge : public QDialog
Q_OBJECT
public:
explicit DlgForgotPasswordChallenge(QWidget *parent = nullptr);
QString getHost() const
[[nodiscard]] QString getHost() const
{
return hostEdit->text();
}
int getPort() const
[[nodiscard]] int getPort() const
{
return portEdit->text().toInt();
}
QString getPlayerName() const
[[nodiscard]] QString getPlayerName() const
{
return playernameEdit->text();
}
QString getEmail() const
[[nodiscard]] QString getEmail() const
{
return emailEdit->text();
}

6
cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h
View file

@ -39,7 +39,7 @@ public:
* to use it, since otherwise it will get destroyed once this dlg is destroyed
* @return The DeckLoader
*/
virtual DeckLoader *getDeckList() const = 0;
[[nodiscard]] virtual DeckLoader *getDeckList() const = 0;
protected:
void setText(const QString &text);
@ -67,7 +67,7 @@ private:
public:
explicit DlgLoadDeckFromClipboard(QWidget *parent = nullptr);
DeckLoader *getDeckList() const override
[[nodiscard]] DeckLoader *getDeckList() const override
{
return deckList;
}
@ -90,7 +90,7 @@ private:
public:
explicit DlgEditDeckInClipboard(const DeckLoader &deckList, bool _annotated, QWidget *parent = nullptr);
DeckLoader *getDeckList() const override
[[nodiscard]] DeckLoader *getDeckList() const override
{
return deckLoader;
}

2
cockatrice/src/interface/widgets/dialogs/dlg_load_remote_deck.h
View file

@ -28,7 +28,7 @@ private slots:
public:
explicit DlgLoadRemoteDeck(AbstractClient *_client, QWidget *parent = nullptr);
int getDeckId() const;
[[nodiscard]] int getDeckId() const;
};
#endif

2
cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h
View file

@ -78,7 +78,7 @@ public:
QStringList getAllCardsForSet();
void populateCardList();
void updateCardDisplayWidgets();
bool isChecked() const;
[[nodiscard]] bool isChecked() const;
DlgSelectSetForCards *parent;
QString setName;
bool expanded;

2
cockatrice/src/interface/widgets/general/display/banner_widget.h
View file

@ -26,7 +26,7 @@ public:
void setText(const QString &text) const;
void setClickable(bool _clickable);
void setBuddy(QWidget *_buddy);
QString getText() const
[[nodiscard]] QString getText() const
{
return bannerLabel->text();
}

2
cockatrice/src/interface/widgets/printing_selector/printing_selector.h
View file

@ -36,7 +36,7 @@ public:
void setCard(const CardInfoPtr &newCard, const QString &_currentZone);
void getAllSetsForCurrentCard();
DeckListModel *getDeckModel() const
[[nodiscard]] DeckListModel *getDeckModel() const
{
return deckModel;
};

2
cockatrice/src/interface/widgets/server/chat_view/chat_view.h
View file

@ -68,7 +68,7 @@ private:
QAction *messageClicked;
QMap<QString, QVector<UserMessagePosition>> userMessagePositions;
QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
[[nodiscard]] QTextFragment getFragmentUnderMouse(const QPoint &pos) const;
QTextCursor prepareBlock(bool same = false);
void appendCardTag(QTextCursor &cursor, const QString &cardName);
void appendUrlTag(QTextCursor &cursor, QString url);

10
cockatrice/src/interface/widgets/server/user/user_list_proxy.h
View file

@ -18,11 +18,11 @@ class ServerInfo_User;
class UserListProxy
{
public:
virtual bool isOwnUserRegistered() const = 0;
virtual QString getOwnUsername() const = 0;
virtual bool isUserBuddy(const QString &userName) const = 0;
virtual bool isUserIgnored(const QString &userName) const = 0;
virtual const ServerInfo_User *getOnlineUser(const QString &userName) const = 0; // Can return nullptr
[[nodiscard]] virtual bool isOwnUserRegistered() const = 0;
[[nodiscard]] virtual QString getOwnUsername() const = 0;
[[nodiscard]] virtual bool isUserBuddy(const QString &userName) const = 0;
[[nodiscard]] virtual bool isUserIgnored(const QString &userName) const = 0;
[[nodiscard]] virtual const ServerInfo_User *getOnlineUser(const QString &userName) const = 0; // Can return nullptr
};
#endif // COCKATRICE_USERLISTPROXY_H

18
cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/card_prices/edhrec_api_response_card_prices.h
View file

@ -20,39 +20,39 @@ public:
void debugPrint() const;
// Getter methods for card prices
const QJsonObject &getCardhoarder() const
[[nodiscard]] const QJsonObject &getCardhoarder() const
{
return cardhoarder;
}
const QJsonObject &getCardkingdom() const
[[nodiscard]] const QJsonObject &getCardkingdom() const
{
return cardkingdom;
}
const QJsonObject &getCardmarket() const
[[nodiscard]] const QJsonObject &getCardmarket() const
{
return cardmarket;
}
const QJsonObject &getFace2face() const
[[nodiscard]] const QJsonObject &getFace2face() const
{
return face2face;
}
const QJsonObject &getManapool() const
[[nodiscard]] const QJsonObject &getManapool() const
{
return manapool;
}
const QJsonObject &getMtgstocks() const
[[nodiscard]] const QJsonObject &getMtgstocks() const
{
return mtgstocks;
}
const QJsonObject &getScg() const
[[nodiscard]] const QJsonObject &getScg() const
{
return scg;
}
const QJsonObject &getTcgl() const
[[nodiscard]] const QJsonObject &getTcgl() const
{
return tcgl;
}
const QJsonObject &getTcgplayer() const
[[nodiscard]] const QJsonObject &getTcgplayer() const
{
return tcgplayer;
}

2
cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec.h
View file

@ -20,7 +20,7 @@ public:
explicit TabEdhRec(TabSupervisor *_tabSupervisor);
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName();
return tr("EDHREC: ") + cardName;

8
cockatrice/src/interface/widgets/tabs/tab_admin.h
View file

@ -29,8 +29,8 @@ private:
public:
explicit ShutdownDialog(QWidget *parent = nullptr);
QString getReason() const;
int getMinutes() const;
[[nodiscard]] QString getReason() const;
[[nodiscard]] int getMinutes() const;
};
class TabAdmin : public Tab
@ -62,11 +62,11 @@ private slots:
public:
TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin);
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return tr("Administration");
}
bool getLocked() const
[[nodiscard]] bool getLocked() const
{
return locked;
}

2
cockatrice/src/interface/widgets/tabs/tab_deck_editor.h
View file

@ -86,7 +86,7 @@ public:
void retranslateUi() override;
/** @brief Returns the tab text, including modified mark if applicable. */
QString getTabText() const override;
[[nodiscard]] QString getTabText() const override;
/** @brief Creates menus for deck editing and view options. */
void createMenus() override;

4
cockatrice/src/interface/widgets/tabs/tab_game.h
View file

@ -183,9 +183,9 @@ public:
void updatePlayerListDockTitle();
bool closeRequest() override;
QString getTabText() const override;
[[nodiscard]] QString getTabText() const override;
AbstractGame *getGame() const
[[nodiscard]] AbstractGame *getGame() const
{
return game;
}

2
cockatrice/src/interface/widgets/tabs/tab_logs.h
View file

@ -62,7 +62,7 @@ public:
TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client);
~TabLog() override;
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return tr("Logs");
}

2
cockatrice/src/interface/widgets/tabs/tab_replays.h
View file

@ -84,7 +84,7 @@ signals:
public:
TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo);
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return tr("Game Replays");
}

12
cockatrice/src/interface/widgets/tabs/tab_room.h
View file

@ -68,7 +68,7 @@ private:
QAction *aLeaveRoom;
QAction *aOpenChatSettings;
QAction *aClearChat;
QString sanitizeHtml(QString dirty) const;
[[nodiscard]] QString sanitizeHtml(QString dirty) const;
QStringList autocompleteUserList;
QCompleter *completer;
@ -106,23 +106,23 @@ public:
void retranslateUi() override;
void tabActivated() override;
void processRoomEvent(const RoomEvent &event);
int getRoomId() const
[[nodiscard]] int getRoomId() const
{
return roomId;
}
const QMap<int, QString> &getGameTypes() const
[[nodiscard]] const QMap<int, QString> &getGameTypes() const
{
return gameTypes;
}
QString getChannelName() const
[[nodiscard]] QString getChannelName() const
{
return roomName;
}
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return roomName;
}
const ServerInfo_User *getUserInfo() const
[[nodiscard]] const ServerInfo_User *getUserInfo() const
{
return ownUser;
}

2
cockatrice/src/interface/widgets/tabs/tab_server.h
View file

@ -63,7 +63,7 @@ private:
public:
TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client);
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return tr("Server");
}

22
cockatrice/src/interface/widgets/tabs/tab_supervisor.h
View file

@ -64,8 +64,8 @@ class CloseButton : public QAbstractButton
Q_OBJECT
public:
explicit CloseButton(QWidget *parent = nullptr);
QSize sizeHint() const override;
inline QSize minimumSizeHint() const override
[[nodiscard]] QSize sizeHint() const override;
[[nodiscard]] QSize minimumSizeHint() const override
{
return sizeHint();
}
@ -129,36 +129,36 @@ public:
void start(const ServerInfo_User &userInfo);
void startLocal(const QList<AbstractClient *> &_clients);
void stop();
bool getIsLocalGame() const
[[nodiscard]] bool getIsLocalGame() const
{
return isLocalGame;
}
int getGameCount() const
[[nodiscard]] int getGameCount() const
{
return gameTabs.size();
}
TabAccount *getTabAccount() const
[[nodiscard]] TabAccount *getTabAccount() const
{
return tabAccount;
}
ServerInfo_User *getUserInfo() const
[[nodiscard]] ServerInfo_User *getUserInfo() const
{
return userInfo;
}
AbstractClient *getClient() const;
const UserListManager *getUserListManager() const
[[nodiscard]] AbstractClient *getClient() const;
[[nodiscard]] const UserListManager *getUserListManager() const
{
return userListManager;
}
const QMap<int, TabRoom *> &getRoomTabs() const
[[nodiscard]] const QMap<int, TabRoom *> &getRoomTabs() const
{
return roomTabs;
}
QList<AbstractTabDeckEditor *> getDeckEditorTabs() const
[[nodiscard]] QList<AbstractTabDeckEditor *> getDeckEditorTabs() const
{
return deckEditorTabs;
}
bool getAdminLocked() const;
[[nodiscard]] bool getAdminLocked() const;
void closeEvent(QCloseEvent *event) override;
bool switchToGameTabIfAlreadyExists(const int gameId);
static void actShowPopup(const QString &message);

2
cockatrice/src/interface/widgets/tabs/tab_visual_database_display.h
View file

@ -23,7 +23,7 @@ private:
public:
TabVisualDatabaseDisplay(TabSupervisor *_tabSupervisor);
void retranslateUi() override;
QString getTabText() const override
[[nodiscard]] QString getTabText() const override
{
return tr("Visual Database Display");
}

2
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h
View file

@ -125,7 +125,7 @@ public:
* @brief Get the display text for the tab.
* @return Tab text with optional modification indicator.
*/
QString getTabText() const override;
[[nodiscard]] QString getTabText() const override;
/**
* @brief Update the currently selected card in the deck and UI.

4
cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.h
View file

@ -73,10 +73,10 @@ public:
void setTabTitle(int index, const QString &title);
/// Get the currently active tab widget.
QWidget *getCurrentTab() const;
[[nodiscard]] QWidget *getCurrentTab() const;
/// Get the total number of tabs.
int getTabCount() const;
[[nodiscard]] int getTabCount() const;
VisualDeckEditorWidget *visualDeckView; ///< Visual deck editor widget.
DeckAnalyticsWidget *deckAnalytics; ///< Deck analytics widget.

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_sub_type_filter_widget.h
View file

@ -25,7 +25,7 @@ public:
void retranslateUi();
void createSubTypeButtons();
void updateSubTypeButtonsVisibility();
int getMaxSubTypeCount() const;
[[nodiscard]] int getMaxSubTypeCount() const;
void handleSubTypeToggled(const QString &mainType, bool active);
void updateSubTypeFilter();

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.h
View file

@ -25,7 +25,7 @@ public:
explicit DeckPreviewTagDialog(const QStringList &knownTags,
const QStringList &activeTags,
QWidget *parent = nullptr);
QStringList getActiveTags() const;
[[nodiscard]] QStringList getActiveTags() const;
void filterTags(const QString &text);
private slots:

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.h
View file

@ -19,7 +19,7 @@ public:
DeckPreviewTagItemWidget(const QString &tagName, bool isChecked, QWidget *parent = nullptr);
// Accessor for the checkbox widget
QCheckBox *checkBox() const;
[[nodiscard]] QCheckBox *checkBox() const;
private:
QCheckBox *checkBox_; // Checkbox to represent the tag's state

4
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h
View file

@ -33,7 +33,7 @@ public:
const QString &_filePath);
void retranslateUi();
QString getColorIdentity();
QString getDisplayName() const;
[[nodiscard]] QString getDisplayName() const;
VisualDeckStorageWidget *visualDeckStorageWidget;
QVBoxLayout *layout;
@ -47,7 +47,7 @@ public:
bool filteredBySearch = false;
bool filteredByColor = false;
bool filteredByTags = false;
bool checkVisibility() const;
[[nodiscard]] bool checkVisibility() const;
signals:
void deckLoadRequested(const QString &filePath);

4
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h
View file

@ -27,8 +27,8 @@ public:
void createWidgetsForFiles();
void createWidgetsForFolders();
void flattenFolderStructure();
QStringList gatherAllTagsFromFlowWidget() const;
FlowWidget *getFlowWidget() const
[[nodiscard]] QStringList gatherAllTagsFromFlowWidget() const;
[[nodiscard]] FlowWidget *getFlowWidget() const
{
return flowWidget;
};

16
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h
View file

@ -47,14 +47,14 @@ public:
void retranslateUi();
bool getShowFolders() const;
bool getDrawUnusedColorIdentities() const;
bool getShowBannerCardComboBox() const;
bool getShowTagFilter() const;
bool getShowTagsOnDeckPreviews() const;
int getUnusedColorIdentitiesOpacity() const;
TooltipType getDeckPreviewTooltip() const;
int getCardSize() const;
[[nodiscard]] bool getShowFolders() const;
[[nodiscard]] bool getDrawUnusedColorIdentities() const;
[[nodiscard]] bool getShowBannerCardComboBox() const;
[[nodiscard]] bool getShowTagFilter() const;
[[nodiscard]] bool getShowTagsOnDeckPreviews() const;
[[nodiscard]] int getUnusedColorIdentitiesOpacity() const;
[[nodiscard]] TooltipType getDeckPreviewTooltip() const;
[[nodiscard]] int getCardSize() const;
signals:
void showFoldersChanged(bool enabled);

4
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h
View file

@ -18,7 +18,7 @@ class VisualDeckStorageTagFilterWidget : public QWidget
VisualDeckStorageWidget *parent;
QSet<QString> gatherAllTags() const;
[[nodiscard]] QSet<QString> gatherAllTags() const;
void removeTagsNotInList(const QSet<QString> &tags);
void addTagsIfNotPresent(const QSet<QString> &tags);
void addTagIfNotPresent(const QString &tag);
@ -26,7 +26,7 @@ class VisualDeckStorageTagFilterWidget : public QWidget
public:
explicit VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent);
QStringList getAllKnownTags() const;
[[nodiscard]] QStringList getAllKnownTags() const;
void filterDecksBySelectedTags(const QList<DeckPreviewWidget *> &deckPreviews) const;
public slots:

2
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h
View file

@ -40,7 +40,7 @@ public:
VisualDeckStorageTagFilterWidget *tagFilterWidget;
bool deckPreviewSelectionAnimationEnabled;
const VisualDeckStorageQuickSettingsWidget *settings() const;
[[nodiscard]] const VisualDeckStorageQuickSettingsWidget *settings() const;
public slots:
void createRootFolderWidget(); // Refresh the display of cards based on the current sorting option