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

10
desktop-widgets/divelistview.cpp
View file

@ -90,11 +90,17 @@ void DiveListView::resetModel()
void DiveListView::calculateInitialColumnWidth(int col)
{
const QFontMetrics metrics(defaultModelFont());
QString header_txt = MultiFilterSortModel::instance()->headerData(col, Qt::Horizontal, Qt::DisplayRole).toString();
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
int em = metrics.width('m');
int zw = metrics.width('0');
QString header_txt = MultiFilterSortModel::instance()->headerData(col, Qt::Horizontal, Qt::DisplayRole).toString();
int width = metrics.width(header_txt);
#else // QT 5.11 or newer
int em = metrics.horizontalAdvance('m');
int zw = metrics.horizontalAdvance('0');
int width = metrics.horizontalAdvance(header_txt);
#endif
int sw = 0;
switch (col) {
case DiveTripModelBase::NR: