diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-02-10 10:54:01 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-17 08:50:48 +0100 |
commit | 8fddd96d422f72255936fcb898f8ff36f779840a (patch) | |
tree | 8ce5f34efeeb13e80d0089840710525b0eb90435 /src/plugins/imageformats/ico | |
parent | 963b4c1647299fd023ddbe7c4a25ac404e303c5d (diff) |
Convert ico plugin to new format.
Change-Id: Ib0fb7bb9f853e39cd62b693bb5b43ae15f750d84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/imageformats/ico')
-rw-r--r-- | src/plugins/imageformats/ico/ico.json | 3 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/ico.pro | 3 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/main.cpp | 18 | ||||
-rw-r--r-- | src/plugins/imageformats/ico/main.h | 66 |
4 files changed, 72 insertions, 18 deletions
diff --git a/src/plugins/imageformats/ico/ico.json b/src/plugins/imageformats/ico/ico.json new file mode 100644 index 0000000000..d22cb739a1 --- /dev/null +++ b/src/plugins/imageformats/ico/ico.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "ico" ] +} diff --git a/src/plugins/imageformats/ico/ico.pro b/src/plugins/imageformats/ico/ico.pro index c0972fe189..242e42b869 100644 --- a/src/plugins/imageformats/ico/ico.pro +++ b/src/plugins/imageformats/ico/ico.pro @@ -3,9 +3,10 @@ load(qt_plugin) QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-ico)" -HEADERS += qicohandler.h +HEADERS += qicohandler.h main.h SOURCES += main.cpp \ qicohandler.cpp +OTHER_FILES += ico.json DESTDIR = $$QT.gui.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats diff --git a/src/plugins/imageformats/ico/main.cpp b/src/plugins/imageformats/ico/main.cpp index 5ebb24d06e..9c9525f48f 100644 --- a/src/plugins/imageformats/ico/main.cpp +++ b/src/plugins/imageformats/ico/main.cpp @@ -39,26 +39,12 @@ ** ****************************************************************************/ -#include <qimageiohandler.h> -#include <qdebug.h> +#include "main.h" #ifndef QT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEFORMAT_ICO -#undef QT_NO_IMAGEFORMAT_ICO -#endif -#include "qicohandler.h" - QT_BEGIN_NAMESPACE -class QICOPlugin : public QImageIOPlugin -{ -public: - QStringList keys() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; -}; - QStringList QICOPlugin::keys() const { return QStringList() << QLatin1String("ico"); @@ -89,8 +75,6 @@ QImageIOHandler *QICOPlugin::create(QIODevice *device, const QByteArray &format) return handler; } -Q_EXPORT_PLUGIN2(qico, QICOPlugin) - QT_END_NAMESPACE #endif /* QT_NO_IMAGEFORMATPLUGIN */ diff --git a/src/plugins/imageformats/ico/main.h b/src/plugins/imageformats/ico/main.h new file mode 100644 index 0000000000..6c7634002a --- /dev/null +++ b/src/plugins/imageformats/ico/main.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qimageiohandler.h> +#include <qdebug.h> + +#ifndef QT_NO_IMAGEFORMATPLUGIN + +#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: + QStringList keys() const; + Capabilities capabilities(QIODevice *device, const QByteArray &format) const; + QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; +}; + +QT_END_NAMESPACE + +#endif |