Qt5: 'int QFontMetrics::width' is deprecated since Qt 5.11: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]

This commit is contained in:
wmayer
2020-06-10 12:27:50 +02:00
committed by wwmayer
parent db3f9008c0
commit 1ee3d79d7c
21 changed files with 107 additions and 29 deletions

View File

@@ -45,6 +45,7 @@
#include "FileDialog.h"
#include "MainWindow.h"
#include "BitmapFactory.h"
#include "Tools.h"
using namespace Gui;
@@ -779,8 +780,8 @@ void FileChooser::setFilter ( const QString& filter )
void FileChooser::setButtonText( const QString& txt )
{
button->setText( txt );
int w1 = 2*button->fontMetrics().width(txt);
int w2 = 2*button->fontMetrics().width(QLatin1String(" ... "));
int w1 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), txt);
int w2 = 2 * QtTools::horizontalAdvance(button->fontMetrics(), QLatin1String(" ... "));
button->setFixedWidth( (w1 > w2 ? w1 : w2) );
}