X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fqtmultimedianotificationbackend.cpp;h=2557a923a5dd1a0c65e8a17cad44142dd98e1208;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hp=612c91c7b42ddd8bd340226f37a997421e021d59;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf;p=quassel.git

diff --git a/src/qtui/qtmultimedianotificationbackend.cpp b/src/qtui/qtmultimedianotificationbackend.cpp
index 612c91c7..2557a923 100644
--- a/src/qtui/qtmultimedianotificationbackend.cpp
+++ b/src/qtui/qtmultimedianotificationbackend.cpp
@@ -18,13 +18,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "qtmultimedianotificationbackend.h"
+
 #include <QFileDialog>
-#include <QIcon>
 #include <QUrl>
-
-#include "qtmultimedianotificationbackend.h"
+#include <memory>
 
 #include "clientsettings.h"
+#include "icon.h"
 #include "mainwin.h"
 #include "qtui.h"
 
@@ -85,7 +86,7 @@ void QtMultimediaNotificationBackend::createMediaObject(const QString &file)
         return;
     }
 
-    _media.reset(new QMediaPlayer);
+    _media = std::make_unique<QMediaPlayer>();
     _media->setMedia(QUrl::fromLocalFile(file));
 }
 
@@ -96,14 +97,14 @@ QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent)
     : SettingsPage("Internal", "QtMultimediaNotification", parent)
 {
     ui.setupUi(this);
-    ui.enabled->setIcon(QIcon::fromTheme("media-playback-start"));
-    ui.play->setIcon(QIcon::fromTheme("media-playback-start"));
-    ui.open->setIcon(QIcon::fromTheme("document-open"));
+    ui.enabled->setIcon(icon::get("media-playback-start"));
+    ui.play->setIcon(icon::get("media-playback-start"));
+    ui.open->setIcon(icon::get("document-open"));
 
     _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<QMediaPlayer>();
             _audioPreview->setMedia(QUrl::fromLocalFile(ui.filename->text()));
             _audioPreview->play();
         }