diff options
Diffstat (limited to 'src/quick3d/quick3drender/scene2d/scene2d_p.h')
| -rw-r--r-- | src/quick3d/quick3drender/scene2d/scene2d_p.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/quick3d/quick3drender/scene2d/scene2d_p.h b/src/quick3d/quick3drender/scene2d/scene2d_p.h index f6e3f8903..950ddaa5b 100644 --- a/src/quick3d/quick3drender/scene2d/scene2d_p.h +++ b/src/quick3d/quick3drender/scene2d/scene2d_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3DRENDER_RENDER_SCENE2D_P_H -#define QT3DRENDER_RENDER_SCENE2D_P_H +#ifndef QT3DRENDER_RENDER_QUICK_SCENE2D_P_H +#define QT3DRENDER_RENDER_QUICK_SCENE2D_P_H // // W A R N I N G @@ -50,8 +50,8 @@ #include <Qt3DCore/qnodeid.h> -#include <Qt3DRender/private/framegraphnode_p.h> -#include <Qt3DRender/private/qscene2d_p.h> +#include <private/framegraphnode_p.h> +#include <private/qscene2d_p.h> #include <QtCore/QCoreApplication> #include <QtCore/QSemaphore> @@ -63,6 +63,9 @@ namespace Qt3DRender { namespace Render { class GraphicsContext; + +namespace Quick { + class Scene2D; class RenderQmlEventHandler : public QObject @@ -85,7 +88,7 @@ public: void attach(); void render(); void initializeRender(); - void setSharedObject(Scene2DSharedObjectPtr sharedObject); + void setSharedObject(Qt3DRender::Quick::Scene2DSharedObjectPtr sharedObject); void cleanup(); void setTexture(Qt3DCore::QNodeId textureId); void checkInitialized(); @@ -97,7 +100,7 @@ public: GraphicsContext *m_graphicsContext; QThread *m_renderThread; Qt3DCore::QNodeId m_textureId; - QSharedPointer<Scene2DSharedObject> m_sharedObject; + QSharedPointer<Qt3DRender::Quick::Scene2DSharedObject> m_sharedObject; AttachmentPack m_attachments; Texture *m_texture; @@ -106,10 +109,10 @@ public: bool m_renderOnce; }; +} // Quick } // Render - } // Qt3DRender QT_END_NAMESPACE -#endif // QT3DRENDER_RENDER_SCENE2D_P_H +#endif // QT3DRENDER_RENDER_QUICK_SCENE2D_P_H |