diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp index a1edbb2..6f5754b 100644 --- a/plugins/lunchmealplugin/lunchmealsettingswidget.cpp +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.cpp @@ -29,8 +29,8 @@ bool LunchMealSettingsWidget::isValid(QString &message) const return valid; } -void LunchMealSettingsWidget::apply() +bool LunchMealSettingsWidget::apply() { - m_settings.setUrl(m_lineEditUrl->text()); - m_settings.setDateFormat(m_lineEditDateFormat->text()); + return m_settings.setUrl(m_lineEditUrl->text()) && + m_settings.setDateFormat(m_lineEditDateFormat->text()); } diff --git a/plugins/lunchmealplugin/lunchmealsettingswidget.h b/plugins/lunchmealplugin/lunchmealsettingswidget.h index 72d99d6..779125d 100644 --- a/plugins/lunchmealplugin/lunchmealsettingswidget.h +++ b/plugins/lunchmealplugin/lunchmealsettingswidget.h @@ -16,7 +16,7 @@ public: virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; public Q_SLOTS: - virtual void apply() Q_DECL_OVERRIDE; + virtual bool apply() Q_DECL_OVERRIDE; private: LunchMealSettings m_settings; diff --git a/plugins/presenceplugin/presencesettingswidget.cpp b/plugins/presenceplugin/presencesettingswidget.cpp index b86c817..51b2733 100644 --- a/plugins/presenceplugin/presencesettingswidget.cpp +++ b/plugins/presenceplugin/presencesettingswidget.cpp @@ -18,13 +18,7 @@ PresenceSettingsWidget::PresenceSettingsWidget(ZeiterfassungSettings &settings, setLayout(layout); } -bool PresenceSettingsWidget::isValid(QString &message) const +bool PresenceSettingsWidget::apply() { - Q_UNUSED(message) - return true; -} - -void PresenceSettingsWidget::apply() -{ - m_settings.setInterval(m_spinBox->value()); + return m_settings.setInterval(m_spinBox->value()); } diff --git a/plugins/presenceplugin/presencesettingswidget.h b/plugins/presenceplugin/presencesettingswidget.h index 5427b32..c9d649b 100644 --- a/plugins/presenceplugin/presencesettingswidget.h +++ b/plugins/presenceplugin/presencesettingswidget.h @@ -13,10 +13,8 @@ class PresenceSettingsWidget : public SettingsWidget public: explicit PresenceSettingsWidget(ZeiterfassungSettings &settings, QWidget *parent = Q_NULLPTR); - virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; - public Q_SLOTS: - virtual void apply() Q_DECL_OVERRIDE; + virtual bool apply() Q_DECL_OVERRIDE; private: PresenceSettings m_settings; diff --git a/plugins/updaterplugin/updatersettingswidget.cpp b/plugins/updaterplugin/updatersettingswidget.cpp index 1b0c63b..883bcc1 100644 --- a/plugins/updaterplugin/updatersettingswidget.cpp +++ b/plugins/updaterplugin/updatersettingswidget.cpp @@ -26,7 +26,7 @@ bool UpdaterSettingsWidget::isValid(QString &message) const return valid; } -void UpdaterSettingsWidget::apply() +bool UpdaterSettingsWidget::apply() { - m_settings.setUrl(QUrl(m_lineEdit->text())); + return m_settings.setUrl(QUrl(m_lineEdit->text())); } diff --git a/plugins/updaterplugin/updatersettingswidget.h b/plugins/updaterplugin/updatersettingswidget.h index 74a938e..a3568d2 100644 --- a/plugins/updaterplugin/updatersettingswidget.h +++ b/plugins/updaterplugin/updatersettingswidget.h @@ -16,7 +16,7 @@ public: virtual bool isValid(QString &message) const Q_DECL_OVERRIDE; public Q_SLOTS: - virtual void apply() Q_DECL_OVERRIDE; + virtual bool apply() Q_DECL_OVERRIDE; private: UpdaterSettings m_settings; diff --git a/plugins/weatherplugin/weathersettingswidget.cpp b/plugins/weatherplugin/weathersettingswidget.cpp index 2e14db6..35f3cb5 100644 --- a/plugins/weatherplugin/weathersettingswidget.cpp +++ b/plugins/weatherplugin/weathersettingswidget.cpp @@ -26,7 +26,7 @@ bool WeatherSettingsWidget::isValid(QString &message) const return valid; } -void WeatherSettingsWidget::apply() +bool WeatherSettingsWidget::apply() { - m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text())); + return m_settings.setUrl(QUrl::fromUserInput(m_lineEdit->text())); } diff --git a/plugins/weatherplugin/weathersettingswidget.h b/plugins/weatherplugin/weathersettingswidget.h index b1688a6..7936f48 100644 --- a/plugins/weatherplugin/weathersettingswidget.h +++ b/plugins/weatherplugin/weathersettingswidget.h @@ -20,7 +20,7 @@ public: bool isValid(QString &message) const Q_DECL_OVERRIDE; public Q_SLOTS: - void apply() Q_DECL_OVERRIDE; + virtual bool apply() Q_DECL_OVERRIDE; private: WeatherSettings m_settings; diff --git a/plugins/webradioplugin/webradiosettingswidget.cpp b/plugins/webradioplugin/webradiosettingswidget.cpp index c66eff1..adec37d 100644 --- a/plugins/webradioplugin/webradiosettingswidget.cpp +++ b/plugins/webradioplugin/webradiosettingswidget.cpp @@ -31,8 +31,7 @@ bool WebRadioSettingsWidget::isValid(QString &message) const return true; } -void WebRadioSettingsWidget::apply() +bool WebRadioSettingsWidget::apply() { - if(m_urlsWidget->stringList() != m_settings.urls()) - m_settings.setUrls(m_urlsWidget->stringList()); + return m_settings.setUrls(m_urlsWidget->stringList()); } diff --git a/plugins/webradioplugin/webradiosettingswidget.h b/plugins/webradioplugin/webradiosettingswidget.h index d1f77dc..d3556ee 100644 --- a/plugins/webradioplugin/webradiosettingswidget.h +++ b/plugins/webradioplugin/webradiosettingswidget.h @@ -20,7 +20,7 @@ public: bool isValid(QString &message) const Q_DECL_OVERRIDE; public Q_SLOTS: - void apply() Q_DECL_OVERRIDE; + virtual bool apply() Q_DECL_OVERRIDE; private: WebRadioSettings m_settings; diff --git a/zeiterfassungguilib/settingswidget.h b/zeiterfassungguilib/settingswidget.h index 7b21ff2..65aebee 100644 --- a/zeiterfassungguilib/settingswidget.h +++ b/zeiterfassungguilib/settingswidget.h @@ -15,5 +15,5 @@ public: virtual bool isValid(QString &message) const { Q_UNUSED(message) return true; } public Q_SLOTS: - virtual void apply() { } + virtual bool apply() = 0; };