anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-22 07:42:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt deprecation warn for getContentsMargins()

Browse Source 
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
This commit is contained in:
Scott Kostyshak 2020-03-06 09:07:31 -05:00
parent 339424ce00
commit 1c78b563ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt/GuiView.cpp
View File

@ -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) {