diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2015-12-02 15:53:04 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-12-02 22:06:36 +0000 |
| commit | c45b47e99eaf0bcecec606a304b338424d58561b (patch) | |
| tree | 501e8e77c7f1462a44969c8b3c17acf72bdd645f /src/plugins | |
| parent | 4ab78c9a125abc667a4166c58f9be2d72bdef5a7 (diff) | |
Move core/io content to render/geometry and io
Change-Id: I79e0b0d62e07a269ebfce99edff56d30da28494c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpparser.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltf/gltfparser.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltf/gltfparser.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp index 0768d408e..5ffc1a4c8 100644 --- a/src/plugins/sceneparsers/assimp/assimpparser.cpp +++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp @@ -53,7 +53,7 @@ #include <QColor> #include <qmath.h> #include <Qt3DRender/private/renderlogging_p.h> -#include <Qt3DCore/private/qurlhelper_p.h> +#include <Qt3DRender/private/qurlhelper_p.h> #include <Qt3DRender/qgeometryrenderer.h> #include <Qt3DRender/qgeometry.h> @@ -319,7 +319,7 @@ bool AssimpParser::isAssimpPath(const QString &path) */ void AssimpParser::setSource(const QUrl &source) { - const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source); + const QString path = QUrlHelper::urlToLocalFileOrQrc(source); QFileInfo file(path); m_sceneDir = file.absoluteDir(); if (!file.exists()) { @@ -335,7 +335,7 @@ void AssimpParser::setSource(const QUrl &source) */ bool AssimpParser::isExtensionSupported(const QUrl &source) const { - const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source); + const QString path = QUrlHelper::urlToLocalFileOrQrc(source); return AssimpParser::isAssimpPath(path); } diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp index cf9c011cc..0ede1ead2 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.cpp +++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp @@ -48,7 +48,7 @@ #include <Qt3DCore/QEntity> #include <Qt3DCore/QTransform> -#include <Qt3DCore/private/qurlhelper_p.h> +#include <Qt3DRender/private/qurlhelper_p.h> #include <Qt3DRender/QAlphaCoverage> #include <Qt3DRender/QBlendEquation> @@ -187,7 +187,7 @@ bool GLTFParser::setJSON(const QJsonDocument &json ) */ void GLTFParser::setSource(const QUrl &source) { - const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source); + const QString path = QUrlHelper::urlToLocalFileOrQrc(source); QFileInfo finfo(path); if (!finfo.exists()) { qCWarning(GLTFParserLog) << "missing file:" << path; @@ -215,7 +215,7 @@ void GLTFParser::setSource(const QUrl &source) */ bool GLTFParser::isExtensionSupported(const QUrl &source) const { - const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source); + const QString path = QUrlHelper::urlToLocalFileOrQrc(source); return GLTFParser::isGLTFPath(path); } diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h index 85fff0040..0a4bbcfe9 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.h +++ b/src/plugins/sceneparsers/gltf/gltfparser.h @@ -163,7 +163,7 @@ private: QFile* resolveLocalData(QString path) const; QVariant parameterValueFromJSON(int type, const QJsonValue &value) const; - static Qt3DCore::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType); + static QAbstractAttribute::DataType accessorTypeFromJSON(int componentType); static uint accessorDataSizeFromJson(const QString &type); static QRenderState *buildStateEnable(int state); |