diff options
Diffstat (limited to 'src/assistant/help/qhelpfilterdata.cpp')
| -rw-r--r-- | src/assistant/help/qhelpfilterdata.cpp | 55 |
1 files changed, 7 insertions, 48 deletions
diff --git a/src/assistant/help/qhelpfilterdata.cpp b/src/assistant/help/qhelpfilterdata.cpp index b90aeb6c8..2baa7ce3c 100644 --- a/src/assistant/help/qhelpfilterdata.cpp +++ b/src/assistant/help/qhelpfilterdata.cpp @@ -1,44 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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: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) 2018 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 "qhelpfilterdata.h" -#include <QtCore/QVersionNumber> + +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE @@ -50,8 +15,7 @@ public: : QSharedData(other) , m_components(other.m_components) , m_versions(other.m_versions) - { } - ~QHelpFilterDataPrivate() = default; + {} QStringList m_components; QList<QVersionNumber> m_versions; @@ -75,10 +39,7 @@ public: /*! Constructs the empty filter. */ -QHelpFilterData::QHelpFilterData() - : d(new QHelpFilterDataPrivate) -{ -} +QHelpFilterData::QHelpFilterData() : d(new QHelpFilterDataPrivate) { } /*! Constructs a copy of \a other. @@ -100,7 +61,6 @@ QHelpFilterData::~QHelpFilterData() = default; */ QHelpFilterData &QHelpFilterData::operator=(const QHelpFilterData &) = default; - /*! Move-assigns \a other to this QHelpFilterData instance. */ @@ -115,8 +75,7 @@ QHelpFilterData &QHelpFilterData::operator=(QHelpFilterData &&) = default; bool QHelpFilterData::operator==(const QHelpFilterData &other) const { - return (d->m_components == other.d->m_components && - d->m_versions == other.d->m_versions); + return (d->m_components == other.d->m_components && d->m_versions == other.d->m_versions); } /*! |