From 3797aa8211637598c83bce9c3f9f014eb5466003 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Wed, 2 Oct 2024 12:34:24 +0200 Subject: [PATCH] Qt6: Fix usage of deprecated QApplication::fontMetrics() --- .../cafPdmUiCore/cafQShortenedLabel.cpp | 10 +++++----- Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp index 9230fae456..a32ebb70ad 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafQShortenedLabel.cpp @@ -79,7 +79,7 @@ QSize QShortenedLabel::minimumSizeHint() const { const int minimumNumberOfCharacters = 10; - QFontMetrics fontMetrics = QApplication::fontMetrics(); + QFontMetrics fontMetrics( QApplication::font() ); QString fullLabelText = fullText(); QString shortenedText = fullLabelText.left( minimumNumberOfCharacters ); int minimumWidth = fontMetrics.horizontalAdvance( shortenedText ); @@ -118,8 +118,8 @@ QSize QShortenedLabel::minimumSizeHint() const //-------------------------------------------------------------------------------------------------- QSize QShortenedLabel::sizeHint() const { - QFontMetrics fontMetrics = QApplication::fontMetrics(); - QString labelText = fullText(); + QFontMetrics fontMetrics( QApplication::font() ); + QString labelText = fullText(); QStringList labelLines = labelText.split( "\n" ); int maxLineWidth = 0; @@ -147,8 +147,8 @@ void QShortenedLabel::resizeEvent( QResizeEvent* event ) //-------------------------------------------------------------------------------------------------- void caf::QShortenedLabel::resizeText( QSize paintSize ) { - QString labelText = fullText(); - QFontMetrics fontMetrics = QApplication::fontMetrics(); + QString labelText = fullText(); + QFontMetrics fontMetrics( QApplication::font() ); QStringList labelLines = labelText.split( "\n" ); int maxLineWidth = 0; diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp index f8adaf40b0..34f46ec044 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp @@ -153,7 +153,7 @@ QWidget* PdmUiColorEditor::createEditorWidget( QWidget* parent ) m_colorPreviewLabel->setText( QLatin1String( "..." ) ); m_colorPreviewLabel->setAlignment( Qt::AlignCenter ); - QFontMetrics fontMetrics = QApplication::fontMetrics(); + QFontMetrics fontMetrics( QApplication::font() ); buttonLayout->addWidget( m_colorPreviewLabel ); m_colorSelectionButton->setMinimumWidth( fontMetrics.boundingRect( m_colorPreviewLabel->text() ).width() + 15 );