diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
| commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
| tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/core/qabstractfunctor.h | |
| parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) | |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/qabstractfunctor.h')
| -rw-r--r-- | src/core/qabstractfunctor.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/qabstractfunctor.h b/src/core/qabstractfunctor.h index 47edc62f1..fa89e392d 100644 --- a/src/core/qabstractfunctor.h +++ b/src/core/qabstractfunctor.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTFUNCTOR_H -#define QT3D_QABSTRACTFUNCTOR_H +#ifndef QT3DCORE_QABSTRACTFUNCTOR_H +#define QT3DCORE_QABSTRACTFUNCTOR_H #include <Qt3DCore/qt3dcore_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { // This will generate a unique id() function per type // <=> 1 unique function address per type @@ -66,7 +66,7 @@ qintptr functorTypeId() #define QT3D_FUNCTOR(Class) \ qintptr id() const Q_DECL_OVERRIDE { \ - return Qt3D::functorTypeId<Class>(); \ + return Qt3DCore::functorTypeId<Class>(); \ } @@ -89,4 +89,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTFUNCTOR_H +#endif // QT3DCORE_QABSTRACTFUNCTOR_H |