summaryrefslogtreecommitdiffstats
path: root/src/render/framegraph/qsortcriterion.h
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-03-01 02:13:35 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-03-01 19:26:22 +0000
commit792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch)
tree08002bd7d4ab4ce8e15604d7729b5721addf22df /src/render/framegraph/qsortcriterion.h
parent7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (diff)
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent. Task-number: QTBUG-45291 Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/qsortcriterion.h')
-rw-r--r--src/render/framegraph/qsortcriterion.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/framegraph/qsortcriterion.h b/src/render/framegraph/qsortcriterion.h
index e38356e66..44f047b13 100644
--- a/src/render/framegraph/qsortcriterion.h
+++ b/src/render/framegraph/qsortcriterion.h
@@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QSortCriterion : public Qt3DCore::QNode
Q_OBJECT
Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged)
public:
- explicit QSortCriterion(Qt3DCore::QNode *parent = 0);
+ explicit QSortCriterion(Qt3DCore::QNode *parent = Q_NULLPTR);
~QSortCriterion();
enum SortType {
@@ -70,7 +70,7 @@ Q_SIGNALS:
void sortChanged(SortType sort);
protected:
- QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = 0);
+ QSortCriterion(QSortCriterionPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR);
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
private: