Made settings classes to QObjects to get signals to work #76

This commit is contained in:
Daniel Brunner
2018-03-24 15:29:07 +01:00
parent 1ce4232224
commit 2ee5b8703d
5 changed files with 12 additions and 6 deletions

View File

@@ -14,7 +14,7 @@ class UpdaterSettings : public QObject
Q_PROPERTY(QDate lastUpdateCheck READ lastUpdateCheck WRITE setLastUpdateCheck NOTIFY lastUpdateCheckChanged) Q_PROPERTY(QDate lastUpdateCheck READ lastUpdateCheck WRITE setLastUpdateCheck NOTIFY lastUpdateCheckChanged)
public: public:
explicit UpdaterSettings(ZeiterfassungSettings &settings, QObject *parent = nullptr); explicit UpdaterSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR);
QUrl url() const; QUrl url() const;
void setUrl(const QUrl &url); void setUrl(const QUrl &url);

View File

@@ -5,7 +5,8 @@
const QString WeatherSettings::m_url("WeatherPlugin/url"); 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")); 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) m_settings(settings)
{ {

View File

@@ -1,14 +1,18 @@
#ifndef WEATHERSETTINGS_H #ifndef WEATHERSETTINGS_H
#define WEATHERSETTINGS_H #define WEATHERSETTINGS_H
#include <QObject>
#include <QUrl> #include <QUrl>
class ZeiterfassungSettings; class ZeiterfassungSettings;
class WeatherSettings class WeatherSettings : public QObject
{ {
Q_OBJECT
Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
public: public:
WeatherSettings(ZeiterfassungSettings &settings); WeatherSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR);
QUrl url() const; QUrl url() const;
void setUrl(const QUrl &url); void setUrl(const QUrl &url);

View File

@@ -20,7 +20,8 @@ const QStringList WebRadioSettings::m_defaultUrls {
}; };
const int WebRadioSettings::m_defaultVolume(100); const int WebRadioSettings::m_defaultVolume(100);
WebRadioSettings::WebRadioSettings(ZeiterfassungSettings &settings) : WebRadioSettings::WebRadioSettings(ZeiterfassungSettings &settings, QObject *parent) :
QObject(parent),
m_settings(settings) m_settings(settings)
{ {
} }

View File

@@ -14,7 +14,7 @@ class WebRadioSettings : public QObject
Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
public: public:
WebRadioSettings(ZeiterfassungSettings &settings); WebRadioSettings(ZeiterfassungSettings &settings, QObject *parent = Q_NULLPTR);
QStringList urls() const; QStringList urls() const;
void setUrls(const QStringList &urls); void setUrls(const QStringList &urls);