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 /core/divecomputer.cpp | |
| 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 'core/divecomputer.cpp')
| -rw-r--r-- | core/divecomputer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp index 43219ed05..08b6948d4 100644 --- a/core/divecomputer.cpp +++ b/core/divecomputer.cpp @@ -57,11 +57,11 @@ const DiveComputerNode *DiveComputerList::get(const QString &m) void DiveComputerNode::showchanges(const QString &n, const QString &s, const QString &f) const { if (nickName != n) - qDebug("new nickname %s for DC model %s deviceId 0x%x", n.toUtf8().data(), model.toUtf8().data(), deviceId); + qDebug("new nickname %s for DC model %s deviceId 0x%x", qPrintable(n), qPrintable(model), deviceId); if (serialNumber != s) - qDebug("new serial number %s for DC model %s deviceId 0x%x", s.toUtf8().data(), model.toUtf8().data(), deviceId); + qDebug("new serial number %s for DC model %s deviceId 0x%x", qPrintable(s), qPrintable(model), deviceId); if (firmware != f) - qDebug("new firmware version %s for DC model %s deviceId 0x%x", f.toUtf8().data(), model.toUtf8().data(), deviceId); + qDebug("new firmware version %s for DC model %s deviceId 0x%x", qPrintable(f), qPrintable(model), deviceId); } void DiveComputerList::addDC(QString m, uint32_t d, QString n, QString s, QString f) @@ -132,8 +132,8 @@ extern "C" void call_for_each_dc (void *f, void (*callback)(void *, const char * found = true; } if (found) - callback(f, node->model.toUtf8().data(), node->deviceId, node->nickName.toUtf8().data(), - node->serialNumber.toUtf8().data(), node->firmware.toUtf8().data()); + callback(f, qPrintable(node->model), node->deviceId, qPrintable(node->nickName), + qPrintable(node->serialNumber), qPrintable(node->firmware)); } } |