From 641f94aa123dbcd638569bcffed83b0941100ec1 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Sun, 26 Apr 2015 15:37:47 +0200 Subject: [PATCH] use new style connect --- src/libsnore/plugins/snorebackend.cpp | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/libsnore/plugins/snorebackend.cpp b/src/libsnore/plugins/snorebackend.cpp index 6a36e37..31bbbae 100644 --- a/src/libsnore/plugins/snorebackend.cpp +++ b/src/libsnore/plugins/snorebackend.cpp @@ -49,11 +49,11 @@ bool SnoreBackend::initialize() return false; } - connect(SnoreCorePrivate::instance(), SIGNAL(applicationRegistered(Snore::Application)), this, SLOT(slotRegisterApplication(Snore::Application)), Qt::QueuedConnection); - connect(SnoreCorePrivate::instance(), SIGNAL(applicationDeregistered(Snore::Application)), this, SLOT(slotDeregisterApplication(Snore::Application)), Qt::QueuedConnection); + connect(SnoreCorePrivate::instance(), &SnoreCorePrivate::applicationRegistered, this, &SnoreBackend::slotRegisterApplication, Qt::QueuedConnection); + connect(SnoreCorePrivate::instance(), &SnoreCorePrivate::applicationDeregistered, this, &SnoreBackend::slotDeregisterApplication, Qt::QueuedConnection); - connect(this, SIGNAL(notificationClosed(Snore::Notification)), SnoreCorePrivate::instance(), SLOT(slotNotificationClosed(Snore::Notification)), Qt::QueuedConnection); - connect(SnoreCorePrivate::instance(), SIGNAL(notify(Snore::Notification)), this, SLOT(slotNotify(Snore::Notification)), Qt::QueuedConnection); + connect(this, &SnoreBackend::notificationClosed, SnoreCorePrivate::instance(), &SnoreCorePrivate::slotNotificationClosed, Qt::QueuedConnection); + connect(SnoreCorePrivate::instance(), &SnoreCorePrivate::notify, this, &SnoreBackend::slotNotify, Qt::QueuedConnection); for (const Application &a : SnoreCore::instance().aplications()) { this->slotRegisterApplication(a); @@ -62,6 +62,22 @@ bool SnoreBackend::initialize() return true; } +bool SnoreBackend::deinitialize() +{ + if (SnorePlugin::deinitialize()) { + for (const Application &a : SnoreCore::instance().aplications()) { + slotDeregisterApplication(a); + } + disconnect(SnoreCorePrivate::instance(), &SnoreCorePrivate::applicationRegistered, this, &SnoreBackend::slotRegisterApplication); + disconnect(SnoreCorePrivate::instance(), &SnoreCorePrivate::applicationDeregistered, this, &SnoreBackend::slotDeregisterApplication); + + disconnect(this, &SnoreBackend::notificationClosed, SnoreCorePrivate::instance(), &SnoreCorePrivate::slotNotificationClosed); + disconnect(SnoreCorePrivate::instance(), &SnoreCorePrivate::notify, this, &SnoreBackend::slotNotify); + return true; + } + return false; +} + void SnoreBackend::requestCloseNotification(Notification notification, Notification::CloseReasons reason) { if (canCloseNotification() && notification.isValid()) { @@ -166,22 +182,6 @@ void SnoreBackend::slotDeregisterApplication(const Application &application) Q_UNUSED(application); } -bool SnoreBackend::deinitialize() -{ - if (SnorePlugin::deinitialize()) { - for (const Application &a : SnoreCore::instance().aplications()) { - slotDeregisterApplication(a); - } - disconnect(SnoreCorePrivate::instance(), SIGNAL(applicationRegistered(Snore::Application)), this, SLOT(slotRegisterApplication(Snore::Application))); - disconnect(SnoreCorePrivate::instance(), SIGNAL(applicationDeregistered(Snore::Application)), this, SLOT(slotDeregisterApplication(Snore::Application))); - - disconnect(this, SIGNAL(notificationClosed(Snore::Notification)), SnoreCorePrivate::instance(), SLOT(slotNotificationClosed(Snore::Notification))); - disconnect(SnoreCorePrivate::instance(), SIGNAL(notify(Snore::Notification)), this, SLOT(slotNotify(Snore::Notification))); - return true; - } - return false; -} - void SnoreBackend::slotNotificationDisplayed(Notification notification) { notification.addActiveIn(this);