Revert "Update kconf update script version to 6"

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index fa4b9e2266e65a6d37533e6454bccfbfa12c5a53..3365998f4845249dc13d2e6c6ccad1eb3621a991 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -7,10 +7,10 @@
 #include "phononwidget.h"
 
 #include <KLocalizedString>
 #include "phononwidget.h"
 
 #include <KLocalizedString>

-#include <Phonon/AudioOutput>
-#include <Phonon/MediaObject>
-#include <Phonon/SeekSlider>
-#include <Phonon/VideoWidget>
+#include <phonon/AudioOutput>
+#include <phonon/MediaObject>
+#include <phonon/SeekSlider>
+#include <phonon/VideoWidget>

 
 #include <QShowEvent>
 #include <QStyle>
 
 #include <QShowEvent>
 #include <QStyle>


@@ -21,37 +21,37 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
     Q_OBJECT
 
 {
     Q_OBJECT
 

-    public:
-        EmbeddedVideoPlayer(QWidget *parent = nullptr) :
-            Phonon::VideoWidget(parent)
-        {
-        }
+public:
+    EmbeddedVideoPlayer(QWidget *parent = nullptr)
+        : Phonon::VideoWidget(parent)
+    {
+    }

 
 

-        void setSizeHint(const QSize& size)
-        {
-            m_sizeHint = size;
-            updateGeometry();
-        }
+    void setSizeHint(const QSize &size)
+    {
+        m_sizeHint = size;
+        updateGeometry();
+    }

 
 

-        QSize sizeHint() const override
-        {
-            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
-        }
+    QSize sizeHint() const override
+    {
+        return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
+    }

 
 

-    private:
-        QSize m_sizeHint;
+private:
+    QSize m_sizeHint;

 };
 
 PhononWidget::PhononWidget(QWidget *parent)
 };
 
 PhononWidget::PhononWidget(QWidget *parent)

-    : QWidget(parent),
-    m_url(),
-    m_playButton(nullptr),
-    m_pauseButton(nullptr),
-    m_topLayout(nullptr),
-    m_media(nullptr),
-    m_seekSlider(nullptr),
-    m_audioOutput(nullptr),
-    m_videoPlayer(nullptr)
+    : QWidget(parent)
+    , m_url()
+    , m_playButton(nullptr)
+    , m_pauseButton(nullptr)
+    , m_topLayout(nullptr)
+    , m_media(nullptr)
+    , m_seekSlider(nullptr)
+    , m_audioOutput(nullptr)
+    , m_videoPlayer(nullptr)

 {
 }
 
 {
 }
 


@@ -99,7 +99,7 @@ bool PhononWidget::eventFilter(QObject *object, QEvent *event)
 {
     Q_UNUSED(object)
     if (event->type() == QEvent::MouseButtonPress) {
 {
     Q_UNUSED(object)
     if (event->type() == QEvent::MouseButtonPress) {

-        const QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        const QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);

         if (mouseEvent->button() == Qt::LeftButton) {
             // toggle playback
             togglePlayback();
         if (mouseEvent->button() == Qt::LeftButton) {
             // toggle playback
             togglePlayback();


@@ -109,7 +109,7 @@ bool PhononWidget::eventFilter(QObject *object, QEvent *event)
     return false;
 }
 
     return false;
 }
 

-void PhononWidget::setVideoSize(const QSize& size)
+void PhononWidget::setVideoSize(const QSize &size)

 {
     if (m_videoSize != size) {
         m_videoSize = size;
 {
     if (m_videoSize != size) {
         m_videoSize = size;


@@ -201,10 +201,8 @@ void PhononWidget::play()
 {
     if (!m_media) {
         m_media = new Phonon::MediaObject(this);
 {
     if (!m_media) {
         m_media = new Phonon::MediaObject(this);

-        connect(m_media, &Phonon::MediaObject::stateChanged,
-                this, &PhononWidget::stateChanged);
-        connect(m_media, &Phonon::MediaObject::finished,
-                this, &PhononWidget::finished);
+        connect(m_media, &Phonon::MediaObject::stateChanged, this, &PhononWidget::stateChanged);
+        connect(m_media, &Phonon::MediaObject::finished, this, &PhononWidget::finished);

         m_seekSlider->setMediaObject(m_media);
     }
 
         m_seekSlider->setMediaObject(m_media);
     }
 


@@ -223,7 +221,7 @@ void PhononWidget::play()
     }
 
     if (m_isVideo) {
     }
 
     if (m_isVideo) {

-        emit hasVideoChanged(true);
+        Q_EMIT hasVideoChanged(true);

     }
 
     if (m_url != m_media->currentSource().url()) {
     }
 
     if (m_url != m_media->currentSource().url()) {


@@ -238,7 +236,7 @@ void PhononWidget::finished()
 {
     if (m_isVideo) {
         m_videoPlayer->hide();
 {
     if (m_isVideo) {
         m_videoPlayer->hide();

-        emit hasVideoChanged(false);
+        Q_EMIT hasVideoChanged(false);

     }
 }
 
     }
 }
 


@@ -252,7 +250,7 @@ void PhononWidget::stop()
     if (m_media) {
         m_media->stop();
         m_videoPlayer->hide();
     if (m_media) {
         m_media->stop();
         m_videoPlayer->hide();

-        emit hasVideoChanged(false);
+        Q_EMIT hasVideoChanged(false);

     }
 }
 
     }
 }
 


@@ -263,4 +261,5 @@ void PhononWidget::applyVideoSize()
     }
 }
 
     }
 }
 

+#include "moc_phononwidget.cpp"

 #include "phononwidget.moc"
 #include "phononwidget.moc"