X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtmultimedianotificationbackend.cpp;h=a936971066f2181f773a96fa74215dff95b3f044;hp=afffd04d38c00becd019486b365371878f6babef;hb=2c8434f74c68194d56f2084f637419123e61d18b;hpb=b7447afe8e836376776dac26704e227a678d2913 diff --git a/src/qtui/qtmultimedianotificationbackend.cpp b/src/qtui/qtmultimedianotificationbackend.cpp index afffd04d..a9369710 100644 --- a/src/qtui/qtmultimedianotificationbackend.cpp +++ b/src/qtui/qtmultimedianotificationbackend.cpp @@ -22,6 +22,7 @@ #include #include +#include #include "clientsettings.h" #include "icon.h" @@ -32,8 +33,8 @@ QtMultimediaNotificationBackend::QtMultimediaNotificationBackend(QObject *parent : AbstractNotificationBackend(parent) { NotificationSettings notificationSettings; - notificationSettings.notify("QtMultimedia/Enabled", this, SLOT(enabledChanged(const QVariant &))); - notificationSettings.notify("QtMultimedia/AudioFile", this, SLOT(audioFileChanged(const QVariant &))); + notificationSettings.notify("QtMultimedia/Enabled", this, &QtMultimediaNotificationBackend::enabledChanged); + notificationSettings.notify("QtMultimedia/AudioFile", this, &QtMultimediaNotificationBackend::audioFileChanged); createMediaObject(notificationSettings.value("QtMultimedia/AudioFile", QString()).toString()); @@ -85,7 +86,7 @@ void QtMultimediaNotificationBackend::createMediaObject(const QString &file) return; } - _media.reset(new QMediaPlayer); + _media = std::make_unique(); _media->setMedia(QUrl::fromLocalFile(file)); } @@ -102,8 +103,8 @@ QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent) _audioAvailable = (QMediaPlayer().availability() == QMultimedia::Available); - connect(ui.enabled, SIGNAL(toggled(bool)), SLOT(widgetChanged())); - connect(ui.filename, SIGNAL(textChanged(const QString &)), SLOT(widgetChanged())); + connect(ui.enabled, &QAbstractButton::toggled, this, &ConfigWidget::widgetChanged); + connect(ui.filename, &QLineEdit::textChanged, this, &ConfigWidget::widgetChanged); } @@ -177,7 +178,7 @@ void QtMultimediaNotificationBackend::ConfigWidget::on_play_clicked() { if (_audioAvailable) { if (!ui.filename->text().isEmpty()) { - _audioPreview.reset(new QMediaPlayer); + _audioPreview = std::make_unique(); _audioPreview->setMedia(QUrl::fromLocalFile(ui.filename->text())); _audioPreview->play(); }