Merge branch 'frameworks'

1 files changed, 16 insertions, 16 deletions

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 63f5aa3a5..1d6361f19 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -30,11 +30,11 @@
 #include <QHBoxLayout>
 #include <QShowEvent>
 #include <QToolButton>
-
-#include <KDialog>
-#include <KIcon>
-#include <KUrl>
-#include <KLocale>
+#include <QDialog>
+#include <QIcon>
+#include <KIconLoader>
+#include <QUrl>
+#include <KLocalizedString>
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
@@ -72,7 +72,7 @@ PhononWidget::PhononWidget(QWidget *parent)
 {
 }
 
-void PhononWidget::setUrl(const KUrl &url)
+void PhononWidget::setUrl(const QUrl &url)
 {
     if (m_url != url) {
         stop(); // emits playingStopped() signal
@@ -80,7 +80,7 @@ void PhononWidget::setUrl(const KUrl &url)
     }
 }
 
-KUrl PhononWidget::url() const
+QUrl PhononWidget::url() const
 {
     return m_url;
 }
@@ -108,7 +108,7 @@ void PhononWidget::showEvent(QShowEvent *event)
     if (!m_topLayout) {
         m_topLayout = new QVBoxLayout(this);
         m_topLayout->setMargin(0);
-        m_topLayout->setSpacing(KDialog::spacingHint());
+
         QHBoxLayout *controlsLayout = new QHBoxLayout(this);
         controlsLayout->setMargin(0);
         controlsLayout->setSpacing(0);
@@ -128,16 +128,16 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         m_playButton->setToolTip(i18n("play"));
         m_playButton->setIconSize(buttonSize);
-        m_playButton->setIcon(KIcon("media-playback-start"));
+        m_playButton->setIcon(QIcon::fromTheme("media-playback-start"));
         m_playButton->setAutoRaise(true);
-        connect(m_playButton, SIGNAL(clicked()), this, SLOT(play()));
+        connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
         m_stopButton->setIconSize(buttonSize);
-        m_stopButton->setIcon(KIcon("media-playback-stop"));
+        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);
 
@@ -183,10 +183,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);
     }