diff options
Diffstat (limited to 'src/assistant/help/qhelpdbreader_p.h')
-rw-r--r-- | src/assistant/help/qhelpdbreader_p.h | 65 |
1 files changed, 11 insertions, 54 deletions
diff --git a/src/assistant/help/qhelpdbreader_p.h b/src/assistant/help/qhelpdbreader_p.h index 9abc3c06f..1bc4fc7c9 100644 --- a/src/assistant/help/qhelpdbreader_p.h +++ b/src/assistant/help/qhelpdbreader_p.h @@ -1,41 +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: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) 2016 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 #ifndef QHELPDBREADER_H #define QHELPDBREADER_H @@ -51,11 +15,9 @@ // We mean it. // -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtCore/QUrl> -#include <QtCore/QByteArray> -#include <QtCore/QSet> +#include <QtCore/qbytearray.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE @@ -69,7 +31,6 @@ public: class IndexItem { public: - IndexItem() = default; QString name; QString identifier; int fileId = 0; @@ -80,7 +41,6 @@ public: class FileItem { public: - FileItem() = default; QString name; QString title; QStringList filterAttributes; @@ -89,7 +49,6 @@ public: class ContentsItem { public: - ContentsItem() = default; QByteArray data; QStringList filterAttributes; }; @@ -104,8 +63,7 @@ public: }; QHelpDBReader(const QString &dbName); - QHelpDBReader(const QString &dbName, const QString &uniqueId, - QObject *parent); + QHelpDBReader(const QString &dbName, const QString &uniqueId, QObject *parent); ~QHelpDBReader(); bool init(); @@ -116,12 +74,11 @@ public: IndexTable indexTable() const; QList<QStringList> filterAttributeSets() const; QMultiMap<QString, QByteArray> filesData(const QStringList &filterAttributes, - const QString &extensionFilter = QString()) const; - QByteArray fileData(const QString &virtualFolder, - const QString &filePath) const; + const QString &extensionFilter = {}) const; + QByteArray fileData(const QString &virtualFolder, const QString &filePath) const; QStringList customFilters() const; - QStringList filterAttributes(const QString &filterName = QString()) const; + QStringList filterAttributes(const QString &filterName = {}) const; QVariant metaData(const QString &name) const; @@ -134,10 +91,10 @@ private: QString m_dbName; QString m_uniqueId; QString m_error; - QSqlQuery *m_query = nullptr; + std::unique_ptr<QSqlQuery> m_query; mutable QString m_namespace; }; QT_END_NAMESPACE -#endif +#endif // QHELPDBREADER_H |