From 37db4d84ec4580584bcfae0ad9e8c0e8ad6d93c8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 24 Nov 2020 08:12:00 +0100
Subject: [PATCH] Fully compilable for Qt 6, removed some obsolete code.

---
 .../dynamic-shortcuts/dynamicshortcutswidget.cpp          | 5 +----
 src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp     | 5 +----
 src/librssguard/gui/feedmessageviewer.cpp                 | 8 +++-----
 src/librssguard/gui/widgetwithstatus.cpp                  | 6 ++----
 .../services/gmail/gui/emailrecipientcontrol.cpp          | 6 +-----
 src/librssguard/services/gmail/gui/formaddeditemail.cpp   | 6 +-----
 6 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
index 3409c612a..3fdc6340e 100644
--- a/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
+++ b/src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp
@@ -12,10 +12,7 @@
 DynamicShortcutsWidget::DynamicShortcutsWidget(QWidget* parent) : QWidget(parent) {
   // Create layout for this control and set is as active.
   m_layout = new QGridLayout(this);
-
-#if QT_VERSION_MAJOR <= 5
-  m_layout->setMargin(0);
-#endif
+  m_layout->setContentsMargins({});
 
   setLayout(m_layout);
 }
diff --git a/src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp b/src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp
index e90cf1227..77cce2ef9 100644
--- a/src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp
+++ b/src/librssguard/dynamic-shortcuts/shortcutcatcher.cpp
@@ -13,10 +13,7 @@ ShortcutCatcher::ShortcutCatcher(QWidget* parent)
   // Setup layout of the control
   m_layout = new QHBoxLayout(this);
 
-#if QT_VERSION_MAJOR <= 5
-  m_layout->setMargin(0);
-#endif
-
+  m_layout->setContentsMargins({});
   m_layout->setSpacing(1);
 
   // Create reset button.
diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp
index f82437929..f6d537c16 100644
--- a/src/librssguard/gui/feedmessageviewer.cpp
+++ b/src/librssguard/gui/feedmessageviewer.cpp
@@ -259,11 +259,9 @@ void FeedMessageViewer::initializeViews() {
   auto* message_layout = new QVBoxLayout(m_messagesWidget);
 
   // Set layout properties.
-#if QT_VERSION_MAJOR <= 5
-  central_layout->setMargin(0);
-  feed_layout->setMargin(0);
-  message_layout->setMargin(0);
-#endif
+  central_layout->setContentsMargins({});
+  feed_layout->setContentsMargins({});
+  message_layout->setContentsMargins({});
 
   central_layout->setSpacing(0);
   feed_layout->setSpacing(0);
diff --git a/src/librssguard/gui/widgetwithstatus.cpp b/src/librssguard/gui/widgetwithstatus.cpp
index 48ea56626..42fe726d3 100644
--- a/src/librssguard/gui/widgetwithstatus.cpp
+++ b/src/librssguard/gui/widgetwithstatus.cpp
@@ -19,12 +19,10 @@ WidgetWithStatus::WidgetWithStatus(QWidget* parent)
   m_iconOk = qApp->icons()->fromTheme(QSL("dialog-yes"));
 
   // Set layout properties.
-#if QT_VERSION_MAJOR <= 5
-  m_layout->setMargin(0);
-#endif
+  m_layout->setContentsMargins({});
 
   setLayout(m_layout);
-  setStatus(StatusType::Information, QString());
+  setStatus(StatusType::Information, {});
 }
 
 void WidgetWithStatus::setStatus(WidgetWithStatus::StatusType status, const QString& tooltip_text) {
diff --git a/src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp b/src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp
index 2203a1ffc..4e527096f 100644
--- a/src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp
+++ b/src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp
@@ -19,11 +19,7 @@ EmailRecipientControl::EmailRecipientControl(const QString& recipient, QWidget*
   lay->addWidget(m_txtRecipient = new QLineEdit(this), 1);
   lay->addWidget(m_btnCloseMe = new PlainToolButton(this));
 
-#if QT_VERSION_MAJOR <= 5
-  lay->setMargin(0);
-#endif
-
-  lay->setContentsMargins(0, 0, 0, 0);
+  lay->setContentsMargins({});
 
   m_cmbRecipientType->setFocusPolicy(Qt::FocusPolicy::NoFocus);
   m_btnCloseMe->setFocusPolicy(Qt::FocusPolicy::NoFocus);
diff --git a/src/librssguard/services/gmail/gui/formaddeditemail.cpp b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
index 6475d342b..83f1a437d 100644
--- a/src/librssguard/services/gmail/gui/formaddeditemail.cpp
+++ b/src/librssguard/services/gmail/gui/formaddeditemail.cpp
@@ -23,11 +23,7 @@ FormAddEditEmail::FormAddEditEmail(GmailServiceRoot* root, QWidget* parent)
 
   GuiUtilities::applyDialogProperties(*this, qApp->icons()->fromTheme(QSL("mail-message-new")));
 
-#if QT_VERSION_MAJOR <= 5
-  m_ui.m_layoutAdder->setMargin(0);
-#endif
-
-  m_ui.m_layoutAdder->setContentsMargins(0, 0, 0, 0);
+  m_ui.m_layoutAdder->setContentsMargins({});
 
   m_ui.m_btnAdder->setIcon(qApp->icons()->fromTheme(QSL("list-add")));
   m_ui.m_btnAdder->setToolTip(tr("Add new recipient."));