diff options
| -rw-r--r-- | src/core/core.pri | 2 | ||||
| -rw-r--r-- | src/render/frontend/qabstractfunctor.cpp (renamed from src/core/qabstractfunctor.cpp) | 2 | ||||
| -rw-r--r-- | src/render/frontend/qabstractfunctor.h (renamed from src/core/qabstractfunctor.h) | 14 | ||||
| -rw-r--r-- | src/render/frontend/render-frontend.pri | 2 | ||||
| -rw-r--r-- | src/render/geometry/qbufferfunctor.h | 4 | ||||
| -rw-r--r-- | src/render/geometry/qgeometryfunctor.h | 4 | ||||
| -rw-r--r-- | src/render/texture/qabstracttextureimage.h | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/src/core/core.pri b/src/core/core.pri index 73c6035f7..55b46a8f7 100644 --- a/src/core/core.pri +++ b/src/core/core.pri @@ -40,7 +40,6 @@ HEADERS += \ $$PWD/qray3d.h \ $$PWD/qt3dcore_global_p.h \ $$PWD/qscene_p.h \ - $$PWD/qabstractfunctor.h \ $$PWD/qboundingvolume.h \ $$PWD/qboundingsphere.h \ $$PWD/qboundingvolumeprovider.h @@ -61,7 +60,6 @@ SOURCES += \ $$PWD/qbackendscenepropertychange.cpp \ $$PWD/qbackendnodefactory.cpp \ $$PWD/qray3d.cpp \ - $$PWD/qabstractfunctor.cpp \ $$PWD/qboundingvolume.cpp \ $$PWD/qboundingsphere.cpp \ $$PWD/qboundingvolumeprovider.cpp diff --git a/src/core/qabstractfunctor.cpp b/src/render/frontend/qabstractfunctor.cpp index f3f157b50..60b7816a0 100644 --- a/src/core/qabstractfunctor.cpp +++ b/src/render/frontend/qabstractfunctor.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3DCore { +namespace Qt3DRender { QAbstractFunctor::~QAbstractFunctor() { diff --git a/src/core/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h index fa89e392d..da96da124 100644 --- a/src/core/qabstractfunctor.h +++ b/src/render/frontend/qabstractfunctor.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3DCORE_QABSTRACTFUNCTOR_H -#define QT3DCORE_QABSTRACTFUNCTOR_H +#ifndef QT3DRENDER_QABSTRACTFUNCTOR_H +#define QT3DRENDER_QABSTRACTFUNCTOR_H -#include <Qt3DCore/qt3dcore_global.h> +#include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DCore { +namespace Qt3DRender { // This will generate a unique id() function per type // <=> 1 unique function address per type @@ -66,11 +66,11 @@ qintptr functorTypeId() #define QT3D_FUNCTOR(Class) \ qintptr id() const Q_DECL_OVERRIDE { \ - return Qt3DCore::functorTypeId<Class>(); \ + return Qt3DRender::functorTypeId<Class>(); \ } -class QT3DCORESHARED_EXPORT QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QAbstractFunctor { public: virtual ~QAbstractFunctor(); @@ -89,4 +89,4 @@ public: QT_END_NAMESPACE -#endif // QT3DCORE_QABSTRACTFUNCTOR_H +#endif // QT3DRENDER_QABSTRACTFUNCTOR_H diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri index de8f41a68..d20f89a56 100644 --- a/src/render/frontend/render-frontend.pri +++ b/src/render/frontend/render-frontend.pri @@ -1,6 +1,7 @@ INCLUDEPATH += $$PWD HEADERS += \ + $$PWD/qabstractfunctor.h \ $$PWD/qrenderaspect.h \ $$PWD/qrenderaspect_p.h \ $$PWD/qitemmodelbuffer.h \ @@ -16,6 +17,7 @@ HEADERS += \ $$PWD/qboundingvolumedebug.h SOURCES += \ + $$PWD/qabstractfunctor.cpp \ $$PWD/qrenderaspect.cpp \ $$PWD/qitemmodelbuffer.cpp \ $$PWD/sphere.cpp \ diff --git a/src/render/geometry/qbufferfunctor.h b/src/render/geometry/qbufferfunctor.h index b3e1074cc..2bed2c894 100644 --- a/src/render/geometry/qbufferfunctor.h +++ b/src/render/geometry/qbufferfunctor.h @@ -38,14 +38,14 @@ #define QT3DRENDER_QBUFFERFUNCTOR #include <Qt3DRender/qt3drender_global.h> -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <QSharedPointer> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QT3DRENDERSHARED_EXPORT QBufferFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QBufferFunctor : public QAbstractFunctor { public: virtual ~QBufferFunctor() {} diff --git a/src/render/geometry/qgeometryfunctor.h b/src/render/geometry/qgeometryfunctor.h index 71b1ab672..38fe6ebfc 100644 --- a/src/render/geometry/qgeometryfunctor.h +++ b/src/render/geometry/qgeometryfunctor.h @@ -38,7 +38,7 @@ #define QT3DRENDER_QGEOMETRYFUNCTOR #include <Qt3DRender/qt3drender_global.h> -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <QSharedPointer> QT_BEGIN_NAMESPACE @@ -47,7 +47,7 @@ namespace Qt3DRender { class QGeometry; -class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QGeometryFunctor : public QAbstractFunctor { public: virtual ~QGeometryFunctor() {} diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index bb626fa35..dee69c3a2 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -37,7 +37,7 @@ #ifndef QT3DRENDER_QABSTRACTTEXTUREIMAGE_H #define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H -#include <Qt3DCore/qabstractfunctor.h> +#include <Qt3DRender/qabstractfunctor.h> #include <Qt3DRender/qabstracttextureprovider.h> QT_BEGIN_NAMESPACE @@ -48,7 +48,7 @@ namespace Qt3DRender { // We might also get rid of the layer, face, mipmap level from // TexImageDataPtr and store that in the functor directly // or use the QTextureImage instead -class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor +class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public QAbstractFunctor { public: virtual ~QTextureDataFunctor() {} |