diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-10-06 11:08:21 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@qt.io> | 2022-10-11 23:17:18 +0200 |
commit | aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca (patch) | |
tree | be5e1a9733987aed8602eb47618cd1673a594570 /examples/opengl | |
parent | fd2685c2f0a219c091e028a98ba6cdd154986fec (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, with manual
unstaging of the actual definition and documentation in dist/,
src/corelib/doc/ and src/corelib/global/.
Task-number: QTBUG-99313
Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/contextinfo/widget.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/qopenglwidget/glwidget.cpp | 4 | ||||
-rw-r--r-- | examples/opengl/qopenglwidget/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/opengl/contextinfo/widget.cpp b/examples/opengl/contextinfo/widget.cpp index a4ae397382..398f49b8dd 100644 --- a/examples/opengl/contextinfo/widget.cpp +++ b/examples/opengl/contextinfo/widget.cpp @@ -345,7 +345,7 @@ void Widget::renderWindowReady() QList<QByteArray> extensionList = context->extensions().values(); std::sort(extensionList.begin(), extensionList.end()); m_extensions->append(tr("Found %1 extensions:").arg(extensionList.count())); - for (const QByteArray &ext : qAsConst(extensionList)) + for (const QByteArray &ext : std::as_const(extensionList)) m_extensions->append(QString::fromLatin1(ext)); m_output->moveCursor(QTextCursor::Start); diff --git a/examples/opengl/qopenglwidget/glwidget.cpp b/examples/opengl/qopenglwidget/glwidget.cpp index 96d5d51321..e2a3ea4fc5 100644 --- a/examples/opengl/qopenglwidget/glwidget.cpp +++ b/examples/opengl/qopenglwidget/glwidget.cpp @@ -358,7 +358,7 @@ void GLWidget::paintGL() painter.endNativePainting(); if (m_showBubbles) { - for (Bubble *bubble : qAsConst(m_bubbles)) + for (Bubble *bubble : std::as_const(m_bubbles)) bubble->drawBubble(&painter); } @@ -371,7 +371,7 @@ void GLWidget::paintGL() painter.end(); - for (Bubble *bubble : qAsConst(m_bubbles)) + for (Bubble *bubble : std::as_const(m_bubbles)) bubble->move(rect()); if (!(m_frames % 100)) { diff --git a/examples/opengl/qopenglwidget/mainwindow.cpp b/examples/opengl/qopenglwidget/mainwindow.cpp index 409ff7b507..c383a692d5 100644 --- a/examples/opengl/qopenglwidget/mainwindow.cpp +++ b/examples/opengl/qopenglwidget/mainwindow.cpp @@ -133,7 +133,7 @@ void MainWindow::timerUsageChanged(bool enabled) m_timer->start(); } else { m_timer->stop(); - for (QOpenGLWidget *w : qAsConst(m_glWidgets)) + for (QOpenGLWidget *w : std::as_const(m_glWidgets)) w->update(); } } |