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/prefs-macros.h | |
| 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/prefs-macros.h')
| -rw-r--r-- | core/prefs-macros.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/prefs-macros.h b/core/prefs-macros.h index 15a9a9867..16a92aa24 100644 --- a/core/prefs-macros.h +++ b/core/prefs-macros.h @@ -60,11 +60,11 @@ else \ prefs.field = defval -#define GET_TXT(name, field) \ - v = s.value(QString(name)); \ - if (v.isValid()) \ - prefs.field = strdup(v.toString().toUtf8().constData()); \ - else \ +#define GET_TXT(name, field) \ + v = s.value(QString(name)); \ + if (v.isValid()) \ + prefs.field = strdup(qPrintable(v.toString())); \ + else \ prefs.field = copy_string(default_prefs.field) #define SAVE_OR_REMOVE_SPECIAL(_setting, _default, _compare, _value) \ |