From 22a5e2094c9edd75b20424a93c7bd578b6925c90 Mon Sep 17 00:00:00 2001 From: Ronan Le Tiec Date: Sat, 23 May 2020 15:44:44 +0200 Subject: [PATCH] Refactoring VPuzzleSettings --- src/app/puzzle/puzzle.pri | 4 ++-- src/app/puzzle/vpapplication.cpp | 8 ++++---- src/app/puzzle/vpapplication.h | 4 ++-- src/app/puzzle/vpmainwindow.cpp | 4 ++-- .../{vpuzzlesettings.cpp => vpsettings.cpp} | 20 +++++++++---------- .../{vpuzzlesettings.h => vpsettings.h} | 16 +++++++-------- 6 files changed, 28 insertions(+), 28 deletions(-) rename src/app/puzzle/{vpuzzlesettings.cpp => vpsettings.cpp} (81%) rename src/app/puzzle/{vpuzzlesettings.h => vpsettings.h} (80%) diff --git a/src/app/puzzle/puzzle.pri b/src/app/puzzle/puzzle.pri index 94b394f38..f1ad4bdf2 100644 --- a/src/app/puzzle/puzzle.pri +++ b/src/app/puzzle/puzzle.pri @@ -19,7 +19,7 @@ SOURCES += \ $$PWD/vpmimedatapiece.cpp \ $$PWD/vppiece.cpp \ $$PWD/vppiecelist.cpp \ - $$PWD/vpuzzlesettings.cpp \ + $$PWD/vpsettings.cpp \ $$PWD/xml/vplayoutfilereader.cpp \ $$PWD/xml/vplayoutfilewriter.cpp \ $$PWD/xml/vplayoutliterals.cpp @@ -43,8 +43,8 @@ HEADERS += \ $$PWD/vpmimedatapiece.h \ $$PWD/vppiece.h \ $$PWD/vppiecelist.h \ + $$PWD/vpsettings.h \ $$PWD/vpstable.h \ - $$PWD/vpuzzlesettings.h \ $$PWD/xml/vplayoutfilereader.h \ $$PWD/xml/vplayoutfilewriter.h \ $$PWD/xml/vplayoutliterals.h diff --git a/src/app/puzzle/vpapplication.cpp b/src/app/puzzle/vpapplication.cpp index 0c492e3d9..afd0a559d 100644 --- a/src/app/puzzle/vpapplication.cpp +++ b/src/app/puzzle/vpapplication.cpp @@ -405,21 +405,21 @@ const VTranslateVars *VPApplication::TrVars() //--------------------------------------------------------------------------------------------------------------------- void VPApplication::OpenSettings() { - settings = new VPuzzleSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), + settings = new VPSettings(QSettings::IniFormat, QSettings::UserScope, QCoreApplication::organizationName(), QCoreApplication::applicationName(), this); } //--------------------------------------------------------------------------------------------------------------------- -VPuzzleSettings *VPApplication::PuzzleSettings() +VPSettings *VPApplication::PuzzleSettings() { SCASSERT(settings != nullptr) - return qobject_cast(settings); + return qobject_cast(settings); } //--------------------------------------------------------------------------------------------------------------------- void VPApplication::ActivateDarkMode() { - VPuzzleSettings *settings = qApp->PuzzleSettings(); + VPSettings *settings = qApp->PuzzleSettings(); if (settings->GetDarkMode()) { QFile f(":qdarkstyle/style.qss"); diff --git a/src/app/puzzle/vpapplication.h b/src/app/puzzle/vpapplication.h index 94fe99786..bc0ca4b6e 100644 --- a/src/app/puzzle/vpapplication.h +++ b/src/app/puzzle/vpapplication.h @@ -29,7 +29,7 @@ #define VPAPPLICATION_H #include "../vmisc/def.h" -#include "vpuzzlesettings.h" +#include "vpsettings.h" #include "../vmisc/vabstractapplication.h" #include "vpcommandline.h" @@ -65,7 +65,7 @@ public: virtual const VTranslateVars *TrVars() override; virtual void OpenSettings() override; - VPuzzleSettings *PuzzleSettings(); + VPSettings *PuzzleSettings(); void ActivateDarkMode(); void ParseCommandLine(const SocketConnection &connection, const QStringList &arguments); diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp index 3b39815f3..e9afa30f4 100644 --- a/src/app/puzzle/vpmainwindow.cpp +++ b/src/app/puzzle/vpmainwindow.cpp @@ -463,7 +463,7 @@ void VPMainWindow::SetCheckBoxValue(QCheckBox *checkbox, bool value) void VPMainWindow::ReadSettings() { qCDebug(pWindow, "Reading settings."); - const VPuzzleSettings *settings = qApp->PuzzleSettings(); + const VPSettings *settings = qApp->PuzzleSettings(); if (settings->status() == QSettings::NoError) { @@ -489,7 +489,7 @@ void VPMainWindow::ReadSettings() //--------------------------------------------------------------------------------------------------------------------- void VPMainWindow::WriteSettings() { - VPuzzleSettings *settings = qApp->PuzzleSettings(); + VPSettings *settings = qApp->PuzzleSettings(); settings->SetGeometry(saveGeometry()); settings->SetWindowState(saveState()); settings->SetToolbarsState(saveState(APP_VERSION)); diff --git a/src/app/puzzle/vpuzzlesettings.cpp b/src/app/puzzle/vpsettings.cpp similarity index 81% rename from src/app/puzzle/vpuzzlesettings.cpp rename to src/app/puzzle/vpsettings.cpp index 6d4ad24d0..4d7360762 100644 --- a/src/app/puzzle/vpuzzlesettings.cpp +++ b/src/app/puzzle/vpsettings.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlesettings.cpp + ** @file vpsettings.cpp ** @author Roman Telezhynskyi ** @date 16 2, 2020 ** @@ -25,7 +25,7 @@ ** along with Valentina. If not, see . ** *************************************************************************/ -#include "vpuzzlesettings.h" +#include "vpsettings.h" namespace { @@ -34,48 +34,48 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingDockPropertiesContentsActive, (Q } //--------------------------------------------------------------------------------------------------------------------- -VPuzzleSettings::VPuzzleSettings(Format format, Scope scope, const QString &organization, const QString &application, +VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application, QObject *parent) : VCommonSettings(format, scope, organization, application, parent) {} //--------------------------------------------------------------------------------------------------------------------- -VPuzzleSettings::VPuzzleSettings(const QString &fileName, QSettings::Format format, QObject *parent) +VPSettings::VPSettings(const QString &fileName, QSettings::Format format, QObject *parent) : VCommonSettings(fileName, format, parent) {} //--------------------------------------------------------------------------------------------------------------------- -bool VPuzzleSettings::IsDockWidgetPropertiesActive() const +bool VPSettings::IsDockWidgetPropertiesActive() const { return value(*settingDockWidgetPropertiesActive, GetDefDockWidgetPropertiesActive()).toBool(); } //--------------------------------------------------------------------------------------------------------------------- -bool VPuzzleSettings::GetDefDockWidgetPropertiesActive() +bool VPSettings::GetDefDockWidgetPropertiesActive() { return true; } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleSettings::SetDockWidgetPropertiesActive(bool value) +void VPSettings::SetDockWidgetPropertiesActive(bool value) { setValue(*settingDockWidgetPropertiesActive, value); } //--------------------------------------------------------------------------------------------------------------------- -bool VPuzzleSettings::IsDockWidgetPropertiesContentsActive() const +bool VPSettings::IsDockWidgetPropertiesContentsActive() const { return value(*settingDockWidgetPropertiesActive, GetDefDockWidgetPropertiesActive()).toBool(); } //--------------------------------------------------------------------------------------------------------------------- -bool VPuzzleSettings::GetDefDockWidgetPropertiesContentsActive() +bool VPSettings::GetDefDockWidgetPropertiesContentsActive() { return true; } //--------------------------------------------------------------------------------------------------------------------- -void VPuzzleSettings::SetDockWidgetPropertiesContentsActive(bool value) +void VPSettings::SetDockWidgetPropertiesContentsActive(bool value) { setValue(*settingDockPropertiesContentsActive, value); } diff --git a/src/app/puzzle/vpuzzlesettings.h b/src/app/puzzle/vpsettings.h similarity index 80% rename from src/app/puzzle/vpuzzlesettings.h rename to src/app/puzzle/vpsettings.h index 97906df41..6d822042d 100644 --- a/src/app/puzzle/vpuzzlesettings.h +++ b/src/app/puzzle/vpsettings.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vpuzzlesettings.h + ** @file vpsettings.h ** @author Roman Telezhynskyi ** @date 16 2, 2020 ** @@ -25,20 +25,20 @@ ** along with Valentina. If not, see . ** *************************************************************************/ -#ifndef VPUZZLESETTINGS_H -#define VPUZZLESETTINGS_H +#ifndef VPSETTINGS_H +#define VPSETTINGS_H #include #include "vcommonsettings.h" -class VPuzzleSettings : public VCommonSettings +class VPSettings : public VCommonSettings { Q_OBJECT public: - VPuzzleSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(), + VPSettings(Format format, Scope scope, const QString &organization, const QString &application = QString(), QObject *parent = nullptr); - VPuzzleSettings(const QString &fileName, Format format, QObject *parent = nullptr); + VPSettings(const QString &fileName, Format format, QObject *parent = nullptr); bool IsDockWidgetPropertiesActive() const; static bool GetDefDockWidgetPropertiesActive(); @@ -49,7 +49,7 @@ public: void SetDockWidgetPropertiesContentsActive(bool value); private: - Q_DISABLE_COPY(VPuzzleSettings) + Q_DISABLE_COPY(VPSettings) }; -#endif // VPUZZLESETTINGS_H +#endif // VPSETTINGS_H