diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
| commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
| tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/texture/qtexturedata.cpp | |
| parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) | |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/texture/qtexturedata.cpp')
| -rw-r--r-- | src/render/texture/qtexturedata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/texture/qtexturedata.cpp b/src/render/texture/qtexturedata.cpp index a45789297..7cf97b433 100644 --- a/src/render/texture/qtexturedata.cpp +++ b/src/render/texture/qtexturedata.cpp @@ -534,7 +534,7 @@ bool QTexImageDataPrivate::setDdsFile(const QString &source) const quint32 pixelFlags = qFromLittleEndian(header.pixelFormat.flags); const quint32 fourCC = qFromLittleEndian(header.pixelFormat.fourCC); - const FormatInfo *formatInfo = Q_NULLPTR; + const FormatInfo *formatInfo = nullptr; if ((pixelFlags & FourCCFlag) == FourCCFlag) { if (fourCC == DdsFourCC<'D', 'X', '1', '0'>::value) { @@ -587,7 +587,7 @@ bool QTexImageDataPrivate::setDdsFile(const QString &source) } } - if (formatInfo == Q_NULLPTR) { + if (formatInfo == nullptr) { qWarning() << "Unrecognized pixel format in" << source; return false; } |