Fix PlacesItemModelTest::testDefaultViewProperties()

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index b8d3d6ef61a84f23499731657b77b05132dc7da6..95f535713c32b0f8d24b157ea1374f0b1d67ae53 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,16 +20,16 @@
 
 #include "phononwidget.h"
 
+#include <KIconLoader>
+#include <KLocalizedString>
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
 #include <Phonon/VideoWidget>
 
-#include <QVBoxLayout>
 #include <QShowEvent>
 #include <QToolButton>
-#include <KIconLoader>
-#include <KLocalizedString>
+#include <QVBoxLayout>
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
@@ -104,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);
@@ -167,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();