diff options
Diffstat (limited to 'src/assistant/assistant/bookmarkfiltermodel.cpp')
| -rw-r--r-- | src/assistant/assistant/bookmarkfiltermodel.cpp | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/src/assistant/assistant/bookmarkfiltermodel.cpp b/src/assistant/assistant/bookmarkfiltermodel.cpp index a3d5c1191..89fe5cad7 100644 --- a/src/assistant/assistant/bookmarkfiltermodel.cpp +++ b/src/assistant/assistant/bookmarkfiltermodel.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 Assistant 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 "bookmarkfiltermodel.h" #include "bookmarkitem.h" @@ -87,7 +62,7 @@ void BookmarkFilterModel::setSourceModel(QAbstractItemModel *_sourceModel) int BookmarkFilterModel::rowCount(const QModelIndex &index) const { Q_UNUSED(index); - return cache.count(); + return cache.size(); } int BookmarkFilterModel::columnCount(const QModelIndex &index) const @@ -101,7 +76,7 @@ int BookmarkFilterModel::columnCount(const QModelIndex &index) const QModelIndex BookmarkFilterModel::mapToSource(const QModelIndex &proxyIndex) const { const int row = proxyIndex.row(); - if (proxyIndex.isValid() && row >= 0 && row < cache.count()) + if (proxyIndex.isValid() && row >= 0 && row < cache.size()) return cache[row]; return QModelIndex(); } @@ -121,7 +96,7 @@ QModelIndex BookmarkFilterModel::index(int row, int column, const QModelIndex &index) const { Q_UNUSED(index); - if (row < 0 || column < 0 || cache.count() <= row + if (row < 0 || column < 0 || cache.size() <= row || !sourceModel || sourceModel->columnCount() <= column) { return QModelIndex(); } |