diff --git a/src/core/kernel/qsharedmemory.cpp b/src/core/kernel/qsharedmemory.cpp index 167736a12..a497e452f 100644 --- a/src/core/kernel/qsharedmemory.cpp +++ b/src/core/kernel/qsharedmemory.cpp @@ -57,9 +57,8 @@ QT_BEGIN_NAMESPACE On Unix this will be a file name */ -QString -QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, - const QString &prefix) +QString QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, + const QString &prefix) { if (key.isEmpty()) return QString(); @@ -407,7 +406,7 @@ bool QSharedMemory::attach(AccessMode mode) bool QSharedMemory::isAttached() const { Q_D(const QSharedMemory); - return (0 != d->memory); + return (d->memory != Q_NULLPTR); } /*! diff --git a/src/core/kernel/qsharedmemory_p.h b/src/core/kernel/qsharedmemory_p.h index a32bb3177..c0fb84a56 100644 --- a/src/core/kernel/qsharedmemory_p.h +++ b/src/core/kernel/qsharedmemory_p.h @@ -96,7 +96,7 @@ public: { if (q_sm && q_sm->lock()) return true; - q_sm = 0; + q_sm = Q_NULLPTR; return false; } diff --git a/src/core/kernel/qsharedmemory_unix.cpp b/src/core/kernel/qsharedmemory_unix.cpp index 71f6d495f..e51c16a4e 100644 --- a/src/core/kernel/qsharedmemory_unix.cpp +++ b/src/core/kernel/qsharedmemory_unix.cpp @@ -302,7 +302,7 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) // grab the memory memory = shmat(id, 0, (mode == QSharedMemory::ReadOnly ? SHM_RDONLY : 0)); if ((void*) - 1 == memory) { - memory = 0; + memory = Q_NULLPTR; setErrorString(QLatin1String("QSharedMemory::attach (shmat)")); return false; } @@ -348,11 +348,11 @@ bool QSharedMemoryPrivate::attach(QSharedMemory::AccessMode mode) // grab the memory int mprot = (mode == QSharedMemory::ReadOnly ? PROT_READ : PROT_READ | PROT_WRITE); - memory = mmap(0, size, mprot, MAP_SHARED, hand, 0); + memory = mmap(Q_NULLPTR, size, mprot, MAP_SHARED, hand, 0); if (memory == MAP_FAILED || !memory) { setErrorString(QLatin1String("QSharedMemory::attach (mmap)")); cleanHandle(); - memory = 0; + memory = Q_NULLPTR; size = 0; return false; } @@ -377,7 +377,7 @@ bool QSharedMemoryPrivate::detach() } return false; } - memory = 0; + memory = Q_NULLPTR; size = 0; // Get the number of current attachments @@ -416,7 +416,7 @@ bool QSharedMemoryPrivate::detach() setErrorString(QLatin1String("QSharedMemory::detach (munmap)")); return false; } - memory = 0; + memory = Q_NULLPTR; size = 0; // get the number of current attachments diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp index 11adbf76d..f72ec8178 100644 --- a/src/network/access/qnetworkdiskcache.cpp +++ b/src/network/access/qnetworkdiskcache.cpp @@ -288,8 +288,7 @@ void QNetworkDiskCachePrivate::storeItem(QCacheItem *cacheItem) currentCacheSize += 1024 + cacheItem->size(); currentCacheSize = q->expire(); if (!cacheItem->file) { - QString templateName = tmpCacheFileName(); - cacheItem->file = new QTemporaryFile(templateName, &cacheItem->data); + cacheItem->file = new QTemporaryFile(tmpCacheFileName(), &cacheItem->data); if (cacheItem->file->open()) { cacheItem->writeHeader(cacheItem->file); cacheItem->writeCompressedData(cacheItem->file);