diff options
Diffstat (limited to 'src/corelib/global/qforeach.h')
| -rw-r--r-- | src/corelib/global/qforeach.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/global/qforeach.h b/src/corelib/global/qforeach.h index e8396c4fb0..ab0e20b989 100644 --- a/src/corelib/global/qforeach.h +++ b/src/corelib/global/qforeach.h @@ -1,11 +1,12 @@ -// Copyright (C) 2020 The Qt Company Ltd. +// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2019 Intel Corporation. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QFOREACH_H #define QFOREACH_H -#include <QtCore/qglobal.h> +#include <QtCore/qtclasshelpermacros.h> +#include <QtCore/qtconfigmacros.h> #include <QtCore/qtdeprecationmarkers.h> #include <QtCore/qttypetraits.h> @@ -24,8 +25,8 @@ template <typename T> class QForeachContainer { Q_DISABLE_COPY_MOVE(QForeachContainer) public: - QForeachContainer(const T &t) : c(t), i(qAsConst(c).begin()), e(qAsConst(c).end()) {} - QForeachContainer(T &&t) : c(std::move(t)), i(qAsConst(c).begin()), e(qAsConst(c).end()) {} + QForeachContainer(const T &t) : c(t), i(std::as_const(c).begin()), e(std::as_const(c).end()) {} + QForeachContainer(T &&t) : c(std::move(t)), i(std::as_const(c).begin()), e(std::as_const(c).end()) {} T c; typename T::const_iterator i, e; |