diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/frontend/framegraph-components/qsortmethod.h | |
parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend/framegraph-components/qsortmethod.h')
-rw-r--r-- | src/render/frontend/framegraph-components/qsortmethod.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/frontend/framegraph-components/qsortmethod.h b/src/render/frontend/framegraph-components/qsortmethod.h index c0f17fdd4..5eb5ee85e 100644 --- a/src/render/frontend/framegraph-components/qsortmethod.h +++ b/src/render/frontend/framegraph-components/qsortmethod.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTMETHOD_H -#define QT3D_QSORTMETHOD_H +#ifndef QT3DRENDER_QSORTMETHOD_H +#define QT3DRENDER_QSORTMETHOD_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortCriterion; class QSortMethodPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(QNode *parent = 0); + explicit QSortMethod(Qt3D::QNode *parent = 0); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,16 +59,16 @@ public: QList<QSortCriterion *> criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSortMethod) QT3D_CLONEABLE(QSortMethod) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTMETHOD_H +#endif // QT3DRENDER_QSORTMETHOD_H |