diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h index 1cf04070c..5e329bf09 100644 --- a/cockatrice/src/client/settings/cache_settings.h +++ b/cockatrice/src/client/settings/cache_settings.h @@ -325,8 +325,8 @@ private: int keepalive; int timeout; void translateLegacySettings(); - QString getSafeConfigPath(QString configEntry, QString defaultPath) const; - QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const; + [[nodiscard]] QString getSafeConfigPath(QString configEntry, QString defaultPath) const; + [[nodiscard]] QString getSafeConfigFilePath(QString configEntry, QString defaultPath) const; void loadPaths(); bool rememberGameSettings; QList releaseChannels; @@ -338,137 +338,137 @@ public: SettingsCache(); QString getDataPath(); QString getSettingsPath(); - QString getCachePath() const; - QString getNetworkCachePath() const; - const QByteArray &getMainWindowGeometry() const + [[nodiscard]] QString getCachePath() const; + [[nodiscard]] QString getNetworkCachePath() const; + [[nodiscard]] const QByteArray &getMainWindowGeometry() const { return mainWindowGeometry; } - const QByteArray &getTokenDialogGeometry() const + [[nodiscard]] const QByteArray &getTokenDialogGeometry() const { return tokenDialogGeometry; } - const QByteArray &getSetsDialogGeometry() const + [[nodiscard]] const QByteArray &getSetsDialogGeometry() const { return setsDialogGeometry; } - QString getLang() const + [[nodiscard]] QString getLang() const { return lang; } - QString getDeckPath() const + [[nodiscard]] QString getDeckPath() const { return deckPath; } - QString getFiltersPath() const + [[nodiscard]] QString getFiltersPath() const { return filtersPath; } - QString getReplaysPath() const + [[nodiscard]] QString getReplaysPath() const { return replaysPath; } - QString getThemesPath() const + [[nodiscard]] QString getThemesPath() const { return themesPath; } - QString getPicsPath() const + [[nodiscard]] QString getPicsPath() const { return picsPath; } - QString getRedirectCachePath() const + [[nodiscard]] QString getRedirectCachePath() const { return redirectCachePath; } - QString getCustomPicsPath() const + [[nodiscard]] QString getCustomPicsPath() const { return customPicsPath; } - QString getCustomCardDatabasePath() const override + [[nodiscard]] QString getCustomCardDatabasePath() const override { return customCardDatabasePath; } - QString getCardDatabasePath() const override + [[nodiscard]] QString getCardDatabasePath() const override { return cardDatabasePath; } - QString getSpoilerCardDatabasePath() const override + [[nodiscard]] QString getSpoilerCardDatabasePath() const override { return spoilerDatabasePath; } - QString getTokenDatabasePath() const override + [[nodiscard]] QString getTokenDatabasePath() const override { return tokenDatabasePath; } - QString getThemeName() const + [[nodiscard]] QString getThemeName() const { return themeName; } - QString getHomeTabBackgroundSource() const + [[nodiscard]] QString getHomeTabBackgroundSource() const { return homeTabBackgroundSource; } - int getHomeTabBackgroundShuffleFrequency() const + [[nodiscard]] int getHomeTabBackgroundShuffleFrequency() const { return homeTabBackgroundShuffleFrequency; } - bool getTabVisualDeckStorageOpen() const + [[nodiscard]] bool getTabVisualDeckStorageOpen() const { return tabVisualDeckStorageOpen; } - bool getTabServerOpen() const + [[nodiscard]] bool getTabServerOpen() const { return tabServerOpen; } - bool getTabAccountOpen() const + [[nodiscard]] bool getTabAccountOpen() const { return tabAccountOpen; } - bool getTabDeckStorageOpen() const + [[nodiscard]] bool getTabDeckStorageOpen() const { return tabDeckStorageOpen; } - bool getTabReplaysOpen() const + [[nodiscard]] bool getTabReplaysOpen() const { return tabReplaysOpen; } - bool getTabAdminOpen() const + [[nodiscard]] bool getTabAdminOpen() const { return tabAdminOpen; } - bool getTabLogOpen() const + [[nodiscard]] bool getTabLogOpen() const { return tabLogOpen; } - QString getChatMentionColor() const + [[nodiscard]] QString getChatMentionColor() const { return chatMentionColor; } - QString getChatHighlightColor() const + [[nodiscard]] QString getChatHighlightColor() const { return chatHighlightColor; } - bool getPicDownload() const + [[nodiscard]] bool getPicDownload() const { return picDownload; } - bool getShowStatusBar() const + [[nodiscard]] bool getShowStatusBar() const { return showStatusBar; } - bool getNotificationsEnabled() const + [[nodiscard]] bool getNotificationsEnabled() const { return notificationsEnabled; } - bool getSpectatorNotificationsEnabled() const + [[nodiscard]] bool getSpectatorNotificationsEnabled() const { return spectatorNotificationsEnabled; } - bool getBuddyConnectNotificationsEnabled() const + [[nodiscard]] bool getBuddyConnectNotificationsEnabled() const { return buddyConnectNotificationsEnabled; } - bool getCheckUpdatesOnStartup() const + [[nodiscard]] bool getCheckUpdatesOnStartup() const { return checkUpdatesOnStartup; } @@ -480,263 +480,263 @@ public: { return startupCardUpdateCheckAlwaysUpdate; } - int getCardUpdateCheckInterval() const + [[nodiscard]] int getCardUpdateCheckInterval() const { return cardUpdateCheckInterval; } - QDate getLastCardUpdateCheck() const + [[nodiscard]] QDate getLastCardUpdateCheck() const { return lastCardUpdateCheck; } - bool getCardUpdateCheckRequired() const + [[nodiscard]] bool getCardUpdateCheckRequired() const { return getLastCardUpdateCheck().daysTo(QDateTime::currentDateTime().date()) >= getCardUpdateCheckInterval() && getLastCardUpdateCheck() != QDateTime::currentDateTime().date(); } - bool getNotifyAboutUpdates() const override + [[nodiscard]] bool getNotifyAboutUpdates() const override { return notifyAboutUpdates; } - bool getNotifyAboutNewVersion() const + [[nodiscard]] bool getNotifyAboutNewVersion() const { return notifyAboutNewVersion; } - bool getShowTipsOnStartup() const + [[nodiscard]] bool getShowTipsOnStartup() const { return showTipsOnStartup; } - QList getSeenTips() const + [[nodiscard]] QList getSeenTips() const { return seenTips; } - int getUpdateReleaseChannelIndex() const + [[nodiscard]] int getUpdateReleaseChannelIndex() const { return updateReleaseChannel; } - ReleaseChannel *getUpdateReleaseChannel() const + [[nodiscard]] ReleaseChannel *getUpdateReleaseChannel() const { return releaseChannels.at(qMax(0, updateReleaseChannel)); } - QList getUpdateReleaseChannels() const + [[nodiscard]] QList getUpdateReleaseChannels() const { return releaseChannels; } - bool getDoubleClickToPlay() const + [[nodiscard]] bool getDoubleClickToPlay() const { return doubleClickToPlay; } - bool getClickPlaysAllSelected() const + [[nodiscard]] bool getClickPlaysAllSelected() const { return clickPlaysAllSelected; } - bool getPlayToStack() const + [[nodiscard]] bool getPlayToStack() const { return playToStack; } - bool getDoNotDeleteArrowsInSubPhases() const + [[nodiscard]] bool getDoNotDeleteArrowsInSubPhases() const { return doNotDeleteArrowsInSubPhases; } - int getStartingHandSize() const + [[nodiscard]] int getStartingHandSize() const { return startingHandSize; } - bool getAnnotateTokens() const + [[nodiscard]] bool getAnnotateTokens() const { return annotateTokens; } - QByteArray getTabGameSplitterSizes() const + [[nodiscard]] QByteArray getTabGameSplitterSizes() const { return tabGameSplitterSizes; } - bool getShowShortcuts() const + [[nodiscard]] bool getShowShortcuts() const { return showShortcuts; } - bool getDisplayCardNames() const + [[nodiscard]] bool getDisplayCardNames() const { return displayCardNames; } - bool getOverrideAllCardArtWithPersonalPreference() const + [[nodiscard]] bool getOverrideAllCardArtWithPersonalPreference() const { return overrideAllCardArtWithPersonalPreference; } - bool getBumpSetsWithCardsInDeckToTop() const + [[nodiscard]] bool getBumpSetsWithCardsInDeckToTop() const { return bumpSetsWithCardsInDeckToTop; } - int getPrintingSelectorSortOrder() const + [[nodiscard]] int getPrintingSelectorSortOrder() const { return printingSelectorSortOrder; } - int getPrintingSelectorCardSize() const + [[nodiscard]] int getPrintingSelectorCardSize() const { return printingSelectorCardSize; } - bool getIncludeRebalancedCards() const + [[nodiscard]] bool getIncludeRebalancedCards() const { return includeRebalancedCards; } - bool getPrintingSelectorNavigationButtonsVisible() const + [[nodiscard]] bool getPrintingSelectorNavigationButtonsVisible() const { return printingSelectorNavigationButtonsVisible; } - bool getDeckEditorBannerCardComboBoxVisible() const + [[nodiscard]] bool getDeckEditorBannerCardComboBoxVisible() const { return deckEditorBannerCardComboBoxVisible; } - bool getDeckEditorTagsWidgetVisible() const + [[nodiscard]] bool getDeckEditorTagsWidgetVisible() const { return deckEditorTagsWidgetVisible; } - int getVisualDeckStorageSortingOrder() const + [[nodiscard]] int getVisualDeckStorageSortingOrder() const { return visualDeckStorageSortingOrder; } - bool getVisualDeckStorageShowFolders() const + [[nodiscard]] bool getVisualDeckStorageShowFolders() const { return visualDeckStorageShowFolders; } - bool getVisualDeckStorageShowTagFilter() const + [[nodiscard]] bool getVisualDeckStorageShowTagFilter() const { return visualDeckStorageShowTagFilter; } - QStringList getVisualDeckStorageDefaultTagsList() const + [[nodiscard]] QStringList getVisualDeckStorageDefaultTagsList() const { return visualDeckStorageDefaultTagsList; } - bool getVisualDeckStorageSearchFolderNames() const + [[nodiscard]] bool getVisualDeckStorageSearchFolderNames() const { return visualDeckStorageSearchFolderNames; } - bool getVisualDeckStorageShowBannerCardComboBox() const + [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const { return visualDeckStorageShowBannerCardComboBox; } - bool getVisualDeckStorageShowTagsOnDeckPreviews() const + [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const { return visualDeckStorageShowTagsOnDeckPreviews; } - int getVisualDeckStorageCardSize() const + [[nodiscard]] int getVisualDeckStorageCardSize() const { return visualDeckStorageCardSize; } - bool getVisualDeckStorageDrawUnusedColorIdentities() const + [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const { return visualDeckStorageDrawUnusedColorIdentities; } - int getVisualDeckStorageUnusedColorIdentitiesOpacity() const + [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const { return visualDeckStorageUnusedColorIdentitiesOpacity; } - int getVisualDeckStorageTooltipType() const + [[nodiscard]] int getVisualDeckStorageTooltipType() const { return visualDeckStorageTooltipType; } - bool getVisualDeckStoragePromptForConversion() const + [[nodiscard]] bool getVisualDeckStoragePromptForConversion() const { return visualDeckStoragePromptForConversion; } - bool getVisualDeckStorageAlwaysConvert() const + [[nodiscard]] bool getVisualDeckStorageAlwaysConvert() const { return visualDeckStorageAlwaysConvert; } - bool getVisualDeckStorageInGame() const + [[nodiscard]] bool getVisualDeckStorageInGame() const { return visualDeckStorageInGame; } - bool getVisualDeckStorageSelectionAnimation() const + [[nodiscard]] bool getVisualDeckStorageSelectionAnimation() const { return visualDeckStorageSelectionAnimation; } - int getVisualDeckEditorCardSize() const + [[nodiscard]] int getVisualDeckEditorCardSize() const { return visualDeckEditorCardSize; } - int getVisualDatabaseDisplayCardSize() const + [[nodiscard]] int getVisualDatabaseDisplayCardSize() const { return visualDatabaseDisplayCardSize; } - int getEDHRecCardSize() const + [[nodiscard]] int getEDHRecCardSize() const { return edhrecCardSize; } - int getArchidektPreviewSize() const + [[nodiscard]] int getArchidektPreviewSize() const { return archidektPreviewSize; } - int getDefaultDeckEditorType() const + [[nodiscard]] int getDefaultDeckEditorType() const { return defaultDeckEditorType; } - bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const + [[nodiscard]] bool getVisualDatabaseDisplayFilterToMostRecentSetsEnabled() const { return visualDatabaseDisplayFilterToMostRecentSetsEnabled; } - int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const + [[nodiscard]] int getVisualDatabaseDisplayFilterToMostRecentSetsAmount() const { return visualDatabaseDisplayFilterToMostRecentSetsAmount; } - int getVisualDeckEditorSampleHandSize() const + [[nodiscard]] int getVisualDeckEditorSampleHandSize() const { return visualDeckEditorSampleHandSize; } - bool getHorizontalHand() const + [[nodiscard]] bool getHorizontalHand() const { return horizontalHand; } - bool getInvertVerticalCoordinate() const + [[nodiscard]] bool getInvertVerticalCoordinate() const { return invertVerticalCoordinate; } - int getMinPlayersForMultiColumnLayout() const + [[nodiscard]] int getMinPlayersForMultiColumnLayout() const { return minPlayersForMultiColumnLayout; } - bool getTapAnimation() const + [[nodiscard]] bool getTapAnimation() const { return tapAnimation; } - bool getAutoRotateSidewaysLayoutCards() const + [[nodiscard]] bool getAutoRotateSidewaysLayoutCards() const { return autoRotateSidewaysLayoutCards; } - bool getOpenDeckInNewTab() const + [[nodiscard]] bool getOpenDeckInNewTab() const { return openDeckInNewTab; } - int getRewindBufferingMs() const + [[nodiscard]] int getRewindBufferingMs() const { return rewindBufferingMs; } - bool getChatMention() const + [[nodiscard]] bool getChatMention() const { return chatMention; } - bool getChatMentionCompleter() const + [[nodiscard]] bool getChatMentionCompleter() const { return chatMentionCompleter; } - bool getChatMentionForeground() const + [[nodiscard]] bool getChatMentionForeground() const { return chatMentionForeground; } - bool getChatHighlightForeground() const + [[nodiscard]] bool getChatHighlightForeground() const { return chatHighlightForeground; } /** * Currently selected index for the `Group by X` QComboBox */ - int getZoneViewGroupByIndex() const + [[nodiscard]] int getZoneViewGroupByIndex() const { return zoneViewGroupByIndex; } /** * Currently selected index for the `Sort by X` QComboBox */ - int getZoneViewSortByIndex() const + [[nodiscard]] int getZoneViewSortByIndex() const { return zoneViewSortByIndex; } @@ -744,136 +744,136 @@ public: Returns if the view should be sorted into pile view. @return zoneViewPileView if the view should be sorted into pile view. */ - bool getZoneViewPileView() const + [[nodiscard]] bool getZoneViewPileView() const { return zoneViewPileView; } - bool getSoundEnabled() const + [[nodiscard]] bool getSoundEnabled() const { return soundEnabled; } - QString getSoundThemeName() const + [[nodiscard]] QString getSoundThemeName() const { return soundThemeName; } - bool getIgnoreUnregisteredUsers() const + [[nodiscard]] bool getIgnoreUnregisteredUsers() const { return ignoreUnregisteredUsers; } - bool getIgnoreUnregisteredUserMessages() const + [[nodiscard]] bool getIgnoreUnregisteredUserMessages() const { return ignoreUnregisteredUserMessages; } - int getPixmapCacheSize() const + [[nodiscard]] int getPixmapCacheSize() const { return pixmapCacheSize; } - int getNetworkCacheSizeInMB() const + [[nodiscard]] int getNetworkCacheSizeInMB() const { return networkCacheSize; } - int getRedirectCacheTtl() const + [[nodiscard]] int getRedirectCacheTtl() const { return redirectCacheTtl; } - bool getScaleCards() const + [[nodiscard]] bool getScaleCards() const { return scaleCards; } - int getStackCardOverlapPercent() const + [[nodiscard]] int getStackCardOverlapPercent() const { return verticalCardOverlapPercent; } - bool getShowMessagePopup() const + [[nodiscard]] bool getShowMessagePopup() const { return showMessagePopups; } - bool getShowMentionPopup() const + [[nodiscard]] bool getShowMentionPopup() const { return showMentionPopups; } - bool getRoomHistory() const + [[nodiscard]] bool getRoomHistory() const { return roomHistory; } - bool getLeftJustified() const + [[nodiscard]] bool getLeftJustified() const { return leftJustified; } - int getMasterVolume() const + [[nodiscard]] int getMasterVolume() const { return masterVolume; } - int getCardInfoViewMode() const + [[nodiscard]] int getCardInfoViewMode() const { return cardInfoViewMode; } - QStringList getCountries() const; - QString getHighlightWords() const + [[nodiscard]] QStringList getCountries() const; + [[nodiscard]] QString getHighlightWords() const { return highlightWords; } - QString getGameDescription() const + [[nodiscard]] QString getGameDescription() const { return gameDescription; } - int getMaxPlayers() const + [[nodiscard]] int getMaxPlayers() const { return maxPlayers; } - QString getGameTypes() const + [[nodiscard]] QString getGameTypes() const { return gameTypes; } - bool getOnlyBuddies() const + [[nodiscard]] bool getOnlyBuddies() const { return onlyBuddies; } - bool getOnlyRegistered() const + [[nodiscard]] bool getOnlyRegistered() const { return onlyRegistered; } - bool getSpectatorsAllowed() const + [[nodiscard]] bool getSpectatorsAllowed() const { return spectatorsAllowed; } - bool getSpectatorsNeedPassword() const + [[nodiscard]] bool getSpectatorsNeedPassword() const { return spectatorsNeedPassword; } - bool getSpectatorsCanTalk() const + [[nodiscard]] bool getSpectatorsCanTalk() const { return spectatorsCanTalk; } - bool getSpectatorsCanSeeEverything() const + [[nodiscard]] bool getSpectatorsCanSeeEverything() const { return spectatorsCanSeeEverything; } - int getDefaultStartingLifeTotal() const + [[nodiscard]] int getDefaultStartingLifeTotal() const { return defaultStartingLifeTotal; } - bool getShareDecklistsOnLoad() const + [[nodiscard]] bool getShareDecklistsOnLoad() const { return shareDecklistsOnLoad; } - bool getCreateGameAsSpectator() const + [[nodiscard]] bool getCreateGameAsSpectator() const { return createGameAsSpectator; } - bool getRememberGameSettings() const + [[nodiscard]] bool getRememberGameSettings() const { return rememberGameSettings; } - int getKeepAlive() const override + [[nodiscard]] int getKeepAlive() const override { return keepalive; } - int getTimeOut() const override + [[nodiscard]] int getTimeOut() const override { return timeout; } - int getMaxFontSize() const + [[nodiscard]] int getMaxFontSize() const { return maxFontSize; } @@ -901,73 +901,73 @@ public: { return useTearOffMenus; } - int getCardViewInitialRowsMax() const + [[nodiscard]] int getCardViewInitialRowsMax() const { return cardViewInitialRowsMax; } - int getCardViewExpandedRowsMax() const + [[nodiscard]] int getCardViewExpandedRowsMax() const { return cardViewExpandedRowsMax; } - bool getCloseEmptyCardView() const + [[nodiscard]] bool getCloseEmptyCardView() const { return closeEmptyCardView; } - bool getFocusCardViewSearchBar() const + [[nodiscard]] bool getFocusCardViewSearchBar() const { return focusCardViewSearchBar; } - ShortcutsSettings &shortcuts() const + [[nodiscard]] ShortcutsSettings &shortcuts() const { return *shortcutsSettings; } - CardDatabaseSettings *cardDatabase() const + [[nodiscard]] CardDatabaseSettings *cardDatabase() const { return cardDatabaseSettings; } - ServersSettings &servers() const + [[nodiscard]] ServersSettings &servers() const { return *serversSettings; } - MessageSettings &messages() const + [[nodiscard]] MessageSettings &messages() const { return *messageSettings; } - GameFiltersSettings &gameFilters() const + [[nodiscard]] GameFiltersSettings &gameFilters() const { return *gameFiltersSettings; } - LayoutsSettings &layouts() const + [[nodiscard]] LayoutsSettings &layouts() const { return *layoutsSettings; } - DownloadSettings &downloads() const + [[nodiscard]] DownloadSettings &downloads() const { return *downloadSettings; } - RecentsSettings &recents() const + [[nodiscard]] RecentsSettings &recents() const { return *recentsSettings; } - CardOverrideSettings &cardOverrides() const + [[nodiscard]] CardOverrideSettings &cardOverrides() const { return *cardOverrideSettings; } - DebugSettings &debug() const + [[nodiscard]] DebugSettings &debug() const { return *debugSettings; } - CardCounterSettings &cardCounters() const; + [[nodiscard]] CardCounterSettings &cardCounters() const; - bool getIsPortableBuild() const + [[nodiscard]] bool getIsPortableBuild() const { return isPortableBuild; } - bool getDownloadSpoilersStatus() const + [[nodiscard]] bool getDownloadSpoilersStatus() const { return mbDownloadSpoilers; } - bool getRoundCardCorners() const + [[nodiscard]] bool getRoundCardCorners() const { return roundCardCorners; } diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h index f2c1c1d43..63615d0e2 100644 --- a/cockatrice/src/client/settings/card_counter_settings.h +++ b/cockatrice/src/client/settings/card_counter_settings.h @@ -20,9 +20,9 @@ class CardCounterSettings : public SettingsManager public: CardCounterSettings(const QString &settingsPath, QObject *parent = nullptr); - QColor color(int counterId) const; + [[nodiscard]] QColor color(int counterId) const; - QString displayName(int counterId) const; + [[nodiscard]] QString displayName(int counterId) const; public slots: void setColor(int counterId, const QColor &color); diff --git a/cockatrice/src/client/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h index 229bf2ed2..d503140f0 100644 --- a/cockatrice/src/client/settings/shortcut_treeview.h +++ b/cockatrice/src/client/settings/shortcut_treeview.h @@ -22,7 +22,7 @@ public: explicit ShortcutFilterProxyModel(QObject *parent = nullptr); protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; }; class ShortcutTreeView : public QTreeView diff --git a/cockatrice/src/client/settings/shortcuts_settings.h b/cockatrice/src/client/settings/shortcuts_settings.h index 31e90bdc7..d1b0301d1 100644 --- a/cockatrice/src/client/settings/shortcuts_settings.h +++ b/cockatrice/src/client/settings/shortcuts_settings.h @@ -100,11 +100,11 @@ public: { QList::operator=(_sequence); }; - QString getName() const + [[nodiscard]] QString getName() const { return QApplication::translate("shortcutsTab", name.toUtf8().data()); }; - QString getGroupName() const + [[nodiscard]] QString getGroupName() const { return ShortcutGroup::getGroupName(group); }; @@ -120,13 +120,13 @@ class ShortcutsSettings : public QObject public: explicit ShortcutsSettings(const QString &settingsFilePath, QObject *parent = nullptr); - ShortcutKey getDefaultShortcut(const QString &name) const; - ShortcutKey getShortcut(const QString &name) const; - QKeySequence getSingleShortcut(const QString &name) const; - QString getDefaultShortcutString(const QString &name) const; - QString getShortcutString(const QString &name) const; - QString getShortcutFriendlyName(const QString &shortcutName) const; - QList getAllShortcutKeys() const + [[nodiscard]] ShortcutKey getDefaultShortcut(const QString &name) const; + [[nodiscard]] ShortcutKey getShortcut(const QString &name) const; + [[nodiscard]] QKeySequence getSingleShortcut(const QString &name) const; + [[nodiscard]] QString getDefaultShortcutString(const QString &name) const; + [[nodiscard]] QString getShortcutString(const QString &name) const; + [[nodiscard]] QString getShortcutFriendlyName(const QString &shortcutName) const; + [[nodiscard]] QList getAllShortcutKeys() const { return shortCuts.keys(); }; @@ -135,9 +135,9 @@ public: void setShortcuts(const QString &name, const QKeySequence &Sequence); void setShortcuts(const QString &name, const QString &sequences); - bool isKeyAllowed(const QString &name, const QString &sequences) const; - bool isValid(const QString &name, const QString &sequences) const; - QStringList findOverlaps(const QString &name, const QString &sequences) const; + [[nodiscard]] bool isKeyAllowed(const QString &name, const QString &sequences) const; + [[nodiscard]] bool isValid(const QString &name, const QString &sequences) const; + [[nodiscard]] QStringList findOverlaps(const QString &name, const QString &sequences) const; void resetAllShortcuts(); void clearAllShortcuts(); @@ -152,8 +152,8 @@ private: QString settingsFilePath; QHash shortCuts; - QString stringifySequence(const QList &Sequence) const; - QList parseSequenceString(const QString &stringSequence) const; + [[nodiscard]] QString stringifySequence(const QList &Sequence) const; + [[nodiscard]] QList parseSequenceString(const QString &stringSequence) const; const QHash defaultShortCuts = { {"MainWindow/aCheckCardUpdates", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Check for Card Updates..."), diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h index 4197bb53c..5ec23ea60 100644 --- a/cockatrice/src/database/interface/settings_card_preference_provider.h +++ b/cockatrice/src/database/interface/settings_card_preference_provider.h @@ -7,12 +7,12 @@ class SettingsCardPreferenceProvider : public ICardPreferenceProvider { public: - QString getCardPreferenceOverride(const QString &cardName) const override + [[nodiscard]] QString getCardPreferenceOverride(const QString &cardName) const override { return SettingsCache::instance().cardOverrides().getCardPreferenceOverride(cardName); } - bool getIncludeRebalancedCards() const override + [[nodiscard]] bool getIncludeRebalancedCards() const override { return SettingsCache::instance().getIncludeRebalancedCards(); }; diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index 15782b3ad..635745592 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -40,7 +40,7 @@ public: return filter(deck, info); } - bool valid() const + [[nodiscard]] bool valid() const { return _error.isEmpty(); } diff --git a/cockatrice/src/filters/filter_tree_model.h b/cockatrice/src/filters/filter_tree_model.h index ce6eb85fc..c6666a838 100644 --- a/cockatrice/src/filters/filter_tree_model.h +++ b/cockatrice/src/filters/filter_tree_model.h @@ -24,8 +24,8 @@ public slots: void addFilter(const CardFilter *f); void removeFilter(const CardFilter *f); void clearFiltersOfType(CardFilter::Attr filterType); - QList getFiltersOfType(CardFilter::Attr filterType) const; - QList allFilters() const; + [[nodiscard]] QList getFiltersOfType(CardFilter::Attr filterType) const; + [[nodiscard]] QList allFilters() const; private slots: void proxyBeginInsertRow(const FilterTreeNode *, int); @@ -34,23 +34,23 @@ private slots: void proxyEndRemoveRow(const FilterTreeNode *, int); private: - FilterTreeNode *indexToNode(const QModelIndex &idx) const; + [[nodiscard]] FilterTreeNode *indexToNode(const QModelIndex &idx) const; QModelIndex nodeIndex(const FilterTreeNode *node, int row, int column) const; public: FilterTreeModel(QObject *parent = nullptr); ~FilterTreeModel() override; - FilterTree *filterTree() const + [[nodiscard]] FilterTree *filterTree() const { return fTree; } - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - Qt::ItemFlags flags(const QModelIndex &index) const override; - QModelIndex parent(const QModelIndex &ind) const override; - QModelIndex index(int row, int column, const QModelIndex &parent) const override; + [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override; + [[nodiscard]] QModelIndex parent(const QModelIndex &ind) const override; + [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override; bool removeRows(int row, int count, const QModelIndex &parent) override; void clear(); }; diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h index 84f16cc38..25692f318 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.h @@ -42,7 +42,7 @@ public: * * Uses a set of name variants and folder paths to attempt to locate the correct image. */ - QImage tryLoad(const ExactCard &toLoad) const; + [[nodiscard]] QImage tryLoad(const ExactCard &toLoad) const; private: QString picsPath; ///< Path to standard card image folder @@ -72,10 +72,10 @@ private: * Uses several filename patterns to match card images, in order from * most-specific to least-specific. */ - QImage tryLoadCardImageFromDisk(const QString &setName, - const QString &correctedCardName, - const QString &collectorNumber, - const QString &providerId) const; + [[nodiscard]] QImage tryLoadCardImageFromDisk(const QString &setName, + const QString &correctedCardName, + const QString &collectorNumber, + const QString &providerId) const; private slots: /** diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index 57305b7de..ba9ba807d 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -56,7 +56,7 @@ public: DeckLoader(const DeckLoader &) = delete; DeckLoader &operator=(const DeckLoader &) = delete; - const QString &getLastFileName() const + [[nodiscard]] const QString &getLastFileName() const { return lastFileName; } @@ -64,16 +64,16 @@ public: { lastFileName = _lastFileName; } - FileFormat getLastFileFormat() const + [[nodiscard]] FileFormat getLastFileFormat() const { return lastFileFormat; } - int getLastRemoteDeckId() const + [[nodiscard]] int getLastRemoteDeckId() const { return lastRemoteDeckId; } - bool hasNotBeenLoaded() const + [[nodiscard]] bool hasNotBeenLoaded() const { return getLastFileName().isEmpty() && getLastRemoteDeckId() == -1; } diff --git a/cockatrice/src/interface/layouts/flow_layout.h b/cockatrice/src/interface/layouts/flow_layout.h index f4c9e3001..cf109d260 100644 --- a/cockatrice/src/interface/layouts/flow_layout.h +++ b/cockatrice/src/interface/layouts/flow_layout.h @@ -23,9 +23,9 @@ public: ~FlowLayout() override; void insertWidgetAtIndex(QWidget *toInsert, int index); - QSize calculateMinimumSizeHorizontal() const; - QSize calculateSizeHintVertical() const; - QSize calculateMinimumSizeVertical() const; + [[nodiscard]] QSize calculateMinimumSizeHorizontal() const; + [[nodiscard]] QSize calculateSizeHintVertical() const; + [[nodiscard]] QSize calculateMinimumSizeVertical() const; void addItem(QLayoutItem *item) override; [[nodiscard]] int count() const override; [[nodiscard]] QLayoutItem *itemAt(int index) const override; @@ -48,7 +48,7 @@ public: void layoutSingleColumn(const QVector &colItems, int x, int y); [[nodiscard]] QSize sizeHint() const override; [[nodiscard]] QSize minimumSize() const override; - QSize calculateSizeHintHorizontal() const; + [[nodiscard]] QSize calculateSizeHintHorizontal() const; protected: QList items; // List to store layout items diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 86f3db9f8..0c89d51f5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -104,7 +104,7 @@ private: QAction *aRemoveCard, *aIncrement, *aDecrement, *aSwapCard; void recursiveExpand(const QModelIndex &index); - QModelIndexList getSelectedCardNodes() const; + [[nodiscard]] QModelIndexList getSelectedCardNodes() const; private slots: void decklistCustomMenu(QPoint point); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h index 7c5ea303a..61eea1d6e 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h @@ -22,7 +22,7 @@ public: explicit DialogConvertDeckToCodFormat(QWidget *parent); void retranslateUi(); - bool dontAskAgain() const; + [[nodiscard]] bool dontAskAgain() const; private: QVBoxLayout *layout; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h index 38f782228..311774d11 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.h @@ -20,11 +20,11 @@ class DlgEditPassword : public QDialog Q_OBJECT public: explicit DlgEditPassword(QWidget *parent = nullptr); - QString getOldPassword() const + [[nodiscard]] QString getOldPassword() const { return oldPasswordEdit->text(); } - QString getNewPassword() const + [[nodiscard]] QString getNewPassword() const { return newPasswordEdit->text(); } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h index 37b208749..abfdab28a 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_filter_games.h @@ -58,32 +58,32 @@ public: const GamesProxyModel *_gamesProxyModel, QWidget *parent = nullptr); - bool getHideFullGames() const; - bool getHideGamesThatStarted() const; - bool getHidePasswordProtectedGames() const; + [[nodiscard]] bool getHideFullGames() const; + [[nodiscard]] bool getHideGamesThatStarted() const; + [[nodiscard]] bool getHidePasswordProtectedGames() const; void setShowPasswordProtectedGames(bool _passwordProtectedGamesHidden); - bool getHideBuddiesOnlyGames() const; + [[nodiscard]] bool getHideBuddiesOnlyGames() const; void setHideBuddiesOnlyGames(bool _hideBuddiesOnlyGames); - bool getHideOpenDecklistGames() const; + [[nodiscard]] bool getHideOpenDecklistGames() const; void setHideOpenDecklistGames(bool _hideOpenDecklistGames); - bool getHideIgnoredUserGames() const; + [[nodiscard]] bool getHideIgnoredUserGames() const; void setHideIgnoredUserGames(bool _hideIgnoredUserGames); - bool getHideNotBuddyCreatedGames() const; - QString getGameNameFilter() const; + [[nodiscard]] bool getHideNotBuddyCreatedGames() const; + [[nodiscard]] QString getGameNameFilter() const; void setGameNameFilter(const QString &_gameNameFilter); - QStringList getCreatorNameFilters() const; + [[nodiscard]] QStringList getCreatorNameFilters() const; void setCreatorNameFilter(const QString &_creatorNameFilter); - QSet getGameTypeFilter() const; + [[nodiscard]] QSet getGameTypeFilter() const; void setGameTypeFilter(const QSet &_gameTypeFilter); - int getMaxPlayersFilterMin() const; - int getMaxPlayersFilterMax() const; + [[nodiscard]] int getMaxPlayersFilterMin() const; + [[nodiscard]] int getMaxPlayersFilterMax() const; void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax); - QTime getMaxGameAge() const; + [[nodiscard]] QTime getMaxGameAge() const; const QMap gameAgeMap; - bool getShowOnlyIfSpectatorsCanWatch() const; - bool getShowSpectatorPasswordProtected() const; - bool getShowOnlyIfSpectatorsCanChat() const; - bool getShowOnlyIfSpectatorsCanSeeHands() const; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const; + [[nodiscard]] bool getShowSpectatorPasswordProtected() const; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const; + [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const; }; #endif diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h index da4d9e726..e51dad810 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.h @@ -20,15 +20,15 @@ class DlgForgotPasswordRequest : public QDialog Q_OBJECT public: explicit DlgForgotPasswordRequest(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(); } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h index ede22e2aa..3d110c71d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.h @@ -20,23 +20,23 @@ class DlgForgotPasswordReset : public QDialog Q_OBJECT public: explicit DlgForgotPasswordReset(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 getToken() const + [[nodiscard]] QString getToken() const { return tokenEdit->text(); } - QString getPassword() const + [[nodiscard]] QString getPassword() const { return newpasswordEdit->text(); } diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.h b/cockatrice/src/interface/widgets/dialogs/dlg_register.h index a614386fc..bebbfc500 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.h @@ -20,31 +20,31 @@ class DlgRegister : public QDialog Q_OBJECT public: explicit DlgRegister(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 getPassword() const + [[nodiscard]] QString getPassword() const { return passwordEdit->text(); } - 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(); } diff --git a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h index 1cb0cf6fb..d61fddab5 100644 --- a/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h +++ b/cockatrice/src/interface/widgets/dialogs/tip_of_the_day.h @@ -14,19 +14,19 @@ class TipOfTheDay { public: explicit TipOfTheDay(QString _title, QString _content, QString _imagePath, QDate _date); - QString getTitle() const + [[nodiscard]] QString getTitle() const { return title; } - QString getContent() const + [[nodiscard]] QString getContent() const { return content; } - QString getImagePath() const + [[nodiscard]] QString getImagePath() const { return imagePath; } - QDate getDate() const + [[nodiscard]] QDate getDate() const { return date; } @@ -51,8 +51,8 @@ public: explicit TipsOfTheDay(QString xmlPath, QObject *parent = nullptr); ~TipsOfTheDay() override; TipOfTheDay getTip(int tipId); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; private: QList *tipList; diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h index e55d408ce..17a235365 100644 --- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h +++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.h @@ -60,10 +60,10 @@ public: explicit ReplayTimelineWidget(QWidget *parent = nullptr); void setTimeline(const QList &_replayTimeline); - QSize sizeHint() const override; - QSize minimumSizeHint() const override; + [[nodiscard]] QSize sizeHint() const override; + [[nodiscard]] QSize minimumSizeHint() const override; void setTimeScaleFactor(qreal _timeScaleFactor); - int getCurrentEvent() const + [[nodiscard]] int getCurrentEvent() const { return currentEvent; } diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h index c704befcc..03602a74e 100644 --- a/cockatrice/src/interface/widgets/server/games_model.h +++ b/cockatrice/src/interface/widgets/server/games_model.h @@ -42,19 +42,20 @@ public: */ GamesModel(const QMap &_rooms, const QMap &_gameTypes, QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const override + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override { return parent.isValid() ? 0 : gameList.size(); } - int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override + [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override { return NUM_COLS; } - QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; /** * @brief Formats the game creation time into a human-readable string. @@ -148,71 +149,71 @@ public: explicit GamesProxyModel(QObject *parent = nullptr, const UserListProxy *_userListProxy = nullptr); // Getters for filter parameters - bool getHideBuddiesOnlyGames() const + [[nodiscard]] bool getHideBuddiesOnlyGames() const { return hideBuddiesOnlyGames; } - bool getHideIgnoredUserGames() const + [[nodiscard]] bool getHideIgnoredUserGames() const { return hideIgnoredUserGames; } - bool getHideFullGames() const + [[nodiscard]] bool getHideFullGames() const { return hideFullGames; } - bool getHideGamesThatStarted() const + [[nodiscard]] bool getHideGamesThatStarted() const { return hideGamesThatStarted; } - bool getHidePasswordProtectedGames() const + [[nodiscard]] bool getHidePasswordProtectedGames() const { return hidePasswordProtectedGames; } - bool getHideNotBuddyCreatedGames() const + [[nodiscard]] bool getHideNotBuddyCreatedGames() const { return hideNotBuddyCreatedGames; } - bool getHideOpenDecklistGames() const + [[nodiscard]] bool getHideOpenDecklistGames() const { return hideOpenDecklistGames; } - QString getGameNameFilter() const + [[nodiscard]] QString getGameNameFilter() const { return gameNameFilter; } - QStringList getCreatorNameFilters() const + [[nodiscard]] QStringList getCreatorNameFilters() const { return creatorNameFilters; } - QSet getGameTypeFilter() const + [[nodiscard]] QSet getGameTypeFilter() const { return gameTypeFilter; } - int getMaxPlayersFilterMin() const + [[nodiscard]] int getMaxPlayersFilterMin() const { return maxPlayersFilterMin; } - int getMaxPlayersFilterMax() const + [[nodiscard]] int getMaxPlayersFilterMax() const { return maxPlayersFilterMax; } - const QTime &getMaxGameAge() const + [[nodiscard]] const QTime &getMaxGameAge() const { return maxGameAge; } - bool getShowOnlyIfSpectatorsCanWatch() const + [[nodiscard]] bool getShowOnlyIfSpectatorsCanWatch() const { return showOnlyIfSpectatorsCanWatch; } - bool getShowSpectatorPasswordProtected() const + [[nodiscard]] bool getShowSpectatorPasswordProtected() const { return showSpectatorPasswordProtected; } - bool getShowOnlyIfSpectatorsCanChat() const + [[nodiscard]] bool getShowOnlyIfSpectatorsCanChat() const { return showOnlyIfSpectatorsCanChat; } - bool getShowOnlyIfSpectatorsCanSeeHands() const + [[nodiscard]] bool getShowOnlyIfSpectatorsCanSeeHands() const { return showOnlyIfSpectatorsCanSeeHands; } @@ -328,7 +329,7 @@ public: /** * @brief Returns the number of games filtered out by the current filter. */ - int getNumFilteredGames() const; + [[nodiscard]] int getNumFilteredGames() const; /** * @brief Resets all filter parameters to default values. @@ -338,7 +339,7 @@ public: /** * @brief Returns true if all filter parameters are set to their defaults. */ - bool areFilterParametersSetToDefaults() const; + [[nodiscard]] bool areFilterParametersSetToDefaults() const; /** * @brief Loads filter parameters from persistent settings. @@ -358,8 +359,8 @@ public: void refresh(); protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; - bool filterAcceptsRow(int sourceRow) const; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow) const; }; #endif diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h index 0153f0414..6836ff435 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h +++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h @@ -34,11 +34,11 @@ public: { } virtual ~Node() = default; - DirectoryNode *getParent() const + [[nodiscard]] DirectoryNode *getParent() const { return parent; } - QString getName() const + [[nodiscard]] QString getName() const { return name; } @@ -49,9 +49,9 @@ public: explicit DirectoryNode(const QString &_name = QString(), DirectoryNode *_parent = nullptr); ~DirectoryNode() override; void clearTree(); - QString getPath() const; + [[nodiscard]] QString getPath() const; DirectoryNode *getNodeByPath(QStringList path); - FileNode *getNodeById(int id) const; + [[nodiscard]] FileNode *getNodeById(int id) const; }; class FileNode : public Node { @@ -64,17 +64,17 @@ public: : Node(_name, _parent), id(_id), uploadTime(_uploadTime) { } - int getId() const + [[nodiscard]] int getId() const { return id; } - QDateTime getUploadTime() const + [[nodiscard]] QDateTime getUploadTime() const { return uploadTime; } }; - template T getNode(const QModelIndex &index) const + template [[nodiscard]] T getNode(const QModelIndex &index) const { if (!index.isValid()) return dynamic_cast(root); @@ -96,15 +96,16 @@ private slots: public: explicit RemoteDeckList_TreeModel(AbstractClient *_client, QObject *parent = nullptr); ~RemoteDeckList_TreeModel() override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - QModelIndex parent(const QModelIndex &index) const override; - Qt::ItemFlags flags(const QModelIndex &index) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override; + [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override; - DirectoryNode *getRoot() const + [[nodiscard]] DirectoryNode *getRoot() const { return root; } @@ -124,11 +125,11 @@ private: public: explicit RemoteDeckList_TreeWidget(AbstractClient *_client, QWidget *parent = nullptr); - RemoteDeckList_TreeModel::Node *getNode(const QModelIndex &ind) const; - RemoteDeckList_TreeModel::Node *getCurrentItem() const; - QList getCurrentSelection() const; - RemoteDeckList_TreeModel::DirectoryNode *getNodeByPath(const QString &path) const; - RemoteDeckList_TreeModel::FileNode *getNodeById(int id) const; + [[nodiscard]] RemoteDeckList_TreeModel::Node *getNode(const QModelIndex &ind) const; + [[nodiscard]] RemoteDeckList_TreeModel::Node *getCurrentItem() const; + [[nodiscard]] QList getCurrentSelection() const; + [[nodiscard]] RemoteDeckList_TreeModel::DirectoryNode *getNodeByPath(const QString &path) const; + [[nodiscard]] RemoteDeckList_TreeModel::FileNode *getNodeById(int id) const; void addFileToTree(const ServerInfo_DeckStorage_TreeItem &file, RemoteDeckList_TreeModel::DirectoryNode *parent); void addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder, RemoteDeckList_TreeModel::DirectoryNode *parent); diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h index d5d70af53..f83cce46a 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h +++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.h @@ -35,7 +35,7 @@ private: { } virtual ~Node() = default; - QString getName() const + [[nodiscard]] QString getName() const { return name; } @@ -91,21 +91,22 @@ private slots: public: explicit RemoteReplayList_TreeModel(AbstractClient *_client, QObject *parent = nullptr); ~RemoteReplayList_TreeModel() override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override { return numberOfColumns; } - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; - QModelIndex parent(const QModelIndex &index) const override; - Qt::ItemFlags flags(const QModelIndex &index) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override; + [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override; void clearTree(); void refreshTree(); - ServerInfo_Replay const *getReplay(const QModelIndex &index) const; - ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &index) const; - ServerInfo_ReplayMatch const *getEnclosingReplayMatch(const QModelIndex &index) const; + [[nodiscard]] ServerInfo_Replay const *getReplay(const QModelIndex &index) const; + [[nodiscard]] ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &index) const; + [[nodiscard]] ServerInfo_ReplayMatch const *getEnclosingReplayMatch(const QModelIndex &index) const; void addMatchInfo(const ServerInfo_ReplayMatch &matchInfo); void updateMatchInfo(int gameId, const ServerInfo_ReplayMatch &matchInfo); void removeMatchInfo(int gameId); @@ -119,10 +120,10 @@ private: public: explicit RemoteReplayList_TreeWidget(AbstractClient *_client, QWidget *parent = nullptr); - ServerInfo_Replay const *getReplay(const QModelIndex &ind) const; - ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &ind) const; - QList getSelectedReplays() const; - QSet getSelectedReplayMatches() const; + [[nodiscard]] ServerInfo_Replay const *getReplay(const QModelIndex &ind) const; + [[nodiscard]] ServerInfo_ReplayMatch const *getReplayMatch(const QModelIndex &ind) const; + [[nodiscard]] QList getSelectedReplays() const; + [[nodiscard]] QSet getSelectedReplayMatches() const; void clearTree() { treeModel->clearTree(); diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.h b/cockatrice/src/interface/widgets/server/user/user_info_connection.h index 90be05570..cfba22346 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_connection.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.h @@ -30,31 +30,31 @@ private: public: UserConnection_Information(); UserConnection_Information(QString, QString, QString, QString, QString, bool, QString); - QString getSaveName() const + [[nodiscard]] QString getSaveName() const { return saveName; } - QString getServer() const + [[nodiscard]] QString getServer() const { return server; } - QString getPort() const + [[nodiscard]] QString getPort() const { return port; } - QString getUsername() const + [[nodiscard]] QString getUsername() const { return username; } - QString getPassword() const + [[nodiscard]] QString getPassword() const { return password; } - bool getSavePassword() const + [[nodiscard]] bool getSavePassword() const { return savePassword; } - QString getSite() const + [[nodiscard]] QString getSite() const { return site; } diff --git a/cockatrice/src/interface/widgets/server/user/user_list_manager.h b/cockatrice/src/interface/widgets/server/user/user_list_manager.h index 56f50c0be..f378bd08d 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_manager.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_manager.h @@ -60,11 +60,11 @@ public: return ignoredUsers; } - bool isOwnUserRegistered() const override; - QString getOwnUsername() const override; - bool isUserBuddy(const QString &userName) const override; - bool isUserIgnored(const QString &userName) const override; - const ServerInfo_User *getOnlineUser(const QString &userName) const override; + [[nodiscard]] bool isOwnUserRegistered() const override; + [[nodiscard]] QString getOwnUsername() const override; + [[nodiscard]] bool isUserBuddy(const QString &userName) const override; + [[nodiscard]] bool isUserIgnored(const QString &userName) const override; + [[nodiscard]] const ServerInfo_User *getOnlineUser(const QString &userName) const override; public slots: void handleConnect(); diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h index 897c01b83..036837673 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h @@ -45,13 +45,13 @@ private slots: public: explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr); - QString getBanName() const; - QString getBanIP() const; - QString getBanId() const; - int getMinutes() const; - QString getReason() const; - QString getVisibleReason() const; - int getDeleteMessages() const; + [[nodiscard]] QString getBanName() const; + [[nodiscard]] QString getBanIP() const; + [[nodiscard]] QString getBanId() const; + [[nodiscard]] int getMinutes() const; + [[nodiscard]] QString getReason() const; + [[nodiscard]] QString getVisibleReason() const; + [[nodiscard]] int getDeleteMessages() const; }; class WarningDialog : public QDialog @@ -68,10 +68,10 @@ private slots: public: WarningDialog(const QString userName, const QString clientID, QWidget *parent = nullptr); - QString getName() const; - QString getWarnID() const; - QString getReason() const; - int getDeleteMessages() const; + [[nodiscard]] QString getName() const; + [[nodiscard]] QString getWarnID() const; + [[nodiscard]] QString getReason() const; + [[nodiscard]] int getDeleteMessages() const; void addWarningOption(const QString warning); }; @@ -85,11 +85,11 @@ private: public: explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr); - QString getName() const + [[nodiscard]] QString getName() const { return userName; } - QString getNotes() const; + [[nodiscard]] QString getNotes() const; }; class UserListItemDelegate : public QStyledItemDelegate @@ -159,7 +159,7 @@ public: void processUserInfo(const ServerInfo_User &user, bool online); bool deleteUser(const QString &userName); void setUserOnline(const QString &userName, bool online); - const QMap &getUsers() const + [[nodiscard]] const QMap &getUsers() const { return users; } diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h index d23c4f27d..df6c2eaeb 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_api_response_card_container.h @@ -29,27 +29,27 @@ public: void debugPrint() const; // Getter methods for deck container - const QString &getDescription() const + [[nodiscard]] const QString &getDescription() const { return description; } - const QVector &getBreadcrumb() const + [[nodiscard]] const QVector &getBreadcrumb() const { return breadcrumb; } - const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const + [[nodiscard]] const EdhrecCommanderApiResponseCommanderDetails &getCommanderDetails() const { return card; } - const QVector &getCardlists() const + [[nodiscard]] const QVector &getCardlists() const { return cardlists; } - const QString &getKeywords() const + [[nodiscard]] const QString &getKeywords() const { return keywords; } - const QString &getTitle() const + [[nodiscard]] const QString &getTitle() const { return title; } diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h index 64b5970da..09d0667c7 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/cards/edhrec_commander_api_response_commander_details.h @@ -27,119 +27,119 @@ public: void debugPrint() const; // Getters for the card data - const QString &getAetherhubUri() const + [[nodiscard]] const QString &getAetherhubUri() const { return aetherhubUri; } - const QString &getArchidektUri() const + [[nodiscard]] const QString &getArchidektUri() const { return archidektUri; } - int getCmc() const + [[nodiscard]] int getCmc() const { return cmc; } - const QJsonArray &getColorIdentity() const + [[nodiscard]] const QJsonArray &getColorIdentity() const { return colorIdentity; } - bool isCombos() const + [[nodiscard]] bool isCombos() const { return combos; } - const QString &getDeckstatsUri() const + [[nodiscard]] const QString &getDeckstatsUri() const { return deckstatsUri; } - const QVector &getImageUris() const + [[nodiscard]] const QVector &getImageUris() const { return imageUris; } - int getInclusion() const + [[nodiscard]] int getInclusion() const { return inclusion; } - bool getIsCommander() const + [[nodiscard]] bool getIsCommander() const { return isCommander; } - const QString &getLabel() const + [[nodiscard]] const QString &getLabel() const { return label; } - const QString &getLayout() const + [[nodiscard]] const QString &getLayout() const { return layout; } - bool getLegalCommander() const + [[nodiscard]] bool getLegalCommander() const { return legalCommander; } - const QString &getMoxfieldUri() const + [[nodiscard]] const QString &getMoxfieldUri() const { return moxfieldUri; } - const QString &getMtggoldfishUri() const + [[nodiscard]] const QString &getMtggoldfishUri() const { return mtggoldfishUri; } - const QString &getName() const + [[nodiscard]] const QString &getName() const { return name; } - const QJsonArray &getNames() const + [[nodiscard]] const QJsonArray &getNames() const { return names; } - int getNumDecks() const + [[nodiscard]] int getNumDecks() const { return numDecks; } - int getPotentialDecks() const + [[nodiscard]] int getPotentialDecks() const { return potentialDecks; } - const QString &getPrecon() const + [[nodiscard]] const QString &getPrecon() const { return precon; } - const CardPrices &getPrices() const + [[nodiscard]] const CardPrices &getPrices() const { return prices; } - const QString &getPrimaryType() const + [[nodiscard]] const QString &getPrimaryType() const { return primaryType; } - const QString &getRarity() const + [[nodiscard]] const QString &getRarity() const { return rarity; } - double getSalt() const + [[nodiscard]] double getSalt() const { return salt; } - const QString &getSanitized() const + [[nodiscard]] const QString &getSanitized() const { return sanitized; } - const QString &getSanitizedWo() const + [[nodiscard]] const QString &getSanitizedWo() const { return sanitizedWo; } - const QString &getScryfallUri() const + [[nodiscard]] const QString &getScryfallUri() const { return scryfallUri; } - const QString &getSpellbookUri() const + [[nodiscard]] const QString &getSpellbookUri() const { return spellbookUri; } - const QString &getType() const + [[nodiscard]] const QString &getType() const { return type; } - const QString &getUrl() const + [[nodiscard]] const QString &getUrl() const { return url; } diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h index 2cca18504..3d4c2fa00 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.h @@ -27,13 +27,13 @@ public: void retranslateUi() override; void doSearch(); - QString getTabText() const override + [[nodiscard]] QString getTabText() const override { auto cardName = cardToQuery.isNull() ? QString() : cardToQuery->getName(); return tr("EDHRec: ") + cardName; } - CardSizeWidget *getCardSizeSlider() + CardSizeWidget *getCardSizeSlider() const { return cardSizeSlider; } diff --git a/cockatrice/src/interface/widgets/tabs/tab.h b/cockatrice/src/interface/widgets/tabs/tab.h index 56a9f0b7e..7cff01130 100644 --- a/cockatrice/src/interface/widgets/tabs/tab.h +++ b/cockatrice/src/interface/widgets/tabs/tab.h @@ -39,15 +39,15 @@ private: public: explicit Tab(TabSupervisor *_tabSupervisor); - const QList &getTabMenus() const + [[nodiscard]] const QList &getTabMenus() const { return tabMenus; } - TabSupervisor *getTabSupervisor() const + [[nodiscard]] TabSupervisor *getTabSupervisor() const { return tabSupervisor; } - bool getContentsChanged() const + [[nodiscard]] bool getContentsChanged() const { return contentsChanged; } @@ -55,7 +55,7 @@ public: { contentsChanged = _contentsChanged; } - virtual QString getTabText() const = 0; + [[nodiscard]] virtual QString getTabText() const = 0; virtual void retranslateUi() = 0; /** diff --git a/cockatrice/src/interface/widgets/tabs/tab_home.h b/cockatrice/src/interface/widgets/tabs/tab_home.h index 3738b73fd..fbadc99aa 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_home.h +++ b/cockatrice/src/interface/widgets/tabs/tab_home.h @@ -26,7 +26,7 @@ private: public: TabHome(TabSupervisor *_tabSupervisor, AbstractClient *_client); void retranslateUi() override; - QString getTabText() const override + [[nodiscard]] QString getTabText() const override { return tr("Home"); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.h b/cockatrice/src/interface/widgets/tabs/tab_message.h index 098089e46..36a0b5f78 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_message.h +++ b/cockatrice/src/interface/widgets/tabs/tab_message.h @@ -54,8 +54,8 @@ public: ~TabMessage() override; void retranslateUi() override; void tabActivated() override; - QString getUserName() const; - QString getTabText() const override; + [[nodiscard]] QString getUserName() const; + [[nodiscard]] QString getTabText() const override; void processUserMessageEvent(const Event_UserMessage &event); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h index 9b828fa3d..a4ea3633b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h @@ -30,12 +30,12 @@ public: * @param tagName The name of the tag to display. */ explicit DeckPreviewTagDisplayWidget(QWidget *parent = nullptr, const QString &tagName = ""); - QSize sizeHint() const override; - QString getTagName() const + [[nodiscard]] QSize sizeHint() const override; + [[nodiscard]] QString getTagName() const { return tagName; } - TagState getState() const + [[nodiscard]] TagState getState() const { return state; } diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h index ab1d51a49..3ff78f38c 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.h +++ b/libcockatrice_card/libcockatrice/card/card_info.h @@ -159,7 +159,7 @@ public: * * @return Shared pointer to the cloned CardInfo. */ - CardInfoPtr clone() const + [[nodiscard]] CardInfoPtr clone() const { auto newCardInfo = CardInfoPtr(new CardInfo(*this)); newCardInfo->setSmartPointer(newCardInfo); // Set the smart pointer for the new instance @@ -179,11 +179,11 @@ public: } /** @name Basic Properties Accessors */ //@{ - inline const QString &getName() const + [[nodiscard]] inline const QString &getName() const { return name; } - const QString &getSimpleName() const + [[nodiscard]] const QString &getSimpleName() const { return simpleName; } @@ -191,7 +191,7 @@ public: { return altNames; }; - const QString &getText() const + [[nodiscard]] const QString &getText() const { return text; } @@ -200,15 +200,15 @@ public: text = _text; emit cardInfoChanged(smartThis); } - bool getIsToken() const + [[nodiscard]] bool getIsToken() const { return isToken; } - QStringList getProperties() const + [[nodiscard]] QStringList getProperties() const { return properties.keys(); } - QString getProperty(const QString &propertyName) const + [[nodiscard]] QString getProperty(const QString &propertyName) const { return properties.value(propertyName).toString(); } @@ -217,34 +217,34 @@ public: properties.insert(_name, _value); emit cardInfoChanged(smartThis); } - bool hasProperty(const QString &propertyName) const + [[nodiscard]] bool hasProperty(const QString &propertyName) const { return properties.contains(propertyName); } - const SetToPrintingsMap &getSets() const + [[nodiscard]] const SetToPrintingsMap &getSets() const { return setsToPrintings; } - const QString &getSetsNames() const + [[nodiscard]] const QString &getSetsNames() const { return setsNames; } //@} /** @name Related Cards Accessors */ //@{ - const QList &getRelatedCards() const + [[nodiscard]] const QList &getRelatedCards() const { return relatedCards; } - const QList &getReverseRelatedCards() const + [[nodiscard]] const QList &getReverseRelatedCards() const { return reverseRelatedCards; } - const QList &getReverseRelatedCards2Me() const + [[nodiscard]] const QList &getReverseRelatedCards2Me() const { return reverseRelatedCardsToMe; } - QList getAllRelatedCards() const + [[nodiscard]] QList getAllRelatedCards() const { QList result; result.append(getRelatedCards()); @@ -259,24 +259,24 @@ public: //@} /** @name UI Positioning */ //@{ - const UiAttributes &getUiAttributes() const + [[nodiscard]] const UiAttributes &getUiAttributes() const { return uiAttributes; } //@} - const QChar getColorChar() const; + [[nodiscard]] const QChar getColorChar() const; /** @name Legacy/Convenience Property Accessors */ //@{ - const QString getCardType() const; + [[nodiscard]] const QString getCardType() const; void setCardType(const QString &value); - const QString getCmc() const; - const QString getColors() const; + [[nodiscard]] const QString getCmc() const; + [[nodiscard]] const QString getColors() const; void setColors(const QString &value); - const QString getLoyalty() const; - const QString getMainCardType() const; - const QString getManaCost() const; - const QString getPowTough() const; + [[nodiscard]] const QString getLoyalty() const; + [[nodiscard]] const QString getMainCardType() const; + [[nodiscard]] const QString getManaCost() const; + [[nodiscard]] const QString getPowTough() const; void setPowTough(const QString &value); //@} @@ -287,7 +287,7 @@ public: * * @return Corrected card name as a QString. */ - QString getCorrectedName() const; + [[nodiscard]] QString getCorrectedName() const; /** * @brief Adds a printing to a specific set. diff --git a/libcockatrice_card/libcockatrice/card/card_info_comparator.h b/libcockatrice_card/libcockatrice/card/card_info_comparator.h index bafc303a5..2b101701c 100644 --- a/libcockatrice_card/libcockatrice/card/card_info_comparator.h +++ b/libcockatrice_card/libcockatrice/card/card_info_comparator.h @@ -23,8 +23,8 @@ private: QStringList m_properties; // List of properties to sort by Qt::SortOrder m_order; - QVariant getProperty(const CardInfoPtr &card, const QString &property) const; - bool compareVariants(const QVariant &a, const QVariant &b) const; + [[nodiscard]] QVariant getProperty(const CardInfoPtr &card, const QString &property) const; + [[nodiscard]] bool compareVariants(const QVariant &a, const QVariant &b) const; }; #endif // CARD_INFO_COMPARATOR_H diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h index db1376ac7..631ba685f 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.h @@ -110,7 +110,7 @@ private: * @brief Collects custom card database paths recursively. * @return Sorted list of file paths to custom databases. */ - QStringList collectCustomDatabasePaths() const; + [[nodiscard]] QStringList collectCustomDatabasePaths() const; private: CardDatabase *database; /**< Non-owning pointer to the target CardDatabase. */ diff --git a/libcockatrice_card/libcockatrice/card/printing/printing_info.h b/libcockatrice_card/libcockatrice/card/printing/printing_info.h index 4329ca2f4..e0978bd55 100644 --- a/libcockatrice_card/libcockatrice/card/printing/printing_info.h +++ b/libcockatrice_card/libcockatrice/card/printing/printing_info.h @@ -65,7 +65,7 @@ public: * * @return Pointer to the associated CardSet. */ - CardSetPtr getSet() const + [[nodiscard]] CardSetPtr getSet() const { return set; } @@ -75,7 +75,7 @@ public: * * @return List of keys stored in the properties map. */ - QStringList getProperties() const + [[nodiscard]] QStringList getProperties() const { return properties.keys(); } @@ -86,7 +86,7 @@ public: * @param propertyName The key name of the property to query. * @return The property value as a string, or an empty string if not set. */ - QString getProperty(const QString &propertyName) const + [[nodiscard]] QString getProperty(const QString &propertyName) const { return properties.value(propertyName).toString(); } @@ -109,14 +109,14 @@ public: * * @return A string representing the providerID. */ - QString getUuid() const; + [[nodiscard]] QString getUuid() const; /** * @brief Returns the flavorName for this printing. * * @return The flavorName, or empty if it isn't present. */ - QString getFlavorName() const; + [[nodiscard]] QString getFlavorName() const; }; #endif // COCKATRICE_PRINTING_INFO_H diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.h b/libcockatrice_card/libcockatrice/card/set/card_set.h index 5fc769bb6..fe4b66522 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.h +++ b/libcockatrice_card/libcockatrice/card/set/card_set.h @@ -105,34 +105,34 @@ public: * * @return Sanitized short name. */ - QString getCorrectedShortName() const; + [[nodiscard]] QString getCorrectedShortName() const; /// @return Short identifier of the set. - QString getShortName() const + [[nodiscard]] QString getShortName() const { return shortName; } /// @return Descriptive name of the set. - QString getLongName() const + [[nodiscard]] QString getLongName() const { return longName; } /// @return Type/category string of the set. - QString getSetType() const + [[nodiscard]] QString getSetType() const { return setType; } /// @return Release date of the set. - QDate getReleaseDate() const + [[nodiscard]] QDate getReleaseDate() const { return releaseDate; } /// @return Priority level of the set. - Priority getPriority() const + [[nodiscard]] Priority getPriority() const { return priority; } @@ -182,7 +182,7 @@ public: void loadSetOptions(); /// @return The sort key assigned to this set. - int getSortKey() const + [[nodiscard]] int getSortKey() const { return sortKey; } @@ -194,7 +194,7 @@ public: void setSortKey(unsigned int _sortKey); /// @return True if the set is enabled. - bool getEnabled() const + [[nodiscard]] bool getEnabled() const { return enabled; } @@ -206,7 +206,7 @@ public: void setEnabled(bool _enabled); /// @return True if the set is considered known. - bool getIsKnown() const + [[nodiscard]] bool getIsKnown() const { return isknown; } @@ -222,7 +222,7 @@ public: * * @return True if the long name, type, and release date are all empty. */ - bool getIsKnownIgnored() const + [[nodiscard]] bool getIsKnownIgnored() const { return longName.length() + setType.length() + releaseDate.toString().length() == 0; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h index 6d61ed970..c2fe038e6 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_card_node.h @@ -91,7 +91,7 @@ public: explicit DecklistCardNode(DecklistCardNode *other, InnerDecklistNode *_parent); /// @return The quantity of this card. - int getNumber() const override + [[nodiscard]] int getNumber() const override { return number; } @@ -103,7 +103,7 @@ public: } /// @return The display name of this card. - QString getName() const override + [[nodiscard]] QString getName() const override { return name; } @@ -115,7 +115,7 @@ public: } /// @return The provider identifier for this card. - QString getCardProviderId() const override + [[nodiscard]] QString getCardProviderId() const override { return cardProviderId; } @@ -127,7 +127,7 @@ public: } /// @return The short set code (e.g., "NEO"). - QString getCardSetShortName() const override + [[nodiscard]] QString getCardSetShortName() const override { return cardSetShortName; } @@ -139,7 +139,7 @@ public: } /// @return The collector number of this card within its set. - QString getCardCollectorNumber() const override + [[nodiscard]] QString getCardCollectorNumber() const override { return cardSetNumber; } @@ -162,7 +162,7 @@ public: * @return A CardRef with the card’s name and provider ID, suitable * for database lookups or comparison with other card sources. */ - CardRef toCardRef() const + [[nodiscard]] CardRef toCardRef() const { return {name, cardProviderId}; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h index f30c0affe..e6bd27e2d 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h @@ -23,12 +23,12 @@ public: void clear(); - bool canUndo() const + [[nodiscard]] bool canUndo() const { return !undoStack.isEmpty(); } - bool canRedo() const + [[nodiscard]] bool canRedo() const { return !redoStack.isEmpty(); } @@ -37,11 +37,11 @@ public: void redo(DeckList *deck); - QStack getRedoStack() const + [[nodiscard]] QStack getRedoStack() const { return redoStack; } - QStack getUndoStack() const + [[nodiscard]] QStack getUndoStack() const { return undoStack; } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h index d2e36b804..6ddf430c5 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_memento.h @@ -11,11 +11,11 @@ public: { } - QString getMemento() const + [[nodiscard]] QString getMemento() const { return memento; } - QString getReason() const + [[nodiscard]] QString getReason() const { return reason; } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h index 58dbf954b..344ae5224 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_card.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h @@ -56,20 +56,20 @@ public: { } - Type type() const + [[nodiscard]] Type type() const { return t; } - const QString &term() const + [[nodiscard]] const QString &term() const { return trm; } - Attr attr() const + [[nodiscard]] Attr attr() const { return a; } - QJsonObject toJson() const; + [[nodiscard]] QJsonObject toJson() const; static CardFilter *fromJson(const QJsonObject &json); static const QString typeName(Type t); static const QString attrName(Attr a); diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h index 4e6cb38bf..8fc41ce68 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h @@ -35,7 +35,7 @@ class FilterString public: FilterString(); explicit FilterString(const QString &exp); - bool check(const CardData &card) const + [[nodiscard]] bool check(const CardData &card) const { if (card.isNull()) { static CardInfoPtr blankCard = CardInfo::newInstance(""); diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h index 350fd2f14..7e0f211ef 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h @@ -24,7 +24,7 @@ public: FilterTreeNode() : enabled(true) { } - virtual bool isEnabled() const + [[nodiscard]] virtual bool isEnabled() const { return enabled; } @@ -38,18 +38,18 @@ public: enabled = false; nodeChanged(); } - virtual FilterTreeNode *parent() const + [[nodiscard]] virtual FilterTreeNode *parent() const { return nullptr; } - virtual FilterTreeNode *nodeAt(int /* i */) const + [[nodiscard]] virtual FilterTreeNode *nodeAt(int /* i */) const { return nullptr; } virtual void deleteAt(int /* i */) { } - virtual int childCount() const + [[nodiscard]] virtual int childCount() const { return 0; } @@ -57,15 +57,15 @@ public: { return -1; } - virtual int index() const + [[nodiscard]] virtual int index() const { return (parent() != nullptr) ? parent()->childIndex(this) : -1; } - virtual const QString text() const + [[nodiscard]] virtual const QString text() const { return QString(""); } - virtual bool isLeaf() const + [[nodiscard]] virtual bool isLeaf() const { return false; } @@ -104,9 +104,9 @@ protected: public: virtual ~FilterTreeBranch(); void removeFiltersByAttr(CardFilter::Attr filterType); - FilterTreeNode *nodeAt(int i) const override; + [[nodiscard]] FilterTreeNode *nodeAt(int i) const override; void deleteAt(int i) override; - int childCount() const override + [[nodiscard]] int childCount() const override { return childNodes.size(); } @@ -127,10 +127,10 @@ public: LogicMap(CardFilter::Attr a, FilterTree *parent) : p(parent), attr(a) { } - const FilterItemList *findTypeList(CardFilter::Type type) const; + [[nodiscard]] const FilterItemList *findTypeList(CardFilter::Type type) const; FilterItemList *typeList(CardFilter::Type type); - FilterTreeNode *parent() const override; - const QString text() const override + [[nodiscard]] FilterTreeNode *parent() const override; + [[nodiscard]] const QString text() const override { return CardFilter::attrName(attr); } @@ -148,25 +148,25 @@ public: FilterItemList(CardFilter::Type t, LogicMap *parent) : p(parent), type(t) { } - CardFilter::Attr attr() const + [[nodiscard]] CardFilter::Attr attr() const { return p->attr; } - FilterTreeNode *parent() const override + [[nodiscard]] FilterTreeNode *parent() const override { return p; } - int termIndex(const QString &term) const; + [[nodiscard]] int termIndex(const QString &term) const; FilterTreeNode *termNode(const QString &term); - const QString text() const override + [[nodiscard]] const QString text() const override { return CardFilter::typeName(type); } - bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const; - bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const; - bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const; - bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const; }; class FilterItem : public FilterTreeNode @@ -182,42 +182,42 @@ public: } virtual ~FilterItem() = default; - CardFilter::Attr attr() const + [[nodiscard]] CardFilter::Attr attr() const { return p->attr(); } - CardFilter::Type type() const + [[nodiscard]] CardFilter::Type type() const { return p->type; } - FilterTreeNode *parent() const override + [[nodiscard]] FilterTreeNode *parent() const override { return p; } - const QString text() const override + [[nodiscard]] const QString text() const override { return term; } - bool isLeaf() const override + [[nodiscard]] bool isLeaf() const override { return true; } - bool acceptName(CardInfoPtr info) const; - bool acceptType(CardInfoPtr info) const; - bool acceptMainType(CardInfoPtr info) const; - bool acceptSubType(CardInfoPtr info) const; - bool acceptColor(CardInfoPtr info) const; - bool acceptText(CardInfoPtr info) const; - bool acceptSet(CardInfoPtr info) const; - bool acceptManaCost(CardInfoPtr info) const; - bool acceptCmc(CardInfoPtr info) const; - bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const; - bool acceptLoyalty(CardInfoPtr info) const; - bool acceptRarity(CardInfoPtr info) const; - bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const; - bool acceptFormat(CardInfoPtr info) const; - bool relationCheck(int cardInfo) const; + [[nodiscard]] bool acceptName(CardInfoPtr info) const; + [[nodiscard]] bool acceptType(CardInfoPtr info) const; + [[nodiscard]] bool acceptMainType(CardInfoPtr info) const; + [[nodiscard]] bool acceptSubType(CardInfoPtr info) const; + [[nodiscard]] bool acceptColor(CardInfoPtr info) const; + [[nodiscard]] bool acceptText(CardInfoPtr info) const; + [[nodiscard]] bool acceptSet(CardInfoPtr info) const; + [[nodiscard]] bool acceptManaCost(CardInfoPtr info) const; + [[nodiscard]] bool acceptCmc(CardInfoPtr info) const; + [[nodiscard]] bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool acceptLoyalty(CardInfoPtr info) const; + [[nodiscard]] bool acceptRarity(CardInfoPtr info) const; + [[nodiscard]] bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool acceptFormat(CardInfoPtr info) const; + [[nodiscard]] bool relationCheck(int cardInfo) const; }; class FilterTree : public QObject, public FilterTreeBranch @@ -265,16 +265,16 @@ public: FilterTreeNode *termNode(CardFilter::Attr attr, CardFilter::Type type, const QString &term); FilterTreeNode *termNode(const CardFilter *f); - const QString text() const override + [[nodiscard]] const QString text() const override { return QString("root"); } - int index() const override + [[nodiscard]] int index() const override { return 0; } - bool acceptsCard(CardInfoPtr info) const; + [[nodiscard]] bool acceptsCard(CardInfoPtr info) const; void removeFiltersByAttr(CardFilter::Attr filterType); void removeFilter(const CardFilter *toRemove); void clear(); diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h index f5e54a6f8..dd55ab789 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_database_path_provider.h @@ -9,10 +9,10 @@ class ICardDatabasePathProvider : public QObject public: virtual ~ICardDatabasePathProvider() = default; - virtual QString getCardDatabasePath() const = 0; - virtual QString getCustomCardDatabasePath() const = 0; - virtual QString getTokenDatabasePath() const = 0; - virtual QString getSpoilerCardDatabasePath() const = 0; + [[nodiscard]] virtual QString getCardDatabasePath() const = 0; + [[nodiscard]] virtual QString getCustomCardDatabasePath() const = 0; + [[nodiscard]] virtual QString getTokenDatabasePath() const = 0; + [[nodiscard]] virtual QString getSpoilerCardDatabasePath() const = 0; signals: void cardDatabasePathChanged(); diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h index 7c0944f29..a6cf941fb 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_card_preference_provider.h @@ -7,8 +7,8 @@ class ICardPreferenceProvider { public: virtual ~ICardPreferenceProvider() = default; - virtual QString getCardPreferenceOverride(const QString &cardName) const = 0; - virtual bool getIncludeRebalancedCards() const = 0; + [[nodiscard]] virtual QString getCardPreferenceOverride(const QString &cardName) const = 0; + [[nodiscard]] virtual bool getIncludeRebalancedCards() const = 0; }; #endif // COCKATRICE_INTERFACE_CARD_PREFERENCE_PROVIDER_H diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h index fb3ab0cc3..bacd7a2bb 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_database_path_provider.h @@ -5,19 +5,19 @@ class NoopCardDatabasePathProvider : public ICardDatabasePathProvider { public: - QString getCardDatabasePath() const override + [[nodiscard]] QString getCardDatabasePath() const override { return ""; } - QString getCustomCardDatabasePath() const override + [[nodiscard]] QString getCustomCardDatabasePath() const override { return ""; } - QString getTokenDatabasePath() const override + [[nodiscard]] QString getTokenDatabasePath() const override { return ""; } - QString getSpoilerCardDatabasePath() const override + [[nodiscard]] QString getSpoilerCardDatabasePath() const override { return ""; } diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h index 9fc7e5bb4..3781f4b63 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/noop_card_preference_provider.h @@ -5,12 +5,12 @@ class NoopCardPreferenceProvider : public ICardPreferenceProvider { public: - QString getCardPreferenceOverride(const QString &) const override + [[nodiscard]] QString getCardPreferenceOverride(const QString &) const override { return {}; } - bool getIncludeRebalancedCards() const override + [[nodiscard]] bool getIncludeRebalancedCards() const override { return true; } diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h index 7a4626059..afb6f1fcf 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h @@ -16,7 +16,7 @@ public: explicit CardCompleterProxyModel(QObject *parent = nullptr); protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; }; #endif // CARD_COMPLETER_PROXY_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h index 98d66cb5e..18be2c55a 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h @@ -17,8 +17,8 @@ class CardSearchModel : public QAbstractListModel public: explicit CardSearchModel(CardDatabaseDisplayModel *sourceModel, QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; void updateSearchResults(const QString &query); // Update results based on input diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h index 467b7f0a5..e7abb2642 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h @@ -77,17 +77,17 @@ public: dirtyTimer.start(20); } void clearFilterAll(); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - bool canFetchMore(const QModelIndex &parent) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] bool canFetchMore(const QModelIndex &parent) const override; void fetchMore(const QModelIndex &parent) override; signals: void modelDirty(); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; + [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; static int lessThanNumerically(const QString &left, const QString &right); - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; - bool rowMatchesCardName(CardInfoPtr info) const; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool rowMatchesCardName(CardInfoPtr info) const; private slots: void filterTreeChanged(); diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h index 7c48c4e6d..218cfff92 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h @@ -31,15 +31,16 @@ public: }; CardDatabaseModel(CardDatabase *_db, bool _showOnlyCardsFromEnabledSets, QObject *parent = nullptr); ~CardDatabaseModel() override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - CardDatabase *getDatabase() const + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int columnCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] CardDatabase *getDatabase() const { return db; } - CardInfoPtr getCard(int index) const + [[nodiscard]] CardInfoPtr getCard(int index) const { return cardList[index]; } diff --git a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h index 6f5911b6e..0ffc5a847 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h @@ -25,11 +25,11 @@ public: SetsMimeData(int _oldRow) : oldRow(_oldRow) { } - int getOldRow() const + [[nodiscard]] int getOldRow() const { return oldRow; } - QStringList formats() const + [[nodiscard]] QStringList formats() const { return QStringList() << "application/x-cockatricecardset"; } @@ -64,22 +64,23 @@ public: explicit SetsModel(CardDatabase *_db, QObject *parent = nullptr); ~SetsModel() override; - int rowCount(const QModelIndex &parent = QModelIndex()) const override; - int columnCount(const QModelIndex &parent = QModelIndex()) const override + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int columnCount(const QModelIndex &parent = QModelIndex()) const override { Q_UNUSED(parent); return NUM_COLS; } - QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const override; - Qt::DropActions supportedDropActions() const override; + [[nodiscard]] QVariant + headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override; + [[nodiscard]] Qt::DropActions supportedDropActions() const override; - QMimeData *mimeData(const QModelIndexList &indexes) const override; + [[nodiscard]] QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; - QStringList mimeTypes() const override; + [[nodiscard]] QStringList mimeTypes() const override; void swapRows(int oldRow, int newRow); void toggleRow(int row, bool enable); void toggleRow(int row); @@ -97,8 +98,8 @@ public: explicit SetsDisplayModel(QObject *parent = nullptr); protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; void fetchMore(const QModelIndex &index) override; }; diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h index 5d3b63a36..f6b2fdfbb 100644 --- a/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h @@ -14,10 +14,10 @@ class TokenDisplayModel : public CardDatabaseDisplayModel Q_OBJECT public: explicit TokenDisplayModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; }; #endif // COCKATRICE_TOKEN_DISPLAY_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h index 50c7eb642..5e5843761 100644 --- a/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h +++ b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h @@ -14,10 +14,10 @@ class TokenEditModel : public CardDatabaseDisplayModel Q_OBJECT public: explicit TokenEditModel(QObject *parent = nullptr); - int rowCount(const QModelIndex &parent = QModelIndex()) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; protected: - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; + [[nodiscard]] bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; }; #endif // COCKATRICE_TOKEN_EDIT_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h index 8beabd4ba..08a4592ae 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -101,7 +101,7 @@ public: : AbstractDecklistCardNode(_parent, position), dataNode(_dataNode) { } - int getNumber() const override + [[nodiscard]] int getNumber() const override { return dataNode->getNumber(); } @@ -109,7 +109,7 @@ public: { dataNode->setNumber(_number); } - QString getName() const override + [[nodiscard]] QString getName() const override { return dataNode->getName(); } @@ -117,7 +117,7 @@ public: { dataNode->setName(_name); } - QString getCardProviderId() const override + [[nodiscard]] QString getCardProviderId() const override { return dataNode->getCardProviderId(); } @@ -125,7 +125,7 @@ public: { dataNode->setCardProviderId(_cardProviderId); } - QString getCardSetShortName() const override + [[nodiscard]] QString getCardSetShortName() const override { return dataNode->getCardSetShortName(); } @@ -133,7 +133,7 @@ public: { dataNode->setCardSetShortName(_cardSetShortName); } - QString getCardCollectorNumber() const override + [[nodiscard]] QString getCardCollectorNumber() const override { return dataNode->getCardCollectorNumber(); } @@ -146,7 +146,7 @@ public: * @brief Returns the underlying data node. * @return Pointer to the DecklistCardNode wrapped by this node. */ - DecklistCardNode *getDataNode() const + [[nodiscard]] DecklistCardNode *getDataNode() const { return dataNode; } @@ -200,7 +200,7 @@ public: * @brief Returns the root index of the model. * @return QModelIndex representing the root node. */ - QModelIndex getRoot() const + [[nodiscard]] QModelIndex getRoot() const { return nodeToIndex(root); }; @@ -210,17 +210,17 @@ public: * @param info Pointer to card information. * @return String representing the value of the current grouping criteria for the card. */ - QString getGroupCriteriaForCard(CardInfoPtr info) const; + [[nodiscard]] QString getGroupCriteriaForCard(CardInfoPtr info) const; // Qt model overrides - int rowCount(const QModelIndex &parent) const override; - int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role) const override; + [[nodiscard]] int rowCount(const QModelIndex &parent) const override; + [[nodiscard]] int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const override; + [[nodiscard]] QVariant data(const QModelIndex &index, int role) const override; void emitBackgroundUpdates(const QModelIndex &parent); - QVariant headerData(int section, Qt::Orientation orientation, int role) const override; - QModelIndex index(int row, int column, const QModelIndex &parent) const override; - QModelIndex parent(const QModelIndex &index) const override; - Qt::ItemFlags flags(const QModelIndex &index) const override; + [[nodiscard]] QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent) const override; + [[nodiscard]] QModelIndex parent(const QModelIndex &index) const override; + [[nodiscard]] Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, int role) override; bool removeRows(int row, int count, const QModelIndex &parent) override; @@ -232,8 +232,8 @@ public: * @param cardNumber Optional collector number. * @return QModelIndex of the card, or invalid index if not found. */ - QModelIndex findCard(const QString &cardName, - const QString &zoneName, + [[nodiscard]] QModelIndex findCard(const QString &cardName, + const QString &zoneName, const QString &providerId = "", const QString &cardNumber = "") const; @@ -269,15 +269,15 @@ public: * @brief Removes all cards and resets the model. */ void cleanList(); - DeckList *getDeckList() const + [[nodiscard]] DeckList *getDeckList() const { return deckList; } void setDeckList(DeckList *_deck); - QList getCards() const; - QList getCardsForZone(const QString &zoneName) const; - QList *getZones() const; + [[nodiscard]] QList getCards() const; + [[nodiscard]] QList getCardsForZone(const QString &zoneName) const; + [[nodiscard]] QList *getZones() const; /** * @brief Sets the criteria used to group cards in the model. @@ -294,8 +294,8 @@ private: InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent); QModelIndex nodeToIndex(AbstractDecklistNode *node) const; - DecklistModelCardNode *findCardNode(const QString &cardName, - const QString &zoneName, + [[nodiscard]] DecklistModelCardNode *findCardNode(const QString &cardName, + const QString &zoneName, const QString &providerId = "", const QString &cardNumber = "") const; void emitRecursiveUpdates(const QModelIndex &index); diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h index 0603beace..94742795d 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h @@ -25,7 +25,7 @@ public: } protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; + [[nodiscard]] bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; private: QStringList sortCriteria; diff --git a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h index ffd45b9d7..903e6ef1a 100644 --- a/libcockatrice_rng/libcockatrice/rng/rng_abstract.h +++ b/libcockatrice_rng/libcockatrice/rng/rng_abstract.h @@ -13,7 +13,7 @@ public: } virtual unsigned int rand(int min, int max) = 0; QVector makeNumbersVector(int n, int min, int max); - double testRandom(const QVector &numbers) const; + [[nodiscard]] double testRandom(const QVector &numbers) const; }; extern RNG_Abstract *rng; diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h index d62fea03d..45e9b7441 100644 --- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h @@ -57,7 +57,7 @@ private: explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr); GameFiltersSettings(const GameFiltersSettings & /*other*/); - QString hashGameType(const QString &gameType) const; + [[nodiscard]] QString hashGameType(const QString &gameType) const; }; #endif // GAMEFILTERSSETTINGS_H