diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-18 15:22:16 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-20 11:15:56 +0000 |
| commit | d4b7c81e9e77a38dd294e52f65ed5426b40f1396 (patch) | |
| tree | e65d5909b75b311fb47c4dbea161bc4eadf10aad /src/corelib/text/qcollator_posix.cpp | |
| parent | cb8ece3cbd118c8b49513af1457f5d84df4e99dd (diff) | |
QCollator: Extract Method Private::ensureInitialized()
Avoids repetition of if (d->dirty) d->init() all over the place.
Pick-to: 6.4
Change-Id: Ifc819151b7c694e6cc1f48bbb837b37d108ca49a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text/qcollator_posix.cpp')
| -rw-r--r-- | src/corelib/text/qcollator_posix.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/text/qcollator_posix.cpp b/src/corelib/text/qcollator_posix.cpp index b409dbd96d..bddb748535 100644 --- a/src/corelib/text/qcollator_posix.cpp +++ b/src/corelib/text/qcollator_posix.cpp @@ -50,8 +50,8 @@ int QCollator::compare(QStringView s1, QStringView s2) const if (d->isC()) return s1.compare(s2, caseSensitivity()); - if (d->dirty) - d->init(); + + d->ensureInitialized(); QVarLengthArray<wchar_t> array1, array2; stringToWCharArray(array1, s1); @@ -61,8 +61,7 @@ int QCollator::compare(QStringView s1, QStringView s2) const QCollatorSortKey QCollator::sortKey(const QString &string) const { - if (d->dirty) - d->init(); + d->ensureInitialized(); QVarLengthArray<wchar_t> original; stringToWCharArray(original, string); |