aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-11-11 16:26:04 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-11-14 07:23:34 +0100
commitcc8fdd21eb19632b9ff57621ddf06b1524f70f6a (patch)
tree5f9d9bbd809242bc1b05e3aef061db1bc7d2c51f
parent681e6c22a3b2a16a3ebc2279e43d6b69601c3aac (diff)
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp2
-rw-r--r--src/plugins/cerence/hwr/plugin/t9writeworker.cpp2
-rw-r--r--src/plugins/myscript/plugin/myscriptinputmethod.cpp2
-rw-r--r--src/settings/qquickvirtualkeyboardsettings.cpp2
-rw-r--r--src/virtualkeyboard/handwritinggesturerecognizer.cpp2
-rw-r--r--src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp2
-rw-r--r--src/virtualkeyboard/qvirtualkeyboardinputengine.cpp4
-rw-r--r--src/virtualkeyboard/unipentrace.cpp2
8 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp
index 00f20bcc..52a0541a 100644
--- a/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writeinputmethod.cpp
@@ -1437,7 +1437,7 @@ public:
int countActiveTraces() const
{
int count = 0;
- for (QVirtualKeyboardTrace *trace : qAsConst(traceList)) {
+ for (QVirtualKeyboardTrace *trace : std::as_const(traceList)) {
if (!trace->isFinal())
count++;
}
diff --git a/src/plugins/cerence/hwr/plugin/t9writeworker.cpp b/src/plugins/cerence/hwr/plugin/t9writeworker.cpp
index 9286b187..893c5e3f 100644
--- a/src/plugins/cerence/hwr/plugin/t9writeworker.cpp
+++ b/src/plugins/cerence/hwr/plugin/t9writeworker.cpp
@@ -305,7 +305,7 @@ void T9WriteDlmWordTask::run()
static_cast<DECUMA_UINT16>(word.length()),
&recSettings, matchResults.data());
if (!status) {
- for (const auto &matchResult : qAsConst(matchResults)) {
+ for (const auto &matchResult : std::as_const(matchResults)) {
qCDebug(lcT9Write) << "T9WriteDlmWordTask::run(): MatchWord string type" << matchResult.stringType;
if (matchResult.stringType != notFromDictionary) {
wordFound = true;
diff --git a/src/plugins/myscript/plugin/myscriptinputmethod.cpp b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
index 90b84ddf..54929c0d 100644
--- a/src/plugins/myscript/plugin/myscriptinputmethod.cpp
+++ b/src/plugins/myscript/plugin/myscriptinputmethod.cpp
@@ -179,7 +179,7 @@ public:
int countActiveTraces() const
{
int count = 0;
- for (QVirtualKeyboardTrace *trace : qAsConst(traceList)) {
+ for (QVirtualKeyboardTrace *trace : std::as_const(traceList)) {
if (!trace->isFinal())
count++;
}
diff --git a/src/settings/qquickvirtualkeyboardsettings.cpp b/src/settings/qquickvirtualkeyboardsettings.cpp
index d44e36ee..bb616e49 100644
--- a/src/settings/qquickvirtualkeyboardsettings.cpp
+++ b/src/settings/qquickvirtualkeyboardsettings.cpp
@@ -67,7 +67,7 @@ public:
stylePathList += stylesPath;
}
- for (const QString &stylePath : qAsConst(stylePathList)) {
+ for (const QString &stylePath : std::as_const(stylePathList)) {
QString filePath = buildStyleFilePath(stylePath, name);
bool pathExist = false;
pathExist = QFileInfo::exists(filePath);
diff --git a/src/virtualkeyboard/handwritinggesturerecognizer.cpp b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
index 27254245..72337132 100644
--- a/src/virtualkeyboard/handwritinggesturerecognizer.cpp
+++ b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
@@ -110,7 +110,7 @@ QVariantMap HandwritingGestureRecognizer::recognize(const QList<QVirtualKeyboard
bool matchesToExisting = true;
const qreal minimumSwipeLength = (swipeLength * (100.0 - MAXIMUM_WIDTH_VARIANCE) / 100.0);
const qreal maximumSwipeLength = (swipeLength * (100.0 + MAXIMUM_WIDTH_VARIANCE) / 100.0);
- for (const QVector2D &otherSwipeVector : qAsConst(swipeVectors)) {
+ for (const QVector2D &otherSwipeVector : std::as_const(swipeVectors)) {
const qreal otherSwipeLength = otherSwipeVector.length();
const qreal theta = qAcos(QVector2D::dotProduct(swipeVector, otherSwipeVector) / (swipeLength * otherSwipeLength));
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 0d35d25e..5b13fd45 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -602,7 +602,7 @@ void QVirtualKeyboardInputContextPrivate::addSelectionAttribute(QList<QInputMeth
bool QVirtualKeyboardInputContextPrivate::testAttribute(const QList<QInputMethodEvent::Attribute> &attributes, QInputMethodEvent::AttributeType attributeType) const
{
- for (const QInputMethodEvent::Attribute &attribute : qAsConst(attributes)) {
+ for (const QInputMethodEvent::Attribute &attribute : std::as_const(attributes)) {
if (attribute.type == attributeType)
return true;
}
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
index 4d449328..59ddb6b1 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputengine.cpp
@@ -453,7 +453,7 @@ QList<int> QVirtualKeyboardInputEngine::patternRecognitionModes() const
if (patterRecognitionModeList.isEmpty())
return resultList;
resultList.reserve(patterRecognitionModeList.size());
- for (const PatternRecognitionMode &patternRecognitionMode : qAsConst(patterRecognitionModeList))
+ for (const PatternRecognitionMode &patternRecognitionMode : std::as_const(patterRecognitionModeList))
resultList.append(static_cast<int>(patternRecognitionMode));
return resultList;
}
@@ -660,7 +660,7 @@ void QVirtualKeyboardInputEngine::updateSelectionListModels()
}
// Deallocate inactive selection lists
- for (const QVirtualKeyboardSelectionListModel::Type &selectionListType : qAsConst(inactiveSelectionLists)) {
+ for (const QVirtualKeyboardSelectionListModel::Type &selectionListType : std::as_const(inactiveSelectionLists)) {
const auto it = d->selectionListModels.constFind(selectionListType);
if (it != d->selectionListModels.cend()) {
it.value()->setDataSource(nullptr, selectionListType);
diff --git a/src/virtualkeyboard/unipentrace.cpp b/src/virtualkeyboard/unipentrace.cpp
index 7b88e5b7..123ffcbd 100644
--- a/src/virtualkeyboard/unipentrace.cpp
+++ b/src/virtualkeyboard/unipentrace.cpp
@@ -39,7 +39,7 @@ UnipenTrace::UnipenTrace(const QVariantMap &traceCaptureDeviceInfo,
void UnipenTrace::record(const QList<QVirtualKeyboardTrace *> &traceList)
{
qlonglong t0 = 0;
- for (const QVirtualKeyboardTrace *trace : qAsConst(traceList)) {
+ for (const QVirtualKeyboardTrace *trace : std::as_const(traceList)) {
const QVariantList &points = trace->points();
const bool hasTime = trace->channels().contains(QLatin1String("t"));
const QVariantList timeData = hasTime ? trace->channelData(QLatin1String("t")) : QVariantList();