diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-18 09:58:19 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-19 10:51:25 +0000 |
| commit | 18964d9ebed281a72506eccdf26319ce18be46d7 (patch) | |
| tree | 9c184a8645f0d3ea72fc692f84332fc9be01bf2e /src/plugins/sceneparsers/assimp | |
| parent | d9ae5577ea87ae23731fe54dd79fd80ecd1de1fa (diff) | |
Rename Renderer -> Render throughout
This is for consistency between the C++ namespaces and QML imports and
with the other aspects.
Change-Id: I73392f138b4e519b12888f52530123e3d0ba445e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/assimp')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimp.pro | 2 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 26 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser_p.h | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimp.pro b/src/plugins/sceneparsers/assimp/assimp.pro index fe834252b..a7607cb73 100644 --- a/src/plugins/sceneparsers/assimp/assimp.pro +++ b/src/plugins/sceneparsers/assimp/assimp.pro @@ -1,5 +1,5 @@ TARGET = assimpsceneparser -QT += core-private 3dcore 3dcore-private 3drenderer 3drenderer-private +QT += core-private 3dcore 3dcore-private 3drender 3drender-private PLUGIN_TYPE = sceneparsers PLUGIN_CLASS_NAME = AssimpParser diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 4036fd7d3..35437ff07 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -41,23 +41,23 @@ #include <Qt3DCore/qlookattransform.h> #include <Qt3DCore/qmatrixtransform.h> #include <Qt3DCore/qcameralens.h> -#include <Qt3DRenderer/qparameter.h> -#include <Qt3DRenderer/qeffect.h> -#include <Qt3DRenderer/qmesh.h> -#include <Qt3DRenderer/qmaterial.h> -#include <Qt3DRenderer/qbuffer.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qtexture.h> -#include <Qt3DRenderer/qdiffusemapmaterial.h> -#include <Qt3DRenderer/qdiffusespecularmapmaterial.h> -#include <Qt3DRenderer/qphongmaterial.h> +#include <Qt3DRender/qparameter.h> +#include <Qt3DRender/qeffect.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qmaterial.h> +#include <Qt3DRender/qbuffer.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qtexture.h> +#include <Qt3DRender/qdiffusemapmaterial.h> +#include <Qt3DRender/qdiffusespecularmapmaterial.h> +#include <Qt3DRender/qphongmaterial.h> #include <QFileInfo> #include <QColor> #include <qmath.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DCore/private/qurlhelper_p.h> -#include <Qt3DRenderer/qgeometryrenderer.h> -#include <Qt3DRenderer/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> +#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/assimp/assimpparser_p.h b/src/plugins/sceneparsers/assimp/assimpparser_p.h index 00304b262..33bcf1831 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser_p.h +++ b/src/plugins/sceneparsers/assimp/assimpparser_p.h @@ -53,7 +53,7 @@ #include <assimp/scene.h> #include <assimp/postprocess.h> #include <assimp/DefaultLogger.hpp> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> #include "assimphelpers_p.h" #include <QMap> |