diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp index ff3ad7fd..8b84f947 100644 --- a/src/utils/confighandler.cpp +++ b/src/utils/confighandler.cpp @@ -16,17 +16,15 @@ // along with Flameshot. If not, see . #include "confighandler.h" -#include -ConfigHandler::ConfigHandler(QObject *parent) : QObject(parent) { - m_settings = new QSettings(this); +ConfigHandler::ConfigHandler(){ } QList ConfigHandler::getButtons() { - QList buttons = m_settings->value("buttons").value >(); + QList buttons = m_settings.value("buttons").value >(); bool modified = normalizeButtons(buttons); if (modified) { - m_settings->setValue("buttons", QVariant::fromValue(buttons)); + m_settings.setValue("buttons", QVariant::fromValue(buttons)); } return fromIntToButton(buttons); } @@ -34,83 +32,83 @@ QList ConfigHandler::getButtons() { void ConfigHandler::setButtons(const QList &buttons) { QList l = fromButtonToInt(buttons); normalizeButtons(l); - m_settings->setValue("buttons", QVariant::fromValue(l)); + m_settings.setValue("buttons", QVariant::fromValue(l)); } QString ConfigHandler::savePathValue() { - return m_settings->value("savePath").toString(); + return m_settings.value("savePath").toString(); } void ConfigHandler::setSavePath(const QString &savePath) { - m_settings->setValue("savePath", savePath); + m_settings.setValue("savePath", savePath); } QColor ConfigHandler::uiMainColorValue() { - return m_settings->value("uiColor").value(); + return m_settings.value("uiColor").value(); } void ConfigHandler::setUIMainColor(const QColor &c) { - m_settings->setValue("uiColor", c); + m_settings.setValue("uiColor", c); } QColor ConfigHandler::uiContrastColorValue() { - return m_settings->value("contastUiColor").value(); + return m_settings.value("contastUiColor").value(); } void ConfigHandler::setUIContrastColor(const QColor &c) { - m_settings->setValue("contastUiColor", c); + m_settings.setValue("contastUiColor", c); } QColor ConfigHandler::drawColorValue() { - return m_settings->value("drawColor").value(); + return m_settings.value("drawColor").value(); } void ConfigHandler::setDrawColor(const QColor &c) { - m_settings->setValue("drawColor", c); + m_settings.setValue("drawColor", c); } bool ConfigHandler::showHelpValue() { - return m_settings->value("showHelp").toBool(); + return m_settings.value("showHelp").toBool(); } void ConfigHandler::setShowHelp(const bool showHelp) { - m_settings->setValue("showHelp", showHelp); + m_settings.setValue("showHelp", showHelp); } bool ConfigHandler::desktopNotificationValue() { - return m_settings->value("showDesktopNotification").toBool(); + return m_settings.value("showDesktopNotification").toBool(); } void ConfigHandler::setDesktopNotification(const bool showDesktopNotification) { - m_settings->setValue("showDesktopNotification", showDesktopNotification); + m_settings.setValue("showDesktopNotification", showDesktopNotification); } QString ConfigHandler::filenamePatternValue() { - return m_settings->value("filenamePattern").toString(); + return m_settings.value("filenamePattern").toString(); } void ConfigHandler::setFilenamePattern(const QString &pattern) { - return m_settings->setValue("filenamePattern", pattern); + return m_settings.setValue("filenamePattern", pattern); } bool ConfigHandler::disabledTrayIconValue() { - return m_settings->value("disabledTrayIcon").toBool(); + return m_settings.value("disabledTrayIcon").toBool(); } void ConfigHandler::setDisabledTrayIcon(const bool disabledTrayIcon) { - m_settings->setValue("disabledTrayIcon", disabledTrayIcon); + m_settings.setValue("disabledTrayIcon", disabledTrayIcon); } bool ConfigHandler::initiatedIsSet() { - return m_settings->value("initiated").toBool(); + return m_settings.value("initiated").toBool(); } void ConfigHandler::setInitiated() { - m_settings->setValue("initiated", true); + m_settings.setValue("initiated", true); } void ConfigHandler::setNotInitiated() { - m_settings->setValue("initiated", false); + m_settings.setValue("initiated", false); } void ConfigHandler::setDefaults() { @@ -128,11 +126,11 @@ void ConfigHandler::setAllTheButtons() { for (const CaptureButton::ButtonType t: listTypes) { buttons << static_cast(t); } - m_settings->setValue("buttons", QVariant::fromValue(buttons)); + m_settings.setValue("buttons", QVariant::fromValue(buttons)); } QString ConfigHandler::configFilePath() const { - return m_settings->fileName(); + return m_settings.fileName(); } bool ConfigHandler::normalizeButtons(QList &buttons) { diff --git a/src/utils/confighandler.h b/src/utils/confighandler.h index 28d35503..0fd43cce 100644 --- a/src/utils/confighandler.h +++ b/src/utils/confighandler.h @@ -19,16 +19,13 @@ #define CONFIGHANDLER_H #include "src/capture/widget/capturebutton.h" -#include #include +#include -class QSettings; - -class ConfigHandler : public QObject +class ConfigHandler { - Q_OBJECT public: - explicit ConfigHandler(QObject *parent = nullptr); + explicit ConfigHandler(); QList getButtons(); void setButtons(const QList &); @@ -67,7 +64,7 @@ public: QString configFilePath() const; private: - QSettings *m_settings; + QSettings m_settings; bool normalizeButtons(QList &);