summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFranck Arrecot <franck.arrecot@kdab.com>2016-03-04 16:26:02 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-03-09 06:01:29 +0000
commit36ee501dbfdaad4e85fb4d5a7b96ec7676b20c6a (patch)
treec2325c9fa80ac76da0976cf0bab542dad1a0706a /src/plugins
parent56324985cde49e31f61a96911da2af4d8386356d (diff)
Class QAbstractSceneParser renamed to QSceneIOHandler
Task-number: QTBUG-51451 Change-Id: Icb92f564b4d02ceb29400efce8fad11563075a68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser.cpp2
-rw-r--r--src/plugins/sceneparsers/assimp/assimpparser.h4
-rw-r--r--src/plugins/sceneparsers/assimp/main.cpp2
-rw-r--r--src/plugins/sceneparsers/gltf/gltfparser.cpp2
-rw-r--r--src/plugins/sceneparsers/gltf/gltfparser.h4
-rw-r--r--src/plugins/sceneparsers/gltf/main.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index b8cb00d7b..7a9706ee5 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -288,7 +288,7 @@ private:
/*!
* Constructor. Initializes a new instance of AssimpParser.
*/
-AssimpParser::AssimpParser() : QAbstractSceneParser(),
+AssimpParser::AssimpParser() : QSceneIOHandler(),
m_sceneParsed(false),
m_scene(Q_NULLPTR)
{
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.h b/src/plugins/sceneparsers/assimp/assimpparser.h
index 22acd80c5..2ddd6eeb5 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.h
+++ b/src/plugins/sceneparsers/assimp/assimpparser.h
@@ -56,7 +56,7 @@
#include <assimp/scene.h>
#include <assimp/postprocess.h>
#include <assimp/DefaultLogger.hpp>
-#include <Qt3DRender/qabstractsceneparser.h>
+#include <Qt3DRender/qsceneiohandler.h>
#include "assimphelpers.h"
#include <QMap>
@@ -82,7 +82,7 @@ class QGeometryRenderer;
Q_DECLARE_LOGGING_CATEGORY(AssimpParserLog)
-class AssimpParser : public QAbstractSceneParser
+class AssimpParser : public QSceneIOHandler
{
Q_OBJECT
diff --git a/src/plugins/sceneparsers/assimp/main.cpp b/src/plugins/sceneparsers/assimp/main.cpp
index 0d3bc8965..8441ebce1 100644
--- a/src/plugins/sceneparsers/assimp/main.cpp
+++ b/src/plugins/sceneparsers/assimp/main.cpp
@@ -48,7 +48,7 @@ class AssimpSceneParserPlugin : public Qt3DRender::QSceneParserPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QSceneParserFactoryInterface_iid FILE "assimp.json")
- Qt3DRender::QAbstractSceneParser *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+ Qt3DRender::QSceneIOHandler *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
{
Q_UNUSED(key)
Q_UNUSED(paramList)
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index cd3830650..71dc23b22 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -162,7 +162,7 @@ const QString KEY_TECHNIQUE_GL2 = QStringLiteral("techniqueGL2");
} // of anonymous namespace
-GLTFParser::GLTFParser() : QAbstractSceneParser(),
+GLTFParser::GLTFParser() : QSceneIOHandler(),
m_parseDone(false)
{
}
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h
index 87c6859ab..c8c709c9c 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser.h
@@ -57,7 +57,7 @@
#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qabstractsceneparser.h>
+#include <Qt3DRender/qsceneiohandler.h>
QT_BEGIN_NAMESPACE
@@ -82,7 +82,7 @@ class QGeometryRenderer;
Q_DECLARE_LOGGING_CATEGORY(GLTFParserLog)
-class GLTFParser : public QAbstractSceneParser
+class GLTFParser : public QSceneIOHandler
{
Q_OBJECT
diff --git a/src/plugins/sceneparsers/gltf/main.cpp b/src/plugins/sceneparsers/gltf/main.cpp
index 54c8ec18d..3086e988a 100644
--- a/src/plugins/sceneparsers/gltf/main.cpp
+++ b/src/plugins/sceneparsers/gltf/main.cpp
@@ -49,7 +49,7 @@ class GLTFSceneParserPlugin : public Qt3DRender::QSceneParserPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QSceneParserFactoryInterface_iid FILE "gltf.json")
- Qt3DRender::QAbstractSceneParser *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
+ Qt3DRender::QSceneIOHandler *create(const QString &key, const QStringList &paramList) Q_DECL_OVERRIDE
{
Q_UNUSED(key)
Q_UNUSED(paramList)