diff --git a/cockatrice/src/client/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h index 94cbb6adf..af509a927 100644 --- a/cockatrice/src/client/settings/cache_settings.h +++ b/cockatrice/src/client/settings/cache_settings.h @@ -10,7 +10,6 @@ #include "../../interface/card_picture_loader/card_picture_loader_cache_method.h" #include "../../interface/card_picture_loader/card_picture_loader_local_schemes.h" #include "shortcuts_settings.h" -#include #include #include @@ -25,6 +24,7 @@ #include #include #include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp index d09b40958..72514a87d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp @@ -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. if (QMessageBox::critical( 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. if (QMessageBox::critical(this, tr("Error"), tr("The path to your card pictures directory is invalid. Would you like to go back " diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index c03525af8..29e19781b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -142,8 +142,8 @@ void VisualDeckStorageWidget::reapplySortAndFilters() void VisualDeckStorageWidget::createRootFolderWidget() { - folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().paths().getDeckPath(), false, - quickSettingsWidget->getShowFolders()); + folderWidget = new VisualDeckStorageFolderDisplayWidget(this, this, SettingsCache::instance().paths().getDeckPath(), + false, quickSettingsWidget->getShowFolders()); scrollArea->setWidget(folderWidget); // this automatically destroys the old folderWidget scrollArea->widget()->setMaximumWidth(scrollArea->viewport()->width()); diff --git a/libcockatrice_settings/libcockatrice/settings/path_settings.h b/libcockatrice_settings/libcockatrice/settings/path_settings.h index cbb349ab9..049efe14a 100644 --- a/libcockatrice_settings/libcockatrice/settings/path_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/path_settings.h @@ -8,10 +8,10 @@ //! \todo Document this file. #include "settings_manager.h" -#include #include #include +#include inline Q_LOGGING_CATEGORY(PathSettingsLog, "path_settings"); @@ -26,7 +26,7 @@ class PathSettings : public SettingsManager, public ICardDatabasePathProvider { Q_OBJECT - signals: +signals: void cardDatabasePathChanged(); public: @@ -108,5 +108,4 @@ private: void recomputeCustomPicsPath(); }; - -#endif //COCKATRICE_PATH_SETTINGS_H +#endif // COCKATRICE_PATH_SETTINGS_H