X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a67dab505adfc6a7a0c08f21d1dd1ead046e044c..105fe62eeb3ec3258a35400a1e6cb2901e01ac2d:/src/panels/information/phononwidget.cpp diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index ac4a32506..494429b8c 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -20,28 +20,23 @@ #include "phononwidget.h" +#include +#include #include -#include #include #include #include -#include -#include #include #include -#include -#include -#include -#include -#include +#include class EmbeddedVideoPlayer : public Phonon::VideoWidget { Q_OBJECT public: - EmbeddedVideoPlayer(QWidget *parent = 0) : + EmbeddedVideoPlayer(QWidget *parent = nullptr) : Phonon::VideoWidget(parent) { } @@ -52,7 +47,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget updateGeometry(); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint(); } @@ -64,13 +59,13 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget PhononWidget::PhononWidget(QWidget *parent) : QWidget(parent), m_url(), - m_playButton(0), - m_stopButton(0), - m_topLayout(0), - m_media(0), - m_seekSlider(0), - m_audioOutput(0), - m_videoPlayer(0) + m_playButton(nullptr), + m_stopButton(nullptr), + m_topLayout(nullptr), + m_media(nullptr), + m_seekSlider(nullptr), + m_audioOutput(nullptr), + m_videoPlayer(nullptr) { } @@ -172,7 +167,7 @@ void PhononWidget::stateChanged(Phonon::State newstate) m_videoPlayer->hide(); } emit hasVideoChanged(false); - // fall through + Q_FALLTHROUGH(); default: m_stopButton->hide(); m_playButton->show();