VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-10-01 09:16:39 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1447 from pinkavaj/pi-depr6

Browse Source 
Replace deprecated Qt font and layout functions
This commit is contained in:
Edouard Griffiths 2022-09-25 23:06:30 +02:00 committed by GitHub
commit 180c840633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrgui/gui/scaleengine.cpp
View File

@ -92,7 +92,7 @@ void ScaleEngine::calcCharSize()
float size; float size;
float max = 0.0f; float max = 0.0f;
for(i = 0; i < str.length(); i++) { for(i = 0; i < str.length(); i++) {
size = fontMetrics.width(QString(str[i])); size = fontMetrics.horizontalAdvance(QString(str[i]));
if(size > max) if(size > max)
max = size; max = size;
} }

2
sdrgui/gui/workspace.cpp
View File

@ -56,7 +56,7 @@ Workspace::Workspace(int index, QWidget *parent, Qt::WindowFlags flags) :
m_titleBar = new QWidget(); m_titleBar = new QWidget();
m_titleBarLayout = new QHBoxLayout(); m_titleBarLayout = new QHBoxLayout();
m_titleBarLayout->setMargin(0); m_titleBarLayout->setContentsMargins(QMargins());
m_titleBar->setLayout(m_titleBarLayout); m_titleBar->setLayout(m_titleBarLayout);
m_titleLabel = new QLabel(); m_titleLabel = new QLabel();