diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:25 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-02-01 13:33:26 +0100 |
| commit | 2bc362c9fa37455afbeb56e5f1852188ede3eab4 (patch) | |
| tree | b89e3c2c082a0285e8cd91733ddbc772fe4362a5 /src/corelib/io/qfiledevice.cpp | |
| parent | 5de981d3bc3df874f9df35a6899345f4f61fa951 (diff) | |
| parent | 481db443d502c8ebc169b7256cb696428cf02199 (diff) | |
Merge dev into 5.13
Change-Id: I8113c6d8735a151bd152e6096f8c8b8e63a05474
Diffstat (limited to 'src/corelib/io/qfiledevice.cpp')
| -rw-r--r-- | src/corelib/io/qfiledevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp index 2f99775c653..0689118f3eb 100644 --- a/src/corelib/io/qfiledevice.cpp +++ b/src/corelib/io/qfiledevice.cpp @@ -700,7 +700,7 @@ bool QFileDevice::setPermissions(Permissions permissions) Any mapping options can be passed through \a flags. - Returns a pointer to the memory or 0 if there is an error. + Returns a pointer to the memory or \nullptr if there is an error. \sa unmap() */ @@ -711,11 +711,11 @@ uchar *QFileDevice::map(qint64 offset, qint64 size, MemoryMapFlags flags) && d->fileEngine->supportsExtension(QAbstractFileEngine::MapExtension)) { unsetError(); uchar *address = d->fileEngine->map(offset, size, flags); - if (address == 0) + if (address == nullptr) d->setError(d->fileEngine->error(), d->fileEngine->errorString()); return address; } - return 0; + return nullptr; } /*! |