From 051e2d1818633b9db6cb111a5c3b5c33cb518eb5 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Wed, 24 Jun 2015 12:06:27 +0200 Subject: [PATCH] Don't set plugin name in constructor. --- src/libsnore/plugins/plugincontainer.cpp | 3 +-- src/libsnore/plugins/plugins.cpp | 21 ++++++++++--------- src/libsnore/plugins/plugins.h | 8 +++---- src/libsnore/plugins/snorebackend.cpp | 12 ----------- src/libsnore/plugins/snorebackend.h | 4 ++-- src/libsnore/plugins/snorefrontend.cpp | 6 ------ src/libsnore/plugins/snorefrontend.h | 2 +- src/plugins/backends/growl/growlbackend.cpp | 13 +++--------- src/plugins/backends/growl/growlbackend.h | 4 ++-- src/plugins/backends/snarl/snarl.cpp | 13 ++---------- src/plugins/backends/snarl/snarl.h | 4 ++-- src/plugins/backends/snore/snorenotifier.cpp | 8 +++---- src/plugins/backends/snore/snorenotifier.h | 4 ++-- .../backends/snoretoast/snoretoast.cpp | 10 --------- src/plugins/backends/snoretoast/snoretoast.h | 4 ++-- .../backends/trayicon/trayiconnotifer.cpp | 11 ---------- .../backends/trayicon/trayiconnotifer.h | 6 +++--- .../freedesktopnotificationfrontend.cpp | 10 --------- .../freedesktopnotificationfrontend.h | 8 +++---- .../frontends/snarlnetwork/snarlnetwork.cpp | 10 --------- .../frontends/snarlnetwork/snarlnetwork.h | 4 ++-- src/plugins/secondary_backends/nma/nma.cpp | 17 ++++++--------- src/plugins/secondary_backends/nma/nma.h | 6 ++++-- .../secondary_backends/pushover/pushover.cpp | 21 +++++++------------ .../secondary_backends/pushover/pushover.h | 6 ++++-- .../secondary_backends/sound/sound.cpp | 8 +++---- src/plugins/secondary_backends/sound/sound.h | 8 +++++-- .../secondary_backends/toasty/toasty.cpp | 17 ++++++--------- .../secondary_backends/toasty/toasty.h | 6 ++++-- 29 files changed, 87 insertions(+), 167 deletions(-) diff --git a/src/libsnore/plugins/plugincontainer.cpp b/src/libsnore/plugins/plugincontainer.cpp index 259cb29..b0ca90f 100644 --- a/src/libsnore/plugins/plugincontainer.cpp +++ b/src/libsnore/plugins/plugincontainer.cpp @@ -54,8 +54,7 @@ SnorePlugin *PluginContainer::load() return nullptr; } SnorePlugin *plugin = qobject_cast (m_loader.instance()); - Q_ASSERT_X(m_pluginName == plugin->name(), Q_FUNC_INFO, "The plugin name is different to the one in the meta data."); - plugin->m_type = type(); + plugin->m_container = this; return plugin; } diff --git a/src/libsnore/plugins/plugins.cpp b/src/libsnore/plugins/plugins.cpp index 4aed845..7a985ab 100644 --- a/src/libsnore/plugins/plugins.cpp +++ b/src/libsnore/plugins/plugins.cpp @@ -29,28 +29,27 @@ using namespace Snore; -SnorePlugin::SnorePlugin(const QString &name) : - m_name(name) +SnorePlugin::SnorePlugin() { Q_ASSERT_X(thread() == qApp->thread(), Q_FUNC_INFO, "Plugin initialized in wrong thread"); if (thread() != qApp->thread()) { snoreDebug(SNORE_WARNING) << "Plugin initialized in wrong thread."; } - setDefaultValue("Enabled", false, LOCAL_SETTING); } SnorePlugin::~SnorePlugin() { - snoreDebug(SNORE_DEBUG) << m_name << this << "deleted"; + snoreDebug(SNORE_DEBUG) << name() << this << "deleted"; } bool SnorePlugin::initialize() { + setDefaultValue("Enabled", false, LOCAL_SETTING); if (m_initialized) { qFatal("Something went wrong, plugin %s is already initialized", this->name().toLatin1().constData()); return false; } - snoreDebug(SNORE_DEBUG) << "Initialize" << m_name << this; + snoreDebug(SNORE_DEBUG) << "Initialize" << name() << this; m_initialized = true; return true; } @@ -86,22 +85,24 @@ Snore::PluginSettingsWidget *SnorePlugin::settingsWidget() QString SnorePlugin::normaliseKey(const QString &key) const { - return QString("%1/%2.%3").arg(m_name, key, settingsVersion()); + return QString("%1/%2.%3").arg(name(), key, settingsVersion()); } const QString &SnorePlugin::name() const { - return m_name; + Q_ASSERT_X(m_container, Q_FUNC_INFO, "Plugin container not set."); + return m_container->name(); } SnorePlugin::PluginTypes SnorePlugin::type() const { - return m_type; + Q_ASSERT_X(m_container, Q_FUNC_INFO, "Plugin container not set."); + return m_container->type(); } const QString SnorePlugin::typeName() const { - return SnorePlugin::typeToString(m_type); + return SnorePlugin::typeToString(type()); } QString SnorePlugin::settingsVersion() const @@ -112,7 +113,7 @@ QString SnorePlugin::settingsVersion() const bool SnorePlugin::deinitialize() { if (m_initialized) { - snoreDebug(SNORE_DEBUG) << "Deinitialize" << m_name << this; + snoreDebug(SNORE_DEBUG) << "Deinitialize" << name() << this; m_initialized = false; return true; } diff --git a/src/libsnore/plugins/plugins.h b/src/libsnore/plugins/plugins.h index 2a653b1..22902be 100644 --- a/src/libsnore/plugins/plugins.h +++ b/src/libsnore/plugins/plugins.h @@ -28,6 +28,8 @@ namespace Snore { +class PluginContainer; + class SNORE_EXPORT SnorePlugin : public QObject { Q_OBJECT @@ -48,7 +50,7 @@ public: static QString typeToString(const PluginTypes t); static QList types(); - SnorePlugin(const QString &name); + SnorePlugin(); virtual ~SnorePlugin(); virtual bool initialize(); virtual bool deinitialize(); @@ -68,12 +70,10 @@ protected: virtual QString settingsVersion() const; private: - SnorePlugin() = delete; QString normaliseKey(const QString &key) const; - QString m_name; bool m_initialized = false; - PluginTypes m_type = NONE; + PluginContainer *m_container = nullptr; friend class PluginContainer; diff --git a/src/libsnore/plugins/snorebackend.cpp b/src/libsnore/plugins/snorebackend.cpp index d974966..d57e9a4 100644 --- a/src/libsnore/plugins/snorebackend.cpp +++ b/src/libsnore/plugins/snorebackend.cpp @@ -29,12 +29,6 @@ using namespace Snore; -SnoreBackend::SnoreBackend(const QString &name) : - SnorePlugin(name) -{ - -} - SnoreBackend::~SnoreBackend() { snoreDebug(SNORE_DEBUG) << "Deleting" << name(); @@ -102,12 +96,6 @@ void SnoreBackend::slotCloseNotification(Notification notification) Q_UNUSED(notification) } -SnoreSecondaryBackend::SnoreSecondaryBackend(const QString &name): - SnorePlugin(name) -{ - -} - SnoreSecondaryBackend::~SnoreSecondaryBackend() { snoreDebug(SNORE_DEBUG) << "Deleting" << name(); diff --git a/src/libsnore/plugins/snorebackend.h b/src/libsnore/plugins/snorebackend.h index 602389c..95455e2 100644 --- a/src/libsnore/plugins/snorebackend.h +++ b/src/libsnore/plugins/snorebackend.h @@ -31,7 +31,7 @@ class SNORE_EXPORT SnoreBackend : public SnorePlugin Q_OBJECT Q_INTERFACES(Snore::SnorePlugin) public: - SnoreBackend(const QString &name); + SnoreBackend() = default; virtual ~SnoreBackend(); virtual bool initialize() override; virtual bool deinitialize() override; @@ -73,7 +73,7 @@ class SNORE_EXPORT SnoreSecondaryBackend : public SnorePlugin Q_OBJECT Q_INTERFACES(Snore::SnorePlugin Snore::SnorePlugin) public: - SnoreSecondaryBackend(const QString &name); + SnoreSecondaryBackend() = default; virtual ~SnoreSecondaryBackend(); virtual bool initialize(); virtual bool deinitialize(); diff --git a/src/libsnore/plugins/snorefrontend.cpp b/src/libsnore/plugins/snorefrontend.cpp index ca2dd47..bdb46d0 100644 --- a/src/libsnore/plugins/snorefrontend.cpp +++ b/src/libsnore/plugins/snorefrontend.cpp @@ -21,12 +21,6 @@ using namespace Snore; -SnoreFrontend::SnoreFrontend(const QString &name) : - SnorePlugin(name) -{ - -} - SnoreFrontend::~SnoreFrontend() { snoreDebug(SNORE_DEBUG) << "Deleting" << name(); diff --git a/src/libsnore/plugins/snorefrontend.h b/src/libsnore/plugins/snorefrontend.h index a658e68..5d300b1 100644 --- a/src/libsnore/plugins/snorefrontend.h +++ b/src/libsnore/plugins/snorefrontend.h @@ -31,7 +31,7 @@ class SNORE_EXPORT SnoreFrontend: public SnorePlugin Q_OBJECT Q_INTERFACES(Snore::SnorePlugin) public: - SnoreFrontend(const QString &name); + SnoreFrontend() = default; virtual ~SnoreFrontend(); virtual bool initialize() override; diff --git a/src/plugins/backends/growl/growlbackend.cpp b/src/plugins/backends/growl/growlbackend.cpp index 5520158..cce5489 100644 --- a/src/plugins/backends/growl/growlbackend.cpp +++ b/src/plugins/backends/growl/growlbackend.cpp @@ -29,19 +29,12 @@ using namespace Snore; GrowlBackend *GrowlBackend::s_instance = nullptr; -GrowlBackend::GrowlBackend(): - SnoreBackend("Growl") -{ - setDefaultValue("Host", "localhost"); - setDefaultValue("Password", ""); -} - -GrowlBackend::~GrowlBackend() -{ -} bool GrowlBackend::initialize() { + setDefaultValue("Host", "localhost"); + setDefaultValue("Password", ""); + s_instance = this; auto func = [](growl_callback_data * data)->void { snoreDebug(SNORE_DEBUG) << data->id << QString(data->reason) << QString(data->data); diff --git a/src/plugins/backends/growl/growlbackend.h b/src/plugins/backends/growl/growlbackend.h index 08fcc93..962d0ec 100644 --- a/src/plugins/backends/growl/growlbackend.h +++ b/src/plugins/backends/growl/growlbackend.h @@ -30,8 +30,8 @@ class GrowlBackend: public Snore::SnoreBackend Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json") public: - GrowlBackend(); - ~GrowlBackend(); + GrowlBackend() = default; + ~GrowlBackend() = default; bool initialize() override; bool deinitialize() override; Snore::PluginSettingsWidget *settingsWidget() override; diff --git a/src/plugins/backends/snarl/snarl.cpp b/src/plugins/backends/snarl/snarl.cpp index 7831ffd..613cf81 100644 --- a/src/plugins/backends/snarl/snarl.cpp +++ b/src/plugins/backends/snarl/snarl.cpp @@ -111,19 +111,10 @@ private: }; -SnarlBackend::SnarlBackend(): - SnoreBackend("Snarl") -{ - setDefaultValue("Password", QString()); -} - -SnarlBackend::~SnarlBackend() -{ - -} - bool SnarlBackend::initialize() { + setDefaultValue("Password", QString()); + SnarlInterface *snarlInterface = new SnarlInterface(); if (!snarlInterface->IsSnarlRunning()) { snoreDebug(SNORE_WARNING) << "Snarl is not running"; diff --git a/src/plugins/backends/snarl/snarl.h b/src/plugins/backends/snarl/snarl.h index fe4ae45..09968b8 100644 --- a/src/plugins/backends/snarl/snarl.h +++ b/src/plugins/backends/snarl/snarl.h @@ -27,8 +27,8 @@ class SnarlBackend: public Snore::SnoreBackend Q_INTERFACES(Snore::SnoreBackend) Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json") public: - SnarlBackend(); - ~SnarlBackend(); + SnarlBackend() = default; + ~SnarlBackend() = default; bool initialize() override; bool deinitialize() override; Snore::PluginSettingsWidget *settingsWidget() override; diff --git a/src/plugins/backends/snore/snorenotifier.cpp b/src/plugins/backends/snore/snorenotifier.cpp index cf6237a..45d42f9 100644 --- a/src/plugins/backends/snore/snorenotifier.cpp +++ b/src/plugins/backends/snore/snorenotifier.cpp @@ -27,18 +27,16 @@ using namespace Snore; SnoreNotifier::SnoreNotifier(): - SnoreBackend("Snore"), m_widgets(3), m_timer(new QTimer(this)) { - setDefaultValue("Position", Qt::TopRightCorner); m_timer->setInterval(500); connect(m_timer, &QTimer::timeout, [this]() { if (m_queue.isEmpty()) { snoreDebug(SNORE_DEBUG) << "queue is empty"; m_timer->stop(); } else { - foreach(NotifyWidget * w, m_widgets) { + for(NotifyWidget * w : m_widgets) { if (w->acquire()) { Notification notification = m_queue.takeFirst(); w->display(notification); @@ -88,7 +86,7 @@ void SnoreNotifier::slotNotify(Snore::Notification notification) } } else { if (m_queue.isEmpty()) { - foreach(NotifyWidget * w, m_widgets) { + for(NotifyWidget * w : m_widgets) { if (w->acquire()) { display(w, notification); return; @@ -109,6 +107,8 @@ void SnoreNotifier::slotCloseNotification(Snore::Notification notification) bool SnoreNotifier::initialize() { + setDefaultValue("Position", Qt::TopRightCorner); + if (SnoreBackend::initialize()) { for (int i = 0; i < m_widgets.size(); ++i) { NotifyWidget *w = new NotifyWidget(i, this); diff --git a/src/plugins/backends/snore/snorenotifier.h b/src/plugins/backends/snore/snorenotifier.h index 955d2d1..24bd800 100644 --- a/src/plugins/backends/snore/snorenotifier.h +++ b/src/plugins/backends/snore/snorenotifier.h @@ -35,8 +35,8 @@ public: bool initialize() override; bool deinitialize() override; - virtual bool canCloseNotification() const override; - virtual bool canUpdateNotification() const override; + bool canCloseNotification() const override; + bool canUpdateNotification() const override; Snore::PluginSettingsWidget *settingsWidget() override; diff --git a/src/plugins/backends/snoretoast/snoretoast.cpp b/src/plugins/backends/snoretoast/snoretoast.cpp index 655873d..7885e6c 100644 --- a/src/plugins/backends/snoretoast/snoretoast.cpp +++ b/src/plugins/backends/snoretoast/snoretoast.cpp @@ -14,16 +14,6 @@ using namespace Snore; -SnoreToast::SnoreToast(): - SnoreBackend("Windows 8") -{ -} - -SnoreToast::~SnoreToast() -{ - -} - bool SnoreToast::initialize() { if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS8) { diff --git a/src/plugins/backends/snoretoast/snoretoast.h b/src/plugins/backends/snoretoast/snoretoast.h index c95e81b..0c9a60c 100644 --- a/src/plugins/backends/snoretoast/snoretoast.h +++ b/src/plugins/backends/snoretoast/snoretoast.h @@ -10,8 +10,8 @@ class SnoreToast : public Snore::SnoreBackend Q_INTERFACES(Snore::SnoreBackend) Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json") public: - SnoreToast(); - ~SnoreToast(); + SnoreToast() = default; + ~SnoreToast() = default; virtual bool initialize() override; virtual bool canCloseNotification() const override; diff --git a/src/plugins/backends/trayicon/trayiconnotifer.cpp b/src/plugins/backends/trayicon/trayiconnotifer.cpp index ba4188e..c589fae 100644 --- a/src/plugins/backends/trayicon/trayiconnotifer.cpp +++ b/src/plugins/backends/trayicon/trayiconnotifer.cpp @@ -6,17 +6,6 @@ #include using namespace Snore; -TrayIconNotifer::TrayIconNotifer() : - SnoreBackend("System Tray Icon"), - m_currentlyDisplaying(false) -{ - -} - -TrayIconNotifer::~TrayIconNotifer() -{ - -} bool TrayIconNotifer::deinitialize() { diff --git a/src/plugins/backends/trayicon/trayiconnotifer.h b/src/plugins/backends/trayicon/trayiconnotifer.h index 0053dd3..01347fd 100644 --- a/src/plugins/backends/trayicon/trayiconnotifer.h +++ b/src/plugins/backends/trayicon/trayiconnotifer.h @@ -15,8 +15,8 @@ class TrayIconNotifer: public Snore::SnoreBackend Q_INTERFACES(Snore::SnoreBackend) Q_PLUGIN_METADATA(IID "org.Snore.NotificationBackend/1.0" FILE "plugin.json") public: - TrayIconNotifer(); - virtual ~TrayIconNotifer() override; + TrayIconNotifer() = default; + ~TrayIconNotifer() = default; virtual bool deinitialize() override; virtual bool canCloseNotification() const override; @@ -31,7 +31,7 @@ private: QSystemTrayIcon *trayIcon(const Snore::Application &app); QList m_notificationQue; Snore::Notification m_displayed; - bool m_currentlyDisplaying; + bool m_currentlyDisplaying = false; private slots: void displayNotification(QSystemTrayIcon *icon); diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp index c0ea4d9..263adba 100644 --- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp +++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.cpp @@ -29,16 +29,6 @@ using namespace Snore; -FreedesktopFrontend::FreedesktopFrontend(): - SnoreFrontend("Freedesktop") -{ - -} - -FreedesktopFrontend::~FreedesktopFrontend() -{ -} - bool FreedesktopFrontend::initialize() { m_adaptor = new NotificationsAdaptor(this); diff --git a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h index 4bf08b0..2cce726 100644 --- a/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h +++ b/src/plugins/frontends/freedesktop/freedesktopnotificationfrontend.h @@ -29,10 +29,10 @@ class FreedesktopFrontend : public Snore::SnoreFrontend Q_INTERFACES(Snore::SnoreFrontend) Q_PLUGIN_METADATA(IID "org.Snore.NotificationFrontend/1.0" FILE "plugin.json") public: - FreedesktopFrontend(); - ~FreedesktopFrontend(); - virtual bool initialize() override; - virtual bool deinitialize() override; + FreedesktopFrontend() = default; + ~FreedesktopFrontend() = default; + bool initialize() override; + bool deinitialize() override; uint Notify(const QString &app_name, uint replaces_id, const QString &app_icon, const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, int timeout); void CloseNotification(uint id); diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp index be9d7ff..a5ce8e2 100644 --- a/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp +++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.cpp @@ -26,16 +26,6 @@ #include using namespace Snore; -SnarlNetworkFrontend::SnarlNetworkFrontend(): - SnoreFrontend("SnarlNetwork") -{ - -} - -SnarlNetworkFrontend::~SnarlNetworkFrontend() -{ -} - bool SnarlNetworkFrontend::initialize() { parser = new Parser(this); diff --git a/src/plugins/frontends/snarlnetwork/snarlnetwork.h b/src/plugins/frontends/snarlnetwork/snarlnetwork.h index abfdce5..30db7d8 100644 --- a/src/plugins/frontends/snarlnetwork/snarlnetwork.h +++ b/src/plugins/frontends/snarlnetwork/snarlnetwork.h @@ -35,8 +35,8 @@ public: static const int port = 9887; public: - SnarlNetworkFrontend(); - ~SnarlNetworkFrontend(); + SnarlNetworkFrontend() = default; + ~SnarlNetworkFrontend() = default; virtual bool initialize() override; virtual bool deinitialize() override; diff --git a/src/plugins/secondary_backends/nma/nma.cpp b/src/plugins/secondary_backends/nma/nma.cpp index af27c57..1f27afe 100644 --- a/src/plugins/secondary_backends/nma/nma.cpp +++ b/src/plugins/secondary_backends/nma/nma.cpp @@ -26,17 +26,6 @@ using namespace Snore; -NotifyMyAndroid::NotifyMyAndroid(): - SnoreSecondaryBackend("NotifyMyAndroid") -{ - setDefaultValue("ApiKey", ""); -} - -NotifyMyAndroid::~NotifyMyAndroid() -{ - -} - void NotifyMyAndroid::slotNotify(Notification notification) { QString key = value("ApiKey").toString(); @@ -67,6 +56,12 @@ void NotifyMyAndroid::slotNotify(Notification notification) } +bool NotifyMyAndroid::initialize() +{ + setDefaultValue("ApiKey", ""); + return SnoreSecondaryBackend::initialize(); +} + PluginSettingsWidget *NotifyMyAndroid::settingsWidget() { return new NotifyMyAndroidSettings(this); diff --git a/src/plugins/secondary_backends/nma/nma.h b/src/plugins/secondary_backends/nma/nma.h index 04fedcc..db9019c 100644 --- a/src/plugins/secondary_backends/nma/nma.h +++ b/src/plugins/secondary_backends/nma/nma.h @@ -28,8 +28,10 @@ class NotifyMyAndroid : public Snore::SnoreSecondaryBackend Q_INTERFACES(Snore::SnoreSecondaryBackend) Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json") public: - NotifyMyAndroid(); - ~NotifyMyAndroid(); + NotifyMyAndroid() = default; + ~NotifyMyAndroid() = default; + + virtual bool initialize() override; Snore::PluginSettingsWidget *settingsWidget() override; diff --git a/src/plugins/secondary_backends/pushover/pushover.cpp b/src/plugins/secondary_backends/pushover/pushover.cpp index 99e58a7..a813265 100644 --- a/src/plugins/secondary_backends/pushover/pushover.cpp +++ b/src/plugins/secondary_backends/pushover/pushover.cpp @@ -27,19 +27,6 @@ using namespace Snore; -Pushover::Pushover(): - SnoreSecondaryBackend("Pushover") -{ - setDefaultValue("UserKey", ""); - setDefaultValue("Sound", "pushover", LOCAL_SETTING); - setDefaultValue("Devices", "", LOCAL_SETTING); -} - -Pushover::~Pushover() -{ - -} - void Pushover::slotNotify(Notification notification) { QString key = value("ApiKey").toString(); @@ -109,6 +96,14 @@ void Pushover::slotNotify(Notification notification) } +bool Pushover::initialize() +{ + setDefaultValue("UserKey", ""); + setDefaultValue("Sound", "pushover", LOCAL_SETTING); + setDefaultValue("Devices", "", LOCAL_SETTING); + return SnoreSecondaryBackend::initialize(); +} + PluginSettingsWidget *Pushover::settingsWidget() { return new PushoverSettings(this); diff --git a/src/plugins/secondary_backends/pushover/pushover.h b/src/plugins/secondary_backends/pushover/pushover.h index a08f335..c798555 100644 --- a/src/plugins/secondary_backends/pushover/pushover.h +++ b/src/plugins/secondary_backends/pushover/pushover.h @@ -28,8 +28,10 @@ class Pushover : public Snore::SnoreSecondaryBackend Q_INTERFACES(Snore::SnoreSecondaryBackend) Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json") public: - Pushover(); - ~Pushover(); + Pushover() = default; + ~Pushover() = default; + + bool initialize() override; Snore::PluginSettingsWidget *settingsWidget() override; diff --git a/src/plugins/secondary_backends/sound/sound.cpp b/src/plugins/secondary_backends/sound/sound.cpp index b5ace52..cdd4845 100644 --- a/src/plugins/secondary_backends/sound/sound.cpp +++ b/src/plugins/secondary_backends/sound/sound.cpp @@ -24,11 +24,8 @@ using namespace Snore; Sound::Sound(): - SnoreSecondaryBackend("Sound"), m_player(new QMediaPlayer(this)) { - setDefaultValue("Volume", 50); - m_player->setVolume(value("Volume").toInt()); // connect(m_player,QMediaPlayer::positionChanged,[](qint64 pos){ // snoreDebug(SNORE_DEBUG) << "Player: " << pos; // }); @@ -37,9 +34,12 @@ Sound::Sound(): }); } -Sound::~Sound() +bool Sound::initialize() { + setDefaultValue("Volume", 50); + m_player->setVolume(value("Volume").toInt()); + return SnoreSecondaryBackend::initialize(); } PluginSettingsWidget *Sound::settingsWidget() diff --git a/src/plugins/secondary_backends/sound/sound.h b/src/plugins/secondary_backends/sound/sound.h index 5f7379f..e104d9c 100644 --- a/src/plugins/secondary_backends/sound/sound.h +++ b/src/plugins/secondary_backends/sound/sound.h @@ -20,6 +20,8 @@ #include "libsnore/plugins/snorebackend.h" +class QMediaPlayer; + class Sound : public Snore::SnoreSecondaryBackend { Q_OBJECT @@ -27,14 +29,16 @@ class Sound : public Snore::SnoreSecondaryBackend Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json") public: Sound(); - ~Sound(); + ~Sound() = default; + + virtual bool initialize() override; Snore::PluginSettingsWidget *settingsWidget() override; public slots: void slotNotificationDisplayed(Snore::Notification notification) override; private: - class QMediaPlayer *m_player; + QMediaPlayer *m_player; }; #endif // SOUND_H diff --git a/src/plugins/secondary_backends/toasty/toasty.cpp b/src/plugins/secondary_backends/toasty/toasty.cpp index a5b846e..37a9fd9 100644 --- a/src/plugins/secondary_backends/toasty/toasty.cpp +++ b/src/plugins/secondary_backends/toasty/toasty.cpp @@ -27,17 +27,6 @@ using namespace Snore; -Toasty::Toasty(): - SnoreSecondaryBackend("Toasty") -{ - setDefaultValue("DeviceID", ""); -} - -Toasty::~Toasty() -{ - -} - void Toasty::slotNotify(Notification notification) { QString key = value("DeviceID").toString(); @@ -89,6 +78,12 @@ void Toasty::slotNotify(Notification notification) } +bool Toasty::initialize() +{ + setDefaultValue("DeviceID", ""); + return SnoreSecondaryBackend::initialize(); +} + PluginSettingsWidget *Toasty::settingsWidget() { return new ToastySettings(this); diff --git a/src/plugins/secondary_backends/toasty/toasty.h b/src/plugins/secondary_backends/toasty/toasty.h index 9f4d32a..9df5f2a 100644 --- a/src/plugins/secondary_backends/toasty/toasty.h +++ b/src/plugins/secondary_backends/toasty/toasty.h @@ -28,8 +28,10 @@ class Toasty : public Snore::SnoreSecondaryBackend Q_INTERFACES(Snore::SnoreSecondaryBackend) Q_PLUGIN_METADATA(IID "org.Snore.SecondaryNotificationBackend/1.0" FILE "plugin.json") public: - Toasty(); - ~Toasty(); + Toasty() = default; + ~Toasty() = default; + + bool initialize() override; Snore::PluginSettingsWidget *settingsWidget() override;