diff options
Diffstat (limited to 'src/quickshapes/qquickshapesoftwarerenderer.cpp')
| -rw-r--r-- | src/quickshapes/qquickshapesoftwarerenderer.cpp | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/src/quickshapes/qquickshapesoftwarerenderer.cpp b/src/quickshapes/qquickshapesoftwarerenderer.cpp index dc9ccb340d..60efcf1db9 100644 --- a/src/quickshapes/qquickshapesoftwarerenderer.cpp +++ b/src/quickshapes/qquickshapesoftwarerenderer.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquickshapesoftwarerenderer_p.h" #include <private/qquickpath_p_p.h> @@ -44,7 +8,7 @@ QT_BEGIN_NAMESPACE void QQuickShapeSoftwareRenderer::beginSync(int totalCount, bool *countChanged) { - if (m_sp.count() != totalCount) { + if (m_sp.size() != totalCount) { m_sp.resize(totalCount); m_accDirty |= DirtyList; *countChanged = true; @@ -180,10 +144,8 @@ void QQuickShapeSoftwareRenderer::endSync(bool) void QQuickShapeSoftwareRenderer::setNode(QQuickShapeSoftwareRenderNode *node) { - if (m_node != node) { - m_node = node; - m_accDirty |= DirtyList; - } + m_node = node; + m_accDirty |= DirtyList; } void QQuickShapeSoftwareRenderer::updateNode() @@ -191,7 +153,7 @@ void QQuickShapeSoftwareRenderer::updateNode() if (!m_accDirty) return; - const int count = m_sp.count(); + const int count = m_sp.size(); const bool listChanged = m_accDirty & DirtyList; if (listChanged) m_node->m_sp.resize(count); @@ -260,7 +222,7 @@ void QQuickShapeSoftwareRenderNode::render(const RenderState *state) p->setTransform(matrix()->toTransform()); p->setOpacity(inheritedOpacity()); - for (const ShapePathRenderData &d : qAsConst(m_sp)) { + for (const ShapePathRenderData &d : std::as_const(m_sp)) { p->setPen(d.strokeWidth >= 0.0f && d.pen.color() != Qt::transparent ? d.pen : Qt::NoPen); p->setBrush(d.brush.color() != Qt::transparent ? d.brush : Qt::NoBrush); p->drawPath(d.path); |