Remove deprecated methods

messagecomposer/src/followupreminder/followupreminderselectdatedialog.cpp

@@ -67,9 +67,9 @@ FollowUpReminderSelectDateDialog::FollowUpReminderSelectDateDialog(QWidget *pare
     topLayout->addWidget(mainWidget);
     topLayout->addWidget(buttonBox);
     QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     QFormLayout *formLayout = new QFormLayout;
-    formLayout->setMargin(0);
+    formLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->addLayout(formLayout);
 
     d->mDateComboBox = new KDateComboBox;

messagecomposer/src/imagescaling/imagescalingselectformat.cpp

@@ -101,7 +101,7 @@ ImageScalingSelectFormat::ImageScalingSelectFormat(QWidget *parent)
     : QWidget(parent)
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mFormat = new QLineEdit;
     connect(mFormat, &QLineEdit::textChanged, this, &ImageScalingSelectFormat::textChanged);
     mFormat->setReadOnly(true);

messagecomposer/src/recipient/distributionlistdialog.cpp

@@ -123,7 +123,7 @@ DistributionListDialog::DistributionListDialog(QWidget *parent)
     setModal(false);
 
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
 
     QBoxLayout *titleLayout = new QHBoxLayout();
     topLayout->addItem(titleLayout);

messagecomposer/src/recipient/recipientline.cpp

@@ -75,7 +75,7 @@ RecipientLineNG::RecipientLineNG(QWidget *parent)
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     QBoxLayout *topLayout = new QHBoxLayout(this);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
 
     const QStringList recipientTypes = Recipient::allTypeLabels();
 

messagecomposer/src/recipient/recipientseditorsidewidget.cpp

@@ -41,7 +41,7 @@ RecipientsEditorSideWidget::RecipientsEditorSideWidget(RecipientsEditor *view, Q
 {
     QBoxLayout *topLayout = new QVBoxLayout(this);
 
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->addStretch(1);
 
     mTotalLabel = new QLabel(this);

messagecomposer/src/recipient/recipientspickerwidget.cpp

@@ -30,7 +30,7 @@ RecipientsPickerWidget::RecipientsPickerWidget(QWidget *parent)
     : QWidget(parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     mView = new Akonadi::EmailAddressSelectionWidget(false, MessageComposer::RecipientsEditorManager::self()->model()->model(), this);
     layout->addWidget(mView);

messagecore/src/messagecoreutil.cpp

@@ -26,7 +26,7 @@ using namespace MessageCore;
 
 static bool isLightTheme()
 {
-    return qApp->palette().color(QPalette::Background).value() >= 128;
+    return qApp->palette().color(QPalette::Window).value() >= 128;
 }
 
 Q_GLOBAL_STATIC(ColorUtil, s_self)

messagelist/src/core/widgetbase.cpp

@@ -135,7 +135,7 @@ Widget::Widget(QWidget *pParent)
     setObjectName(QStringLiteral("messagelistwidget"));
 
     QVBoxLayout *g = new QVBoxLayout(this);
-    g->setMargin(0);
+    g->setContentsMargins(0, 0, 0, 0);
     g->setSpacing(0);
 
     d->quickSearchLine = new QuickSearchLine;

messagelist/src/core/widgets/quicksearchline.cpp

@@ -37,12 +37,12 @@ QuickSearchLine::QuickSearchLine(QWidget *parent)
     : QWidget(parent)
 {
     QVBoxLayout *vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->setSpacing(0);
 
     QWidget *w = new QWidget;
     QHBoxLayout *hbox = new QHBoxLayout;
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
     hbox->setSpacing(0);
     w->setLayout(hbox);
     vbox->addWidget(w);

messagelist/src/utils/configureaggregationsdialog.cpp

@@ -116,7 +116,7 @@ ConfigureAggregationsDialog::ConfigureAggregationsDialog(QWidget *parent)
     mainLayout->addWidget(buttonBox);
 
     QGridLayout *g = new QGridLayout(base);
-    g->setMargin(0);
+    g->setContentsMargins(0, 0, 0, 0);
 
     d->mAggregationList = new AggregationListWidget(base);
     d->mAggregationList->setSelectionMode(QAbstractItemView::ExtendedSelection);

messageviewer/src/dkim-verify/dkimconfiguretab.cpp

@@ -31,7 +31,7 @@ DKIMConfigureTab::DKIMConfigureTab(QWidget *parent)
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mTabWidget = new QTabWidget(this);
     mTabWidget->setObjectName(QStringLiteral("tabwidget"));

messageviewer/src/dkim-verify/dkimconfiguretabwidget.cpp

@@ -29,7 +29,7 @@ DKIMConfigureTabWidget::DKIMConfigureTabWidget(QWidget *parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 }
 
 DKIMConfigureTabWidget::~DKIMConfigureTabWidget()

messageviewer/src/dkim-verify/dkimconfigurewidget.cpp

@@ -30,7 +30,7 @@ DKIMConfigureWidget::DKIMConfigureWidget(QWidget *parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mTabWidget = new DKIMConfigureTab(this);
     mTabWidget->setObjectName(QStringLiteral("tabwidget"));

messageviewer/src/dkim-verify/dkimmanagerkeywidget.cpp

@@ -30,7 +30,7 @@ DKIMManagerKeyWidget::DKIMManagerKeyWidget(QWidget *parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mTreeWidget = new QTreeWidget(this);
     mTreeWidget->setObjectName(QStringLiteral("treewidget"));

messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp

@@ -62,8 +62,8 @@ TestCSSHelper::TestCSSHelper(const QPaintDevice *pd)
 
     QPalette pal;
 
-    pal.setColor(QPalette::Background, QColor(0xd6, 0xd2, 0xd0));
-    pal.setColor(QPalette::Foreground, QColor(0x22, 0x1f, 0x1e));
+    pal.setColor(QPalette::Window, QColor(0xd6, 0xd2, 0xd0));
+    pal.setColor(QPalette::WindowText, QColor(0x22, 0x1f, 0x1e));
     pal.setColor(QPalette::Highlight, QColor(0x43, 0xac, 0xe8));
     pal.setColor(QPalette::HighlightedText, QColor(0xff, 0xff, 0xff));
     pal.setColor(QPalette::Mid, QColor(0xb3, 0xab, 0xa7));

messageviewer/src/viewer/csshelperbase.cpp

@@ -662,7 +662,7 @@ QString CSSHelperBase::screenCssDefinitions(const CSSHelperBase *helper, bool fi
         .arg(headerFont)
         .arg(extraScreenCss(headerFont))
         .arg(pal.color(QPalette::Highlight).name())
-        .arg(pal.color(QPalette::Background).name())
+        .arg(pal.color(QPalette::Window).name())
         + quoteCSS + fullAddressList();
 }
 

messageviewer/src/viewer/viewer_p.cpp

@@ -1435,7 +1435,7 @@ void ViewerPrivate::createWidgets()
     //TODO: Make a MDN bar similar to Mozillas password bar and show MDNs here as soon as a
     //      MDN enabled message is shown.
     QVBoxLayout *vlay = new QVBoxLayout(q);
-    vlay->setMargin(0);
+    vlay->setContentsMargins(0, 0, 0, 0);
     mSplitter = new QSplitter(Qt::Vertical, q);
     connect(mSplitter, &QSplitter::splitterMoved, this, &ViewerPrivate::saveSplitterSizes);
     mSplitter->setObjectName(QStringLiteral("mSplitter"));
@@ -1451,13 +1451,13 @@ void ViewerPrivate::createWidgets()
 
     mBox = new QWidget(mSplitter);
     QHBoxLayout *mBoxHBoxLayout = new QHBoxLayout(mBox);
-    mBoxHBoxLayout->setMargin(0);
+    mBoxHBoxLayout->setContentsMargins(0, 0, 0, 0);
 
     mColorBar = new HtmlStatusBar(mBox);
     mBoxHBoxLayout->addWidget(mColorBar);
     QWidget *readerBox = new QWidget(mBox);
     QVBoxLayout *readerBoxVBoxLayout = new QVBoxLayout(readerBox);
-    readerBoxVBoxLayout->setMargin(0);
+    readerBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
     mBoxHBoxLayout->addWidget(readerBox);
 
     mColorBar->setObjectName(QStringLiteral("mColorBar"));

messageviewer/src/viewer/webengine/tests/testwebengineaccesskey.cpp

@@ -34,7 +34,7 @@ TestWidget::TestWidget(QWidget *parent)
 {
     WebEngineViewer::MessageViewerSettings::self()->setAccessKeyEnabled(true);
     QHBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
     TestWebEngineAccesskey *webEngine = new TestWebEngineAccesskey(this);
     hbox->addWidget(webEngine);
 

messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp

@@ -42,7 +42,7 @@ ViewerPluginTest::ViewerPluginTest(QWidget *parent)
     QWidget *toolManagerWidget = new QWidget(this);
     vbox->addWidget(toolManagerWidget);
     vbox = new QVBoxLayout;
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->setSpacing(0);
     toolManagerWidget->setLayout(vbox);
     MessageViewer::ViewerPluginToolManager *toolManager

messageviewer/src/widgets/mailsourceviewtextbrowserwidget.cpp

@@ -63,7 +63,7 @@ MailSourceViewTextBrowserWidget::MailSourceViewTextBrowserWidget(const QString &
     : QWidget(parent)
 {
     QVBoxLayout *lay = new QVBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget;
     mTextToSpeechWidget->setObjectName(QStringLiteral("texttospeech"));
     lay->addWidget(mTextToSpeechWidget);