mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

code cleanup: QFontMetrics::width() is deprecated

Browse source 
Qt5.11 introduced the suggested replacement QFontMetrics::horizontalAdvance().

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-01 17:14:15 -08:00
parent 042799eb2a
commit afd53be6f5
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/mainwindow.cpp
View file

@ -97,7 +97,11 @@ extern "C" int updateProgress(const char *text)
if (progressDialog) {
// apparently we don't always get enough space to show the full label
// so let's manually make enough space (but don't shrink the existing size)
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
int width = QFontMetrics(qApp->font()).width(text) + 100;
#else // QT 5.11 or newer
int width = QFontMetrics(qApp->font()).horizontalAdvance(text) + 100;
#endif
if (width > progressDialog->width())
progressDialog->resize(width + 20, progressDialog->height());
progressDialog->setLabelText(text);