diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 17:58:59 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-12 05:43:37 +0000 |
| commit | 23849826b490c07d9ba656bcb4ac46edd3040c0a (patch) | |
| tree | 5a96b82fda56c54b12eb6778839172b4853c2eef /src/sql/kernel/qsqlresult.cpp | |
| parent | b62bff2ef3a6c846462e5381664651f49944261a (diff) | |
Sweep of int-ish → char-ish types near calls to QString::fromU*()
The fromUtf16(ushort*) and fromUcs4(uint*) overloads are going
to be deprecated. Use the newer fromUtf16(char16_t*) and
fromUcs4(char32_t*) overloads.
As a drive-by, use std::end()/std::size() where applicable.
Change-Id: I5a93e38cae4a2e33d49c90d06c5f14f7cb7ce90c
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/sql/kernel/qsqlresult.cpp')
| -rw-r--r-- | src/sql/kernel/qsqlresult.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp index 69c9dcbac91..686677a8e7c 100644 --- a/src/sql/kernel/qsqlresult.cpp +++ b/src/sql/kernel/qsqlresult.cpp @@ -61,9 +61,9 @@ QString QSqlResultPrivate::holderAt(int index) const // return a unique id for bound names QString QSqlResultPrivate::fieldSerial(int i) const { - ushort arr[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - ushort *end = &arr[(sizeof(arr)/sizeof(*arr))]; - ushort *ptr = end; + char16_t arr[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + auto end = std::end(arr); + auto ptr = end; while (i > 0) { *(--ptr) = 'a' + i % 16; |