X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5f57256a2f293622c7a10844adae29190907b9eb..405aa4878f75:/src/panels/information/phononwidget.cpp diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index a71a77897..95f535713 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -20,21 +20,16 @@ #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 { @@ -109,10 +104,10 @@ void PhononWidget::showEvent(QShowEvent *event) if (!m_topLayout) { m_topLayout = new QVBoxLayout(this); - m_topLayout->setMargin(0); + m_topLayout->setContentsMargins(0, 0, 0, 0); QHBoxLayout *controlsLayout = new QHBoxLayout(this); - controlsLayout->setMargin(0); + controlsLayout->setContentsMargins(0, 0, 0, 0); controlsLayout->setSpacing(0); m_playButton = new QToolButton(this); @@ -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();