diff options
Diffstat (limited to 'src/linguist/linguist/messageeditorwidgets.cpp')
| -rw-r--r-- | src/linguist/linguist/messageeditorwidgets.cpp | 59 |
1 files changed, 17 insertions, 42 deletions
diff --git a/src/linguist/linguist/messageeditorwidgets.cpp b/src/linguist/linguist/messageeditorwidgets.cpp index d869fe31a..25969ca68 100644 --- a/src/linguist/linguist/messageeditorwidgets.cpp +++ b/src/linguist/linguist/messageeditorwidgets.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 Linguist 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 "messageeditorwidgets.h" #include "messagehighlighter.h" @@ -298,7 +273,7 @@ bool FormMultiWidget::eventFilter(QObject *watched, QEvent *event) { int i = 0; while (m_editors.at(i) != watched) - if (++i >= m_editors.count()) // Happens when deleting an editor + if (++i >= m_editors.size()) // Happens when deleting an editor return false; if (event->type() == QEvent::FocusOut) { m_minusButtons.at(i)->setToolTip(QString()); @@ -340,7 +315,7 @@ void FormMultiWidget::updateLayout() if (variants) { QVBoxLayout *layoutForPlusButtons = new QVBoxLayout; layoutForPlusButtons->setContentsMargins(QMargins()); - for (int i = 0; i < m_plusButtons.count(); ++i) + for (int i = 0; i < m_plusButtons.size(); ++i) layoutForPlusButtons->addWidget(m_plusButtons.at(i), Qt::AlignTop); layout->addLayout(layoutForPlusButtons, 1, 0, Qt::AlignTop); @@ -348,20 +323,20 @@ void FormMultiWidget::updateLayout() QGridLayout *layoutForLabels = new QGridLayout; layoutForLabels->setContentsMargins(QMargins()); layoutForLabels->setRowMinimumHeight(0, minimumRowHeight); - for (int j = 0; j < m_editors.count(); ++j) { + for (int j = 0; j < m_editors.size(); ++j) { layoutForLabels->addWidget(m_editors.at(j), 1 + j, 0, Qt::AlignVCenter); layoutForLabels->addWidget(m_minusButtons.at(j), 1 + j, 1, Qt::AlignVCenter); } - layoutForLabels->setRowMinimumHeight(m_editors.count() + 1, minimumRowHeight); + layoutForLabels->setRowMinimumHeight(m_editors.size() + 1, minimumRowHeight); layout->addLayout(layoutForLabels, 1, 1, Qt::AlignTop); } else { - for (int k = 0; k < m_editors.count(); ++k) + for (int k = 0; k < m_editors.size(); ++k) layout->addWidget(m_editors.at(k), 1 + k, 0, Qt::AlignVCenter); } - for (int i = 0; i < m_plusButtons.count(); ++i) + for (int i = 0; i < m_plusButtons.size(); ++i) m_plusButtons.at(i)->setVisible(variants); - for (int j = 0; j < m_minusButtons.count(); ++j) + for (int j = 0; j < m_minusButtons.size(); ++j) m_minusButtons.at(j)->setVisible(variants); updateGeometry(); @@ -381,16 +356,16 @@ void FormMultiWidget::setTranslation(const QString &text, bool userAction) { QStringList texts = text.split(QChar(Translator::BinaryVariantSeparator), Qt::KeepEmptyParts); - while (m_editors.count() > texts.count()) { + while (m_editors.size() > texts.size()) { delete m_minusButtons.takeLast(); delete m_plusButtons.takeLast(); delete m_editors.takeLast(); } - while (m_editors.count() < texts.count()) - addEditor(m_editors.count()); + while (m_editors.size() < texts.size()) + addEditor(m_editors.size()); updateLayout(); - for (int i = 0; i < texts.count(); ++i) + for (int i = 0; i < texts.size(); ++i) // XXX this will emit n textChanged signals m_editors.at(i)->setPlainText(texts.at(i), userAction); @@ -422,7 +397,7 @@ QString toPlainText(const QString &text) QString FormMultiWidget::getTranslation() const { QString ret; - for (int i = 0; i < m_editors.count(); ++i) { + for (int i = 0; i < m_editors.size(); ++i) { if (i) ret += QChar(Translator::BinaryVariantSeparator); ret += toPlainText(m_editors.at(i)->document()->toRawText()); @@ -433,7 +408,7 @@ QString FormMultiWidget::getTranslation() const void FormMultiWidget::setEditingEnabled(bool enable) { // Use read-only state so that the text can still be copied - for (int i = 0; i < m_editors.count(); ++i) + for (int i = 0; i < m_editors.size(); ++i) m_editors.at(i)->setReadOnly(!enable); m_label->setEnabled(enable); if (m_multiEnabled) @@ -466,7 +441,7 @@ void FormMultiWidget::plusButtonClicked() void FormMultiWidget::deleteEditor(int idx) { - if (m_editors.count() == 1) { + if (m_editors.size() == 1) { // Don't just clear(), so the undo history is not lost QTextCursor c = m_editors.first()->textCursor(); c.select(QTextCursor::Document); @@ -483,7 +458,7 @@ void FormMultiWidget::deleteEditor(int idx) delete m_minusButtons.takeAt(idx); delete m_plusButtons.takeAt(idx + 1); updateLayout(); - emit textChanged(m_editors.at((m_editors.count() == idx) ? idx - 1 : idx)); + emit textChanged(m_editors.at((m_editors.size() == idx) ? idx - 1 : idx)); } } |