aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/aggregation
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-07 14:46:06 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-07 13:47:53 +0000
commit8eb4d52342fe3a6ede1c1dce3174d95bfa0cea88 (patch)
tree0f5556c5e4098e75853e3d9ee2620e0306f0cf2a /src/libs/aggregation
parent90de29d530dfc2921d5179977b3393c11a3cc238 (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. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/aggregation')
-rw-r--r--src/libs/aggregation/aggregate.cpp2
-rw-r--r--src/libs/aggregation/aggregate.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/aggregation/aggregate.cpp b/src/libs/aggregation/aggregate.cpp
index 0da4ebd8b7..26924d5092 100644
--- a/src/libs/aggregation/aggregate.cpp
+++ b/src/libs/aggregation/aggregate.cpp
@@ -176,7 +176,7 @@ Aggregate::~Aggregate()
QList<QObject *> components;
{
QWriteLocker locker(&lock());
- for (QObject *component : qAsConst(m_components)) {
+ for (QObject *component : std::as_const(m_components)) {
disconnect(component, &QObject::destroyed, this, &Aggregate::deleteSelf);
aggregateMap().remove(component);
}
diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h
index ef7b4e69ba..a640822d46 100644
--- a/src/libs/aggregation/aggregate.h
+++ b/src/libs/aggregation/aggregate.h
@@ -26,7 +26,7 @@ public:
template <typename T> T *component() {
QReadLocker locker(&lock());
- for (QObject *component : qAsConst(m_components)) {
+ for (QObject *component : std::as_const(m_components)) {
if (T *result = qobject_cast<T *>(component))
return result;
}
@@ -36,7 +36,7 @@ public:
template <typename T> QList<T *> components() {
QReadLocker locker(&lock());
QList<T *> results;
- for (QObject *component : qAsConst(m_components)) {
+ for (QObject *component : std::as_const(m_components)) {
if (T *result = qobject_cast<T *>(component)) {
results << result;
}