diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-11-11 16:26:04 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-11-18 13:59:41 +0100 |
| commit | 3a07c391847b81c7bf40d95fc4d7c49f63073abc (patch) | |
| tree | ae481ec0170e6cd53cbd09a28fc780fe0ab467d2 /src/gui/image/qicon.cpp | |
| parent | c5f3c61469517a4ac00e4da01fe0bab9188c1488 (diff) | |
| download | qtbase-3a07c391847b81c7bf40d95fc4d7c49f63073abc.tar.gz | |
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>
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 8c2985e137..3fc1bd3b13 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -451,7 +451,7 @@ void QPixmapIconEngine::addFile(const QString &fileName, const QSize &size, QIco } } } - for (const QImage &i : qAsConst(icoImages)) + for (const QImage &i : std::as_const(icoImages)) pixmaps += QPixmapIconEngineEntry(abs, i, mode, state); if (icoImages.isEmpty() && !ignoreSize) // Add placeholder with the filename and empty pixmap for the size. pixmaps += QPixmapIconEngineEntry(abs, size, mode, state); |