From 01227143acaadf036e8f8772c3337809a0c87230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= Date: Sun, 25 Sep 2022 20:05:09 +0200 Subject: [PATCH 1/2] Replace deprecated FontMetrics.width() with horizontalAdvance --- sdrgui/gui/scaleengine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdrgui/gui/scaleengine.cpp b/sdrgui/gui/scaleengine.cpp index d5f30f8e7..c096a16f7 100644 --- a/sdrgui/gui/scaleengine.cpp +++ b/sdrgui/gui/scaleengine.cpp @@ -92,7 +92,7 @@ void ScaleEngine::calcCharSize() float size; float max = 0.0f; for(i = 0; i < str.length(); i++) { - size = fontMetrics.width(QString(str[i])); + size = fontMetrics.horizontalAdvance(QString(str[i])); if(size > max) max = size; } From 50307e0f61a41894b7f985869e45344071b710da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pinkava?= Date: Sun, 25 Sep 2022 20:53:16 +0200 Subject: [PATCH 2/2] Replace depreceted QWidget.setMargin with setContentsMargins --- sdrgui/gui/workspace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdrgui/gui/workspace.cpp b/sdrgui/gui/workspace.cpp index d4632707f..830b9aeed 100644 --- a/sdrgui/gui/workspace.cpp +++ b/sdrgui/gui/workspace.cpp @@ -56,7 +56,7 @@ Workspace::Workspace(int index, QWidget *parent, Qt::WindowFlags flags) : m_titleBar = new QWidget(); m_titleBarLayout = new QHBoxLayout(); - m_titleBarLayout->setMargin(0); + m_titleBarLayout->setContentsMargins(QMargins()); m_titleBar->setLayout(m_titleBarLayout); m_titleLabel = new QLabel();