diff options
Diffstat (limited to 'src/core/resources/qresourcemanager_p.h')
| -rw-r--r-- | src/core/resources/qresourcemanager_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index c6e632bba..4af596c33 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTRESOURCESMANAGER_H -#define QT3D_QABSTRACTRESOURCESMANAGER_H +#ifndef QT3DCORE_QABSTRACTRESOURCESMANAGER_H +#define QT3DCORE_QABSTRACTRESOURCESMANAGER_H // // W A R N I N G @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { template <class Host> struct NonLockingPolicy @@ -127,7 +127,7 @@ enum }; #define Q_DECLARE_RESOURCE_INFO(TYPE, FLAGS) \ - namespace Qt3D { \ + namespace Qt3DCore { \ template<> \ struct QResourceInfo<TYPE > \ { \ @@ -136,7 +136,7 @@ enum needsCleanup = ((FLAGS & Q_REQUIRES_CLEANUP) == 0) \ }; \ }; \ -} // namespace Qt3D +} // namespace Qt3DCore template <int v> struct Int2Type @@ -457,4 +457,4 @@ private: QT_END_NAMESPACE -#endif // QT3D_QABSTRACTRESOURCESMANAGER_H +#endif // QT3DCORE_QABSTRACTRESOURCESMANAGER_H |