summaryrefslogtreecommitdiffstats
path: root/src/designer/src/lib/shared/connectionedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/designer/src/lib/shared/connectionedit.cpp')
-rw-r--r--src/designer/src/lib/shared/connectionedit.cpp65
1 files changed, 20 insertions, 45 deletions
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index 2382e154a..d92ca00e2 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** 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 General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** 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-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "connectionedit_p.h"
@@ -205,7 +180,7 @@ DeleteConnectionsCommand::DeleteConnectionsCommand(ConnectionEdit *edit,
void DeleteConnectionsCommand::redo()
{
- for (Connection *con : qAsConst(m_con_list)) {
+ for (Connection *con : std::as_const(m_con_list)) {
const int idx = edit()->indexOfConnection(con);
emit edit()->aboutToRemoveConnection(con);
Q_ASSERT(edit()->m_con_list.contains(con));
@@ -219,7 +194,7 @@ void DeleteConnectionsCommand::redo()
void DeleteConnectionsCommand::undo()
{
- for (Connection *con : qAsConst(m_con_list)) {
+ for (Connection *con : std::as_const(m_con_list)) {
Q_ASSERT(!edit()->m_con_list.contains(con));
emit edit()->aboutToAddConnection(edit()->m_con_list.size());
edit()->m_con_list.append(con);
@@ -633,7 +608,7 @@ void Connection::trimLine()
{
if (m_source == nullptr || m_source_pos == QPoint(-1, -1) || m_target_pos == QPoint(-1, -1))
return;
- int cnt = m_knee_list.size();
+ auto cnt = m_knee_list.size();
if (cnt < 2)
return;
@@ -722,7 +697,7 @@ QRegion Connection::region() const
{
QRegion result;
- for (int i = 0; i < m_knee_list.size() - 1; ++i)
+ for (qsizetype i = 0; i < m_knee_list.size() - 1; ++i)
result = result.united(lineRect(m_knee_list.at(i), m_knee_list.at(i + 1)));
if (!m_arrow_head.isEmpty()) {
@@ -755,7 +730,7 @@ void Connection::update(bool update_widgets) const
void Connection::paint(QPainter *p) const
{
- for (int i = 0; i < m_knee_list.size() - 1; ++i)
+ for (qsizetype i = 0; i < m_knee_list.size() - 1; ++i)
p->drawLine(m_knee_list.at(i), m_knee_list.at(i + 1));
if (!m_arrow_head.isEmpty()) {
@@ -787,7 +762,7 @@ QRect Connection::endPointRect(EndPoint::Type type) const
CETypes::LineDir Connection::labelDir(EndPoint::Type type) const
{
- const int cnt = m_knee_list.size();
+ const auto cnt = m_knee_list.size();
if (cnt < 2)
return RightDir;
@@ -807,7 +782,7 @@ CETypes::LineDir Connection::labelDir(EndPoint::Type type) const
QRect Connection::labelRect(EndPoint::Type type) const
{
- const int cnt = m_knee_list.size();
+ const auto cnt = m_knee_list.size();
if (cnt < 2)
return QRect();
const QString text = label(type);
@@ -985,7 +960,7 @@ void ConnectionEdit::updateBackground()
if (!m_enable_update_background)
return;
- for (Connection *c : qAsConst(m_con_list))
+ for (Connection *c : std::as_const(m_con_list))
c->updateVisibility();
updateLines();
@@ -1063,7 +1038,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
WidgetSet heavy_highlight_set, light_highlight_set;
- for (Connection *con : qAsConst(m_con_list)) {
+ for (Connection *con : std::as_const(m_con_list)) {
if (!con->isVisible())
continue;
@@ -1081,7 +1056,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
c.setAlpha(BG_ALPHA);
p.setBrush(c);
- for (QWidget *w : qAsConst(heavy_highlight_set)) {
+ for (QWidget *w : std::as_const(heavy_highlight_set)) {
p.drawRect(fixRect(widgetRect(w)));
light_highlight_set.remove(w);
}
@@ -1091,12 +1066,12 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
c.setAlpha(BG_ALPHA);
p.setBrush(c);
- for (QWidget *w : qAsConst(light_highlight_set))
+ for (QWidget *w : std::as_const(light_highlight_set))
p.drawRect(fixRect(widgetRect(w)));
p.setBrush(palette().color(QPalette::Base));
p.setPen(palette().color(QPalette::Text));
- for (Connection *con : qAsConst(m_con_list)) {
+ for (Connection *con : std::as_const(m_con_list)) {
if (con->isVisible()) {
paintLabel(&p, EndPoint::Source, con);
paintLabel(&p, EndPoint::Target, con);
@@ -1106,7 +1081,7 @@ void ConnectionEdit::paintEvent(QPaintEvent *e)
p.setPen(m_active_color);
p.setBrush(m_active_color);
- for (Connection *con : qAsConst(m_con_list)) {
+ for (Connection *con : std::as_const(m_con_list)) {
if (!selected(con) || !con->isVisible())
continue;
@@ -1358,9 +1333,9 @@ static ConnectionEdit::ConnectionSet findConnectionsOf(const ConnectionEdit::Con
{
ConnectionEdit::ConnectionSet rc;
- const ConnectionEdit::ConnectionList::const_iterator ccend = cl.constEnd();
+ const auto ccend = cl.cend();
for ( ; oi1 != oi2; ++oi1) {
- for (ConnectionEdit::ConnectionList::const_iterator cit = cl.constBegin(); cit != ccend; ++cit) {
+ for (auto cit = cl.constBegin(); cit != ccend; ++cit) {
Connection *con = *cit;
if (con->object(ConnectionEdit::EndPoint::Source) == *oi1 || con->object(ConnectionEdit::EndPoint::Target) == *oi1)
rc.insert(con, con);
@@ -1427,7 +1402,7 @@ bool ConnectionEdit::selected(const Connection *con) const
void ConnectionEdit::selectNone()
{
- for (Connection *con : qAsConst(m_sel_con_set))
+ for (Connection *con : std::as_const(m_sel_con_set))
con->update();
m_sel_con_set.clear();
@@ -1437,7 +1412,7 @@ void ConnectionEdit::selectAll()
{
if (m_sel_con_set.size() == m_con_list.size())
return;
- for (Connection *con : qAsConst(m_con_list))
+ for (Connection *con : std::as_const(m_con_list))
setSelected(con, true);
}
@@ -1516,7 +1491,7 @@ void ConnectionEdit::addConnection(Connection *con)
void ConnectionEdit::updateLines()
{
- for (Connection *con : qAsConst(m_con_list))
+ for (Connection *con : std::as_const(m_con_list))
con->checkWidgets();
}