summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qabstractfunctor.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/frontend/qabstractfunctor.h')
-rw-r--r--src/render/frontend/qabstractfunctor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qabstractfunctor.h b/src/render/frontend/qabstractfunctor.h
index e99953797..7d0dbc1f1 100644
--- a/src/render/frontend/qabstractfunctor.h
+++ b/src/render/frontend/qabstractfunctor.h
@@ -56,7 +56,7 @@ struct FunctorType
// The MSVC linker can under some cases optimize all the template
// functions into a single function. The code below is there to ensure
// that the linker won't collapse all these distincts functions into one
- static T *t = Q_NULLPTR;
+ static T *t = nullptr;
return reinterpret_cast<qintptr>(t);
}
};
@@ -84,7 +84,7 @@ public:
{
if (other->id() == functorTypeId<T>())
return static_cast<const T *>(other);
- return Q_NULLPTR;
+ return nullptr;
}
};
@@ -93,7 +93,7 @@ const T *functor_cast(const QAbstractFunctor *other)
{
if (other->id() == functorTypeId<T>())
return static_cast<const T *>(other);
- return Q_NULLPTR;
+ return nullptr;
}
} // Qt3D