diff options
Diffstat (limited to 'src/linguist/linguist/phrasemodel.cpp')
-rw-r--r-- | src/linguist/linguist/phrasemodel.cpp | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/src/linguist/linguist/phrasemodel.cpp b/src/linguist/linguist/phrasemodel.cpp index 8a820e1ce..60e1256d7 100644 --- a/src/linguist/linguist/phrasemodel.cpp +++ b/src/linguist/linguist/phrasemodel.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 "phrasemodel.h" @@ -32,7 +7,7 @@ QT_BEGIN_NAMESPACE void PhraseModel::removePhrases() { - int r = plist.count(); + int r = plist.size(); if (r > 0) { beginResetModel(); plist.clear(); @@ -59,7 +34,7 @@ void PhraseModel::setPhrase(const QModelIndex &indx, Phrase *ph) QModelIndex PhraseModel::addPhrase(Phrase *p) { - int r = plist.count(); + int r = plist.size(); plist.append(p); @@ -89,7 +64,7 @@ QModelIndex PhraseModel::index(Phrase * const phr) const int PhraseModel::rowCount(const QModelIndex &) const { - return plist.count(); + return plist.size(); } int PhraseModel::columnCount(const QModelIndex &) const @@ -130,7 +105,7 @@ bool PhraseModel::setData(const QModelIndex & index, const QVariant & value, int int row = index.row(); int column = index.column(); - if (!index.isValid() || row >= plist.count() || role != Qt::EditRole) + if (!index.isValid() || row >= plist.size() || role != Qt::EditRole) return false; Phrase *phrase = plist.at(row); @@ -158,7 +133,7 @@ QVariant PhraseModel::data(const QModelIndex &index, int role) const int row = index.row(); int column = index.column(); - if (row >= plist.count() || !index.isValid()) + if (row >= plist.size() || !index.isValid()) return QVariant(); Phrase *phrase = plist.at(row); |