diff options
Diffstat (limited to 'src/corelib/mimetypes/qmimeprovider_p.h')
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider_p.h | 58 |
1 files changed, 31 insertions, 27 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 027fddd2c8..5a89ac23c3 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -45,8 +45,11 @@ // We mean it. // -#include <QtCore/qdatetime.h> #include "qmimedatabase_p.h" + +#ifndef QT_NO_MIMETYPE + +#include <QtCore/qdatetime.h> #include <QtCore/qset.h> QT_BEGIN_NAMESPACE @@ -86,17 +89,17 @@ public: QMimeBinaryProvider(QMimeDatabasePrivate *db); virtual ~QMimeBinaryProvider(); - virtual bool isValid(); - virtual QMimeType mimeTypeForName(const QString &name); - virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix); - virtual QStringList parents(const QString &mime); - virtual QString resolveAlias(const QString &name); - virtual QStringList listAliases(const QString &name); - virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr); - virtual QList<QMimeType> allMimeTypes(); - virtual void loadMimeTypePrivate(QMimeTypePrivate &); - virtual void loadIcon(QMimeTypePrivate &); - virtual void loadGenericIcon(QMimeTypePrivate &); + virtual bool isValid() Q_DECL_OVERRIDE; + virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; + virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix) Q_DECL_OVERRIDE; + virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; + virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; + virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; + virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; + virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE; + virtual void loadMimeTypePrivate(QMimeTypePrivate &) Q_DECL_OVERRIDE; + virtual void loadIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; + virtual void loadGenericIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; private: struct CacheFile; @@ -128,14 +131,14 @@ class QMimeXMLProvider : public QMimeProviderBase public: QMimeXMLProvider(QMimeDatabasePrivate *db); - virtual bool isValid(); - virtual QMimeType mimeTypeForName(const QString &name); - virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix); - virtual QStringList parents(const QString &mime); - virtual QString resolveAlias(const QString &name); - virtual QStringList listAliases(const QString &name); - virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr); - virtual QList<QMimeType> allMimeTypes(); + virtual bool isValid() Q_DECL_OVERRIDE; + virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; + virtual QStringList findByFileName(const QString &fileName, QString *foundSuffix) Q_DECL_OVERRIDE; + virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; + virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; + virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; + virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; + virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE; bool load(const QString &fileName, QString *errorMessage); @@ -168,4 +171,5 @@ private: QT_END_NAMESPACE +#endif // QT_NO_MIMETYPE #endif // QMIMEPROVIDER_P_H |