From 2419aeff9c72090157d056df5ce2f6212a715457 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 1 Feb 2012 11:44:14 +0100
Subject: QtSvg: Fix compile.

- Rename of QIconEngineV2 to QIconEngine.
- Fix test to run (add column).

Change-Id: Iea25847ef7e239927cf5bf1c0ea60454a8d6a158
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 src/plugins/iconengines/svgiconengine/main.cpp           | 6 +++---
 src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 4 ++--
 src/plugins/iconengines/svgiconengine/qsvgiconengine.h   | 4 ++--
 tests/auto/qsvgdevice/tst_qsvgdevice.cpp                 | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/iconengines/svgiconengine/main.cpp b/src/plugins/iconengines/svgiconengine/main.cpp
index 75f56d1..accacf5 100644
--- a/src/plugins/iconengines/svgiconengine/main.cpp
+++ b/src/plugins/iconengines/svgiconengine/main.cpp
@@ -52,11 +52,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSvgIconPlugin : public QIconEnginePluginV2
+class QSvgIconPlugin : public QIconEnginePlugin
 {
 public:
     QStringList keys() const;
-    QIconEngineV2 *create(const QString &filename = QString());
+    QIconEngine *create(const QString &filename = QString());
 };
 
 QStringList QSvgIconPlugin::keys() const
@@ -68,7 +68,7 @@ QStringList QSvgIconPlugin::keys() const
     return keys;
 }
 
-QIconEngineV2 *QSvgIconPlugin::create(const QString &file)
+QIconEngine *QSvgIconPlugin::create(const QString &file)
 {
     QSvgIconEngine *engine = new QSvgIconEngine;
     if (!file.isNull())
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index acd462e..7eff4cd 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -98,7 +98,7 @@ QSvgIconEngine::QSvgIconEngine()
 }
 
 QSvgIconEngine::QSvgIconEngine(const QSvgIconEngine &other)
-    : QIconEngineV2(other), d(new QSvgIconEnginePrivate)
+    : QIconEngine(other), d(new QSvgIconEnginePrivate)
 {
     d->svgFiles = other.d->svgFiles;
     if (other.d->svgBuffers)
@@ -240,7 +240,7 @@ QString QSvgIconEngine::key() const
     return QLatin1String("svg");
 }
 
-QIconEngineV2 *QSvgIconEngine::clone() const
+QIconEngine *QSvgIconEngine::clone() const
 {
     return new QSvgIconEngine(*this);
 }
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index 05ada5f..4a34467 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 class QSvgIconEnginePrivate;
 
-class QSvgIconEngine : public QIconEngineV2
+class QSvgIconEngine : public QIconEngine
 {
 public:
     QSvgIconEngine();
@@ -70,7 +70,7 @@ public:
                  QIcon::Mode mode, QIcon::State state);
 
     QString key() const;
-    QIconEngineV2 *clone() const;
+    QIconEngine *clone() const;
     bool read(QDataStream &in);
     bool write(QDataStream &out) const;
 
diff --git a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
index f522dae..c7fcecd 100644
--- a/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
+++ b/tests/auto/qsvgdevice/tst_qsvgdevice.cpp
@@ -75,6 +75,7 @@ tst_QSvgDevice::tst_QSvgDevice()
 
 void tst_QSvgDevice::play_data()
 {
+    QTest::addColumn<QString>("tag name");
     // we only use the tag name
     QTest::newRow( "lines" );
     QTest::newRow( "font" );
-- 
cgit v1.2.1