Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / panels / information / phononwidget.cpp

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 1419f68be9b80e425b08b59285458db22817a93a..16dbabfed26d241ecec860fea081d1b9ab35a674 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -32,7 +32,8 @@
 #include <QToolButton>
 
 #include <KDialog>
-#include <KIcon>
+#include <QIcon>
+#include <KIconLoader>
 #include <KUrl>
 #include <KLocale>
 
@@ -123,16 +124,21 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         m_topLayout->addLayout(controlsLayout);
 
+        const int smallIconSize = IconSize(KIconLoader::Small);
+        const QSize buttonSize(smallIconSize, smallIconSize);
+
         m_playButton->setToolTip(i18n("play"));
-        m_playButton->setIconSize(QSize(16, 16));
-        m_playButton->setIcon(KIcon("media-playback-start"));
-        connect(m_playButton, SIGNAL(clicked()), this, SLOT(play()));
+        m_playButton->setIconSize(buttonSize);
+        m_playButton->setIcon(QIcon::fromTheme("media-playback-start"));
+        m_playButton->setAutoRaise(true);
+        connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
-        m_stopButton->setIconSize(QSize(16, 16));
-        m_stopButton->setIcon(KIcon("media-playback-stop"));
+        m_stopButton->setIconSize(buttonSize);
+        m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
+        m_stopButton->setAutoRaise(true);
         m_stopButton->hide();
-        connect(m_stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+        connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);
 
         m_seekSlider->setIconVisible(false);
 
@@ -172,10 +178,10 @@ void PhononWidget::play()
 {
     if (!m_media) {
         m_media = new Phonon::MediaObject(this);
-        connect(m_media, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
-                this, SLOT(stateChanged(Phonon::State)));
-        connect(m_media, SIGNAL(hasVideoChanged(bool)),
-                this, SLOT(slotHasVideoChanged(bool)));
+        connect(m_media, &Phonon::MediaObject::stateChanged,
+                this, &PhononWidget::stateChanged);
+        connect(m_media, &Phonon::MediaObject::hasVideoChanged,
+                this, &PhononWidget::slotHasVideoChanged);
         m_seekSlider->setMediaObject(m_media);
     }