From 2ee5b8703d719327f890c52742999b9c32eda8ff Mon Sep 17 00:00:00 2001 From: Daniel Brunner <0xFEEDC0DE64@gmail.com> Date: Sat, 24 Mar 2018 15:29:07 +0100 Subject: [PATCH] Made settings classes to QObjects to get signals to work #76 --- plugins/updaterplugin/updatersettings.h | 2 +- plugins/weatherplugin/weathersettings.cpp | 3 ++- plugins/weatherplugin/weathersettings.h | 8 ++++++-- plugins/webradioplugin/webradiosettings.cpp | 3 ++- plugins/webradioplugin/webradiosettings.h | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/plugins/updaterplugin/updatersettings.h b/plugins/updaterplugin/updatersettings.h index 523a9d2..dbce8ea 100644 --- a/plugins/updaterplugin/updatersettings.h +++ b/plugins/updaterplugin/updatersettings.h @@ -14,7 +14,7 @@ class UpdaterSettings : public QObject Q_PROPERTY(QDate lastUpdateCheck READ lastUpdateCheck WRITE setLastUpdateCheck NOTIFY lastUpdateCheckChanged) public: - explicit UpdaterSettings(ZeiterfassungSettings &settings, QObject *parent = nullptr); + explicit UpdaterSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR); QUrl url() const; void setUrl(const QUrl &url); diff --git a/plugins/weatherplugin/weathersettings.cpp b/plugins/weatherplugin/weathersettings.cpp index 00ce224..fc9a99c 100644 --- a/plugins/weatherplugin/weathersettings.cpp +++ b/plugins/weatherplugin/weathersettings.cpp @@ -5,7 +5,8 @@ const QString WeatherSettings::m_url("WeatherPlugin/url"); const QUrl WeatherSettings::m_defaultUrl(QStringLiteral("http://api.openweathermap.org/data/2.5/weather?q=Graz,AT&units=metric&APPID=40f6c892c6162680c6c9235169dc9f83")); -WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings) : +WeatherSettings::WeatherSettings(ZeiterfassungSettings &settings, QObject *parent) : + QObject(parent), m_settings(settings) { diff --git a/plugins/weatherplugin/weathersettings.h b/plugins/weatherplugin/weathersettings.h index 175bb2a..92da89f 100644 --- a/plugins/weatherplugin/weathersettings.h +++ b/plugins/weatherplugin/weathersettings.h @@ -1,14 +1,18 @@ #ifndef WEATHERSETTINGS_H #define WEATHERSETTINGS_H +#include #include class ZeiterfassungSettings; -class WeatherSettings +class WeatherSettings : public QObject { + Q_OBJECT + Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) + public: - WeatherSettings(ZeiterfassungSettings &settings); + WeatherSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR); QUrl url() const; void setUrl(const QUrl &url); diff --git a/plugins/webradioplugin/webradiosettings.cpp b/plugins/webradioplugin/webradiosettings.cpp index 8acfae3..8b65a3a 100644 --- a/plugins/webradioplugin/webradiosettings.cpp +++ b/plugins/webradioplugin/webradiosettings.cpp @@ -20,7 +20,8 @@ const QStringList WebRadioSettings::m_defaultUrls { }; const int WebRadioSettings::m_defaultVolume(100); -WebRadioSettings::WebRadioSettings(ZeiterfassungSettings &settings) : +WebRadioSettings::WebRadioSettings(ZeiterfassungSettings &settings, QObject *parent) : + QObject(parent), m_settings(settings) { } diff --git a/plugins/webradioplugin/webradiosettings.h b/plugins/webradioplugin/webradiosettings.h index 662e614..e70d7da 100644 --- a/plugins/webradioplugin/webradiosettings.h +++ b/plugins/webradioplugin/webradiosettings.h @@ -14,7 +14,7 @@ class WebRadioSettings : public QObject Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged) public: - WebRadioSettings(ZeiterfassungSettings &settings); + WebRadioSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR); QStringList urls() const; void setUrls(const QStringList &urls);