diff options
Diffstat (limited to 'src/render/io')
-rw-r--r-- | src/render/io/abstractsceneparser.cpp | 2 | ||||
-rw-r--r-- | src/render/io/abstractsceneparser_p.h | 4 | ||||
-rw-r--r-- | src/render/io/objloader.cpp | 8 | ||||
-rw-r--r-- | src/render/io/qabstractsceneloader.cpp | 4 | ||||
-rw-r--r-- | src/render/io/qabstractsceneloader.h | 4 | ||||
-rw-r--r-- | src/render/io/qabstractsceneloader_p.h | 6 | ||||
-rw-r--r-- | src/render/io/qsceneloader.cpp | 2 | ||||
-rw-r--r-- | src/render/io/qsceneloader.h | 4 | ||||
-rw-r--r-- | src/render/io/scene.cpp | 4 | ||||
-rw-r--r-- | src/render/io/scenemanager_p.h | 4 |
10 files changed, 21 insertions, 21 deletions
diff --git a/src/render/io/abstractsceneparser.cpp b/src/render/io/abstractsceneparser.cpp index b7756f6cd..1237dcffa 100644 --- a/src/render/io/abstractsceneparser.cpp +++ b/src/render/io/abstractsceneparser.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "abstractsceneparser_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QStringList> QT_BEGIN_NAMESPACE diff --git a/src/render/io/abstractsceneparser_p.h b/src/render/io/abstractsceneparser_p.h index a4b5ab92d..eebb2e7f3 100644 --- a/src/render/io/abstractsceneparser_p.h +++ b/src/render/io/abstractsceneparser_p.h @@ -52,7 +52,7 @@ #include <QStringList> #include <QLoggingCategory> #include <QUrl> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE @@ -64,7 +64,7 @@ namespace Qt3DRender { Q_DECLARE_LOGGING_CATEGORY(SceneParsers) -class QT3DRENDERERSHARED_EXPORT AbstractSceneParser : public QObject +class QT3DRENDERSHARED_EXPORT AbstractSceneParser : public QObject { Q_OBJECT Q_PROPERTY(ParserStatus parserStatus READ parserStatus NOTIFY parserStatusChanged) diff --git a/src/render/io/objloader.cpp b/src/render/io/objloader.cpp index 09ab6985c..76bd9cfa5 100644 --- a/src/render/io/objloader.cpp +++ b/src/render/io/objloader.cpp @@ -41,16 +41,16 @@ #include "qattribute.h" #include <Qt3DCore/qaxisalignedboundingbox.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QFile> #include <QOpenGLBuffer> #include <QOpenGLShaderProgram> #include <QTextStream> #include <QVector> -#include <Qt3DRenderer/qgeometry.h> -#include <Qt3DRenderer/qattribute.h> -#include <Qt3DRenderer/qbuffer.h> +#include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qattribute.h> +#include <Qt3DRender/qbuffer.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qabstractsceneloader.cpp b/src/render/io/qabstractsceneloader.cpp index 110da9fa9..e8b0119d7 100644 --- a/src/render/io/qabstractsceneloader.cpp +++ b/src/render/io/qabstractsceneloader.cpp @@ -36,8 +36,8 @@ #include "qabstractsceneloader.h" #include "qabstractsceneloader_p.h" -#include <Qt3DRenderer/private/renderlogging_p.h> -#include <Qt3DRenderer/private/abstractsceneparser_p.h> +#include <Qt3DRender/private/renderlogging_p.h> +#include <Qt3DRender/private/abstractsceneparser_p.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qabstractsceneloader.h b/src/render/io/qabstractsceneloader.h index 66b41d265..e4f19eb12 100644 --- a/src/render/io/qabstractsceneloader.h +++ b/src/render/io/qabstractsceneloader.h @@ -39,7 +39,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> -#include <Qt3DRenderer/qt3drenderer_global.h> +#include <Qt3DRender/qt3drender_global.h> #include <QUrl> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ namespace Qt3DRender { class QAbstractSceneLoader; class QAbstractSceneLoaderPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent +class QT3DRENDERSHARED_EXPORT QAbstractSceneLoader : public Qt3DCore::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) diff --git a/src/render/io/qabstractsceneloader_p.h b/src/render/io/qabstractsceneloader_p.h index e62a588fb..c5ff77cd1 100644 --- a/src/render/io/qabstractsceneloader_p.h +++ b/src/render/io/qabstractsceneloader_p.h @@ -49,8 +49,8 @@ // #include <private/qcomponent_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qabstractsceneloader.h> +#include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/qabstractsceneloader.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ namespace Qt3DRender { class AbstractSceneParser; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate +class QT3DRENDERSHARED_EXPORT QAbstractSceneLoaderPrivate : public Qt3DCore::QComponentPrivate { public: QAbstractSceneLoaderPrivate(); diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index 70eb15533..d25a9bf55 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -39,7 +39,7 @@ #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qentity.h> -#include <Qt3DRenderer/private/renderlogging_p.h> +#include <Qt3DRender/private/renderlogging_p.h> #include <QThread> QT_BEGIN_NAMESPACE diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 5ca560fdd..d90747b10 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -37,13 +37,13 @@ #ifndef QT3DRENDER_QSCENELOADER_H #define QT3DRENDER_QSCENELOADER_H -#include <Qt3DRenderer/qabstractsceneloader.h> +#include <Qt3DRender/qabstractsceneloader.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader +class QT3DRENDERSHARED_EXPORT QSceneLoader : public QAbstractSceneLoader { Q_OBJECT public: diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp index 8874db279..0d4c97649 100644 --- a/src/render/io/scene.cpp +++ b/src/render/io/scene.cpp @@ -39,8 +39,8 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> -#include <Qt3DRenderer/qabstractsceneloader.h> -#include <Qt3DRenderer/private/scenemanager_p.h> +#include <Qt3DRender/qabstractsceneloader.h> +#include <Qt3DRender/private/scenemanager_p.h> QT_BEGIN_NAMESPACE diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 7baccd006..b6489da1d 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -49,9 +49,9 @@ // #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DRenderer/private/scene_p.h> +#include <Qt3DRender/private/scene_p.h> #include <Qt3DCore/qnodeid.h> -#include <Qt3DRenderer/private/loadscenejob_p.h> +#include <Qt3DRender/private/loadscenejob_p.h> QT_BEGIN_NAMESPACE |