diff options
Diffstat (limited to 'src/corelib/mimetypes/qmimetype_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimetype_p.h | 78 |
1 files changed, 7 insertions, 71 deletions
diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index 0d6b4b4b12..b6040098a9 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_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 QtCore module 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 QMIMETYPE_P_H #define QMIMETYPE_P_H @@ -52,13 +16,14 @@ // #include <QtCore/private/qglobal_p.h> -#include "qmimetype.h" +#include <QtCore/qshareddata.h> QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qhash.h> #include <QtCore/qstringlist.h> +class QMimeBinaryProvider; QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QMimeTypePrivate : public QSharedData @@ -66,41 +31,12 @@ class Q_AUTOTEST_EXPORT QMimeTypePrivate : public QSharedData public: typedef QHash<QString, QString> LocaleHash; - QMimeTypePrivate(); - explicit QMimeTypePrivate(const QMimeType &other); + QMimeTypePrivate() { } + explicit QMimeTypePrivate(const QString &name) : name(name) { } - void clear(); - - void addGlobPattern(const QString &pattern); - - bool loaded; // QSharedData leaves a 4 byte gap, so don't put 8 byte members first - bool fromCache; // true if this comes from the binary provider QString name; - LocaleHash localeComments; - QString genericIconName; - QString iconName; - QStringList globPatterns; }; QT_END_NAMESPACE -#define QMIMETYPE_BUILDER_FROM_RVALUE_REFS \ - QT_BEGIN_NAMESPACE \ - static QMimeType buildQMimeType ( \ - QString &&name, \ - QString &&genericIconName, \ - QString &&iconName, \ - QStringList &&globPatterns \ - ) \ - { \ - QMimeTypePrivate qMimeTypeData; \ - qMimeTypeData.loaded = true; \ - qMimeTypeData.name = std::move(name); \ - qMimeTypeData.genericIconName = std::move(genericIconName); \ - qMimeTypeData.iconName = std::move(iconName); \ - qMimeTypeData.globPatterns = std::move(globPatterns); \ - return QMimeType(qMimeTypeData); \ - } \ - QT_END_NAMESPACE - -#endif // QMIMETYPE_P_H +#endif // QMIMETYPE_P_H |