From c3db2972257ee3aee70dbcbecc6c020e57ebb3b2 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Wed, 27 Feb 2019 07:50:47 +0100
Subject: [PATCH] Remove deprecated method

---
 generators/dvi/dviRenderer.cpp | 2 +-
 ui/presentationwidget.cpp      | 4 ++--
 ui/thumbnaillist.h             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generators/dvi/dviRenderer.cpp b/generators/dvi/dviRenderer.cpp
index 452a5d8ed..bf4b5acef 100644
--- a/generators/dvi/dviRenderer.cpp
+++ b/generators/dvi/dviRenderer.cpp
@@ -280,7 +280,7 @@ void dviRenderer::showThatSourceInformationIsPresent()
 
     QWidget *topcontents = new QWidget (&dialog);
     QVBoxLayout *topcontentsVBoxLayout = new QVBoxLayout(topcontents);
-    topcontentsVBoxLayout->setMargin(0);
+    topcontentsVBoxLayout->setContentsMargins(0, 0, 0, 0);
     topcontentsVBoxLayout->setSpacing(KDialog::spacingHint()*2);
     topcontentsVBoxLayout->setMargin(KDialog::marginHint()*2);
 
diff --git a/ui/presentationwidget.cpp b/ui/presentationwidget.cpp
index 0d299d165..a64309b86 100644
--- a/ui/presentationwidget.cpp
+++ b/ui/presentationwidget.cpp
@@ -172,7 +172,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc
     m_topBar = new PresentationToolBar( this );
     m_topBar->setObjectName( QStringLiteral( "presentationBar" ) );
     m_topBar->setMovable( false );
-    m_topBar->layout()->setMargin(0);
+    m_topBar->layout()->setContentsMargins(0, 0, 0, 0);
     m_topBar->addAction( QIcon::fromTheme( layoutDirection() == Qt::RightToLeft ? QStringLiteral("go-next") : QStringLiteral("go-previous") ), i18n( "Previous Page" ), this, SLOT(slotPrevPage()) );
     m_pagesEdit = new KLineEdit( m_topBar );
     QSizePolicy sp = m_pagesEdit->sizePolicy();
@@ -238,7 +238,7 @@ PresentationWidget::PresentationWidget( QWidget * parent, Okular::Document * doc
     // change topbar background color
     QPalette p = m_topBar->palette();
     p.setColor( QPalette::Active, QPalette::Button, Qt::gray );
-    p.setColor( QPalette::Active, QPalette::Background, Qt::darkGray );
+    p.setColor( QPalette::Active, QPalette::Window, Qt::darkGray );
     m_topBar->setPalette( p );
 
     // Grab swipe gestures to change pages
diff --git a/ui/thumbnaillist.h b/ui/thumbnaillist.h
index f80e88149..2d2b66335 100644
--- a/ui/thumbnaillist.h
+++ b/ui/thumbnaillist.h
@@ -80,7 +80,7 @@ class ThumbnailsBox : public QWidget
     Q_OBJECT
 
     public:
-        explicit ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setMargin(0); vbox->setSpacing(0);}
+        explicit ThumbnailsBox( QWidget * parent ) : QWidget( parent ) { QVBoxLayout *vbox = new QVBoxLayout(this); vbox->setContentsMargins(0, 0, 0, 0); vbox->setSpacing(0);}
         QSize sizeHint() const override { return QSize(); }
 };