diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-25 13:51:41 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-03-14 13:55:36 +0200 |
| commit | b72cc1f31784346884c8552c22f1e4c3c6d5ed1d (patch) | |
| tree | 00a04967dc56ccdc69ee998058c13911292ecef7 /profile-widget | |
| parent | 4e44fe7598430f9879736ec2d00b99b15dc05451 (diff) | |
| download | subsurface-b72cc1f31784346884c8552c22f1e4c3c6d5ed1d.tar.gz | |
Cleanup: consistently use qPrintable()
Replace constructs of the kind
s.toUtf8().data(),
s.toUtf8().constData(),
s.toLocal8Bit().data(),
s.toLocal8Bit.constData() or
qUtf8Printable(s)
by
qPrintable(s).
This is concise, consistent and - in principle - more performant than
the .data() versions.
Sadly, owing to a suboptimal implementation, qPrintable(s) currently
is a pessimization compared to s.toUtf8().data(). A fix is scheduled for
new Qt versions: https://codereview.qt-project.org/#/c/221331/
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/diveeventitem.cpp | 6 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index 8c8db6fd4..22c451e93 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -179,9 +179,9 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix) bool icd = isobaric_counterdiffusion(lastgasmix, mix, &icd_data); if (icd_data.dHe < 0) { put_format(&mb, "\n%s %s:%+.3g%% %s:%+.3g%%%s%+.3g%%", - tr("ICD").toUtf8().constData(), - tr("ΔHe").toUtf8().constData(), icd_data.dHe / 10.0, - tr("ΔN₂").toUtf8().constData(), icd_data.dN2 / 10.0, + qPrintable(tr("ICD")), + qPrintable(tr("ΔHe")), icd_data.dHe / 10.0, + qPrintable(tr("ΔN₂")), icd_data.dN2 / 10.0, icd ? ">" : "<", lrint(-icd_data.dHe / 5.0) / 10.0); name += QString::fromUtf8(mb.buffer, mb.len); free_buffer(&mb); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index b1ba31620..b65e76743 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1582,7 +1582,7 @@ void ProfileWidget2::changeGas() gasChangeEvent = gasChangeEvent->next; } } - validate_gas(gas.toUtf8().constData(), &gasmix); + validate_gas(qPrintable(gas), &gasmix); QRegExp rx("\\(\\D*(\\d+)"); int tank; if (rx.indexIn(action->text()) > -1) { @@ -1667,8 +1667,8 @@ void ProfileWidget2::editName() // order is important! first update the current dive (by matching the unchanged event), // then update the displayed dive (as event is part of the events on displayed dive // and will be freed as part of changing the name! - update_event_name(current_dive, event, newName.toUtf8().data()); - update_event_name(&displayed_dive, event, newName.toUtf8().data()); + update_event_name(current_dive, event, qPrintable(newName)); + update_event_name(&displayed_dive, event, qPrintable(newName)); invalidate_dive_cache(current_dive); mark_divelist_changed(true); replot(); |