From 8fddd96d422f72255936fcb898f8ff36f779840a Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Fri, 10 Feb 2012 10:54:01 +0100
Subject: Convert ico plugin to new format.

Change-Id: Ib0fb7bb9f853e39cd62b693bb5b43ae15f750d84
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/plugins/imageformats/ico/main.cpp | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'src/plugins/imageformats/ico/main.cpp')

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 */
-- 
cgit v1.2.3