modernize: Use std::make_unique

[quassel.git] / src / qtui / qtmultimedianotificationbackend.cpp

diff --git a/src/qtui/qtmultimedianotificationbackend.cpp b/src/qtui/qtmultimedianotificationbackend.cpp
index 612c91c..3a32cb1 100644 (file)
--- a/src/qtui/qtmultimedianotificationbackend.cpp
+++ b/src/qtui/qtmultimedianotificationbackend.cpp
@@ -18,13 +18,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 

+#include "qtmultimedianotificationbackend.h"
+

 #include <QFileDialog>
 #include <QFileDialog>

-#include <QIcon>

 #include <QUrl>
 #include <QUrl>

-
-#include "qtmultimedianotificationbackend.h"
+#include <memory>

 
 #include "clientsettings.h"
 
 #include "clientsettings.h"

+#include "icon.h"

 #include "mainwin.h"
 #include "qtui.h"
 
 #include "mainwin.h"
 #include "qtui.h"
 


@@ -85,7 +86,7 @@ void QtMultimediaNotificationBackend::createMediaObject(const QString &file)
         return;
     }
 
         return;
     }
 

-    _media.reset(new QMediaPlayer);
+    _media = std::make_unique<QMediaPlayer>();

     _media->setMedia(QUrl::fromLocalFile(file));
 }
 
     _media->setMedia(QUrl::fromLocalFile(file));
 }
 


@@ -96,9 +97,9 @@ QtMultimediaNotificationBackend::ConfigWidget::ConfigWidget(QWidget *parent)
     : SettingsPage("Internal", "QtMultimediaNotification", parent)
 {
     ui.setupUi(this);
     : 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);
 
 
     _audioAvailable = (QMediaPlayer().availability() == QMultimedia::Available);
 


@@ -177,7 +178,7 @@ void QtMultimediaNotificationBackend::ConfigWidget::on_play_clicked()
 {
     if (_audioAvailable) {
         if (!ui.filename->text().isEmpty()) {
 {
     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();
         }
             _audioPreview->setMedia(QUrl::fromLocalFile(ui.filename->text()));
             _audioPreview->play();
         }