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

Lint.

Browse source
This commit is contained in:
Lukas Brübach 2026-07-02 00:00:00 -04:00
parent 21f57b1acb
commit b5b6e2b49c
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,7 +10,6 @@
#include "../../interface/card_picture_loader/card_picture_loader_cache_method.h" #include "../../interface/card_picture_loader/card_picture_loader_cache_method.h"
#include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h" #include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h"
#include "shortcuts_settings.h" #include "shortcuts_settings.h"
#include <libcockatrice/settings/path_settings.h>
#include <QDate> #include <QDate>
#include <QLoggingCategory> #include <QLoggingCategory>
@ -25,6 +24,7 @@
#include <libcockatrice/settings/game_filters_settings.h> #include <libcockatrice/settings/game_filters_settings.h>
#include <libcockatrice/settings/layouts_settings.h> #include <libcockatrice/settings/layouts_settings.h>
#include <libcockatrice/settings/message_settings.h> #include <libcockatrice/settings/message_settings.h>
#include <libcockatrice/settings/path_settings.h>
#include <libcockatrice/settings/recents_settings.h> #include <libcockatrice/settings/recents_settings.h>
#include <libcockatrice/settings/servers_settings.h> #include <libcockatrice/settings/servers_settings.h>
#include <libcockatrice/utility/macros.h> #include <libcockatrice/utility/macros.h>

6
cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
View file

@ -205,7 +205,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
} }
} }
if (!QDir(SettingsCache::instance().paths().getDeckPath()).exists() || SettingsCache::instance().paths().getDeckPath().isEmpty()) { if (!QDir(SettingsCache::instance().paths().getDeckPath()).exists() ||
SettingsCache::instance().paths().getDeckPath().isEmpty()) {
//! \todo Prompt to create the deck directory. //! \todo Prompt to create the deck directory.
if (QMessageBox::critical( if (QMessageBox::critical(
this, tr("Error"), this, tr("Error"),
@ -216,7 +217,8 @@ void DlgSettings::closeEvent(QCloseEvent *event)
} }
} }
if (!QDir(SettingsCache::instance().paths().getPicsPath()).exists() || SettingsCache::instance().paths().getPicsPath().isEmpty()) { if (!QDir(SettingsCache::instance().paths().getPicsPath()).exists() ||
SettingsCache::instance().paths().getPicsPath().isEmpty()) {
//! \todo Prompt to create the pictures directory. //! \todo Prompt to create the pictures directory.
if (QMessageBox::critical(this, tr("Error"), if (QMessageBox::critical(this, tr("Error"),
tr("The path to your card pictures directory is invalid. Would you like to go back " tr("The path to your card pictures directory is invalid. Would you like to go back "

4
cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
View file

@ -142,8 +142,8 @@ void VisualDeckStorageWidget::reapplySortAndFilters()
void VisualDeckStorageWidget::createRootFolderWidget() void VisualDeckStorageWidget::createRootFolderWidget()
{ {
folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().paths().getDeckPath(), false, folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().paths().getDeckPath(),
quickSettingsWidget->getShowFolders()); false, quickSettingsWidget->getShowFolders());
scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget
scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width()); scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width());

7
libcockatrice_settings/libcockatrice/settings/path_settings.h
View file

@ -8,10 +8,10 @@
//! \todo Document this file. //! \todo Document this file.
#include "settings_manager.h" #include "settings_manager.h"
#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QString> #include <QString>
#include <libcockatrice/interfaces/interface_card_database_path_provider.h>
inline Q_LOGGING_CATEGORY(PathSettingsLog, "path_settings"); inline Q_LOGGING_CATEGORY(PathSettingsLog, "path_settings");
@ -26,7 +26,7 @@ class PathSettings : public SettingsManager, public ICardDatabasePathProvider
{ {
Q_OBJECT Q_OBJECT
signals: signals:
void cardDatabasePathChanged(); void cardDatabasePathChanged();
public: public:
@ -108,5 +108,4 @@ private:
void recomputeCustomPicsPath(); void recomputeCustomPicsPath();
}; };
#endif // COCKATRICE_PATH_SETTINGS_H
#endif //COCKATRICE_PATH_SETTINGS_H