Image Plugins: includemocs(-ish)
Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. The result of the automated script is no good here, because these plugins all use the same anti-pattern of defining the plugin class in a header, main.h, which doesn't have include guards. Included moc files therefore lead to redefiniton errors. Fix by inlining the main.h's into the respective main.cpp's and including main.moc's instead. Task-number: QTBUG-102886 Pick-to: 6.3 6.2 5.15 Change-Id: I6d3ec5590d13d9b7a4cedd5f1b4d3331e6916655 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>bb10
Marc Mutz
parent
7d4b480be3
commit
1ca7b51694
|
|
@ -8,7 +8,7 @@ qt_internal_add_plugin(QGifPlugin
|
|||
OUTPUT_NAME qgif
|
||||
PLUGIN_TYPE imageformats
|
||||
SOURCES
|
||||
main.cpp main.h
|
||||
main.cpp
|
||||
qgifhandler.cpp qgifhandler_p.h
|
||||
LIBRARIES # special case
|
||||
Qt::Gui # special case
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@
|
|||
#include <qimageiohandler.h>
|
||||
#include <qstringlist.h>
|
||||
|
||||
#include "main.h"
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_GIF
|
||||
#undef QT_NO_IMAGEFORMAT_GIF
|
||||
#endif
|
||||
|
|
@ -49,6 +47,17 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QGifPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "gif.json")
|
||||
public:
|
||||
QGifPlugin();
|
||||
~QGifPlugin();
|
||||
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QGifPlugin::QGifPlugin()
|
||||
{
|
||||
|
|
@ -74,3 +83,5 @@ QImageIOHandler *QGifPlugin::create(QIODevice *device, const QByteArray &format)
|
|||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "main.moc"
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qimageiohandler.h>
|
||||
#include <qstringlist.h>
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_GIF
|
||||
#undef QT_NO_IMAGEFORMAT_GIF
|
||||
#endif
|
||||
#include <qgifhandler_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QGifPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "gif.json")
|
||||
public:
|
||||
QGifPlugin();
|
||||
~QGifPlugin();
|
||||
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
@ -8,7 +8,7 @@ qt_internal_add_plugin(QICOPlugin
|
|||
OUTPUT_NAME qico
|
||||
PLUGIN_TYPE imageformats
|
||||
SOURCES
|
||||
main.cpp main.h
|
||||
main.cpp
|
||||
qicohandler.cpp qicohandler.h
|
||||
LIBRARIES
|
||||
Qt::Core
|
||||
|
|
|
|||
|
|
@ -37,10 +37,25 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "main.h"
|
||||
#include <qimageiohandler.h>
|
||||
#include <qdebug.h>
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_ICO
|
||||
#undef QT_NO_IMAGEFORMAT_ICO
|
||||
#endif
|
||||
#include "qicohandler.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QICOPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ico.json")
|
||||
public:
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QImageIOPlugin::Capabilities QICOPlugin::capabilities(QIODevice *device, const QByteArray &format) const
|
||||
{
|
||||
if (format == "ico" || format == "cur")
|
||||
|
|
@ -67,3 +82,5 @@ QImageIOHandler *QICOPlugin::create(QIODevice *device, const QByteArray &format)
|
|||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "main.moc"
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qimageiohandler.h>
|
||||
#include <qdebug.h>
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_ICO
|
||||
#undef QT_NO_IMAGEFORMAT_ICO
|
||||
#endif
|
||||
#include "qicohandler.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QICOPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ico.json")
|
||||
public:
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
|
@ -10,7 +10,7 @@ qt_internal_add_plugin(QJpegPlugin
|
|||
OUTPUT_NAME qjpeg
|
||||
PLUGIN_TYPE imageformats
|
||||
SOURCES
|
||||
main.cpp main.h
|
||||
main.cpp
|
||||
qjpeghandler.cpp qjpeghandler_p.h
|
||||
LIBRARIES
|
||||
Qt::Core
|
||||
|
|
|
|||
|
|
@ -37,7 +37,8 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "main.h"
|
||||
#include <qimageiohandler.h>
|
||||
#include <qstringlist.h>
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_JPEG
|
||||
#undef QT_NO_IMAGEFORMAT_JPEG
|
||||
|
|
@ -46,6 +47,15 @@
|
|||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QJpegPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "jpeg.json")
|
||||
public:
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QImageIOPlugin::Capabilities QJpegPlugin::capabilities(QIODevice *device, const QByteArray &format) const
|
||||
{
|
||||
if (format == "jpeg" || format == "jpg")
|
||||
|
|
@ -72,3 +82,5 @@ QImageIOHandler *QJpegPlugin::create(QIODevice *device, const QByteArray &format
|
|||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "main.moc"
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the plugins 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include <qimageiohandler.h>
|
||||
#include <qstringlist.h>
|
||||
|
||||
#ifdef QT_NO_IMAGEFORMAT_JPEG
|
||||
#undef QT_NO_IMAGEFORMAT_JPEG
|
||||
#endif
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QJpegPlugin : public QImageIOPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "jpeg.json")
|
||||
public:
|
||||
Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
|
||||
QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
Loading…
Reference in New Issue