From: Scott Kostyshak <skostysh@lyx.org>
Date: Fri, 6 Mar 2020 14:07:31 +0000 (-0500)
Subject: Fix Qt deprecation warn for getContentsMargins()
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=35b26d84c41130c653bf42c566b16348b4c14f45;p=features.git

Fix Qt deprecation warn for getContentsMargins()

Fixes the following warning:

  error: ‘void QWidget::getContentsMargins(int*, int*, int*, int*) const’ is deprecated: use contentsMargins() [-Werror=deprecated-declarations]

The new code also has advantages in that 'l' can be set to const and
it is more readable because it is clear that only 'l' is used.

QWidget::getContentsMargins() was deprecated in 5.14.0 [1]. and
QWidget::contentsMargins() is available since 4.6 [2].

[1] https://code.qt.io/cgit/qt/qtbase.git/tree/dist/changes-5.14.0/?h=v5.14.0
[2] https://doc.qt.io/archives/qt-4.8/qlayout.html#contentsMargins
---

diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 6890c16ad4..c7a1bd9458 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -4604,8 +4604,8 @@ bool GuiView::lfunUiToggle(string const & ui_component)
 		menuBar()->setVisible(!menuBar()->isVisible());
 	} else
 	if (ui_component == "frame") {
-		int l, t, r, b;
-		getContentsMargins(&l, &t, &r, &b);
+		int const l = contentsMargins().left();
+
 		//are the frames in default state?
 		d.current_work_area_->setFrameStyle(QFrame::NoFrame);
 		if (l == 0) {