diff options
author | Robert Brock <robert.brock@kdab.com> | 2017-02-09 12:02:43 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-04-01 12:49:26 +0000 |
commit | 71fd925db2bfa90b371c2f93d2d0b4da7200e11a (patch) | |
tree | f81cbe4db604847f38144ff4e5969b068579ac63 | |
parent | fd7561f6983fb0f8aa46fe32cc902ab3f8b24d0d (diff) |
Fixes includes to comply with coding conventions for Src/scene
Task-number: QTBUG-56185
Change-Id: Ie52778260f5d2b82e79207bc8f7a77c9f9082935
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimphelpers.cpp | 10 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimphelpers.h | 5 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.cpp | 24 | ||||
-rw-r--r-- | src/plugins/sceneparsers/assimp/assimpio.h | 9 | ||||
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfio.cpp | 36 | ||||
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfio.h | 4 |
6 files changed, 43 insertions, 45 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.cpp b/src/plugins/sceneparsers/assimp/assimphelpers.cpp index a8d935216..8b46abfd0 100644 --- a/src/plugins/sceneparsers/assimp/assimphelpers.cpp +++ b/src/plugins/sceneparsers/assimp/assimphelpers.cpp @@ -39,11 +39,11 @@ #include "assimphelpers.h" -#include <QFileDevice> -#include <QFileInfo> -#include <QUrl> -#include <QDir> -#include <QDebug> +#include <QtCore/QFileDevice> +#include <QtCore/QFileInfo> +#include <QtCore/QUrl> +#include <QtCore/QDir> +#include <QtCore/QDebug> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.h b/src/plugins/sceneparsers/assimp/assimphelpers.h index 21ac1b1ef..64a6d4abe 100644 --- a/src/plugins/sceneparsers/assimp/assimphelpers.h +++ b/src/plugins/sceneparsers/assimp/assimphelpers.h @@ -54,9 +54,8 @@ // ASSIMP INCLUDES #include <assimp/IOStream.hpp> #include <assimp/IOSystem.hpp> - -#include <QIODevice> -#include <QMap> +#include <QtCore/QIODevice> +#include <QtCore/QMap> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/assimp/assimpio.cpp b/src/plugins/sceneparsers/assimp/assimpio.cpp index ba0fa00ca..c45f1ebdd 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.cpp +++ b/src/plugins/sceneparsers/assimp/assimpio.cpp @@ -42,25 +42,27 @@ #include <Qt3DCore/private/qabstractnodefactory_p.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> +#include <Qt3DExtras/qdiffusemapmaterial.h> +#include <Qt3DExtras/qdiffusespecularmapmaterial.h> +#include <Qt3DExtras/qphongmaterial.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include <Qt3DRender/qcameralens.h> -#include <Qt3DRender/qparameter.h> #include <Qt3DRender/qeffect.h> -#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qgeometryrenderer.h> #include <Qt3DRender/qmaterial.h> -#include <Qt3DRender/qbuffer.h> -#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qmesh.h> +#include <Qt3DRender/qparameter.h> #include <Qt3DRender/qtexture.h> #include <Qt3DRender/qtextureimagedatagenerator.h> -#include <Qt3DExtras/qdiffusemapmaterial.h> -#include <Qt3DExtras/qdiffusespecularmapmaterial.h> -#include <Qt3DExtras/qphongmaterial.h> -#include <QFileInfo> -#include <QColor> +#include <QtCore/QFileInfo> +#include <QtGui/QColor> + #include <qmath.h> + #include <Qt3DRender/private/renderlogging_p.h> #include <Qt3DRender/private/qurlhelper_p.h> -#include <Qt3DRender/qgeometryrenderer.h> -#include <Qt3DRender/qgeometry.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/assimp/assimpio.h b/src/plugins/sceneparsers/assimp/assimpio.h index e3a7c96fa..d6b0585fa 100644 --- a/src/plugins/sceneparsers/assimp/assimpio.h +++ b/src/plugins/sceneparsers/assimp/assimpio.h @@ -56,12 +56,13 @@ #include <assimp/scene.h> #include <assimp/postprocess.h> #include <assimp/DefaultLogger.hpp> -#include <Qt3DRender/private/qsceneiohandler_p.h> +#include <QtCore/QMap> +#include <QtCore/QDir> +#include <QtCore/QLoggingCategory> + #include "assimphelpers.h" -#include <QMap> -#include <QDir> -#include <QLoggingCategory> +#include <Qt3DRender/private/qsceneiohandler_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/sceneparsers/gltf/gltfio.cpp b/src/plugins/sceneparsers/gltf/gltfio.cpp index e376d5303..c7c7a00dd 100644 --- a/src/plugins/sceneparsers/gltf/gltfio.cpp +++ b/src/plugins/sceneparsers/gltf/gltfio.cpp @@ -38,34 +38,27 @@ ** ****************************************************************************/ -#include "gltfio.h" - -#include <QtCore/QDir> -#include <QtCore/QFileInfo> -#include <QtCore/QJsonArray> -#include <QtCore/QJsonObject> - -#include <QtGui/QVector2D> - -#include <Qt3DRender/QCameraLens> #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> - -#include <Qt3DRender/private/qurlhelper_p.h> - +#include <Qt3DExtras/QDiffuseMapMaterial> +#include <Qt3DExtras/QDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QNormalDiffuseMapMaterial> +#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DExtras/QPhongMaterial> #include <Qt3DRender/QAlphaCoverage> #include <Qt3DRender/QBlendEquation> #include <Qt3DRender/QBlendEquationArguments> +#include <Qt3DRender/QCameraLens> #include <Qt3DRender/QColorMask> #include <Qt3DRender/QCullFace> -#include <Qt3DRender/QNoDepthMask> #include <Qt3DRender/QDepthTest> #include <Qt3DRender/QEffect> #include <Qt3DRender/QFrontFace> #include <Qt3DRender/QGeometry> #include <Qt3DRender/QGeometryRenderer> -#include <Qt3DRender/QMaterial> #include <Qt3DRender/QGraphicsApiFilter> +#include <Qt3DRender/QMaterial> +#include <Qt3DRender/QNoDepthMask> #include <Qt3DRender/QParameter> #include <Qt3DRender/QPolygonOffset> #include <Qt3DRender/QRenderState> @@ -73,12 +66,15 @@ #include <Qt3DRender/QShaderProgram> #include <Qt3DRender/QTechnique> #include <Qt3DRender/QTexture> +#include <QtCore/QDir> +#include <QtCore/QFileInfo> +#include <QtCore/QJsonArray> +#include <QtCore/QJsonObject> +#include <QtGui/QVector2D> -#include <Qt3DExtras/QPhongMaterial> -#include <Qt3DExtras/QDiffuseMapMaterial> -#include <Qt3DExtras/QDiffuseSpecularMapMaterial> -#include <Qt3DExtras/QNormalDiffuseMapMaterial> -#include <Qt3DExtras/QNormalDiffuseSpecularMapMaterial> +#include "gltfio.h" + +#include <Qt3DRender/private/qurlhelper_p.h> #ifndef qUtf16PrintableImpl // -Impl is a Qt 5.8 feature # define qUtf16PrintableImpl(string) \ diff --git a/src/plugins/sceneparsers/gltf/gltfio.h b/src/plugins/sceneparsers/gltf/gltfio.h index 15527c268..2dfdce9b2 100644 --- a/src/plugins/sceneparsers/gltf/gltfio.h +++ b/src/plugins/sceneparsers/gltf/gltfio.h @@ -52,11 +52,11 @@ // We mean it. // +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> #include <QtCore/QJsonDocument> #include <QtCore/QMultiHash> -#include <Qt3DRender/qattribute.h> -#include <Qt3DRender/qbuffer.h> #include <Qt3DRender/private/qsceneiohandler_p.h> QT_BEGIN_NAMESPACE |