From 9dacee18f9b7211699164bc70dd17f9934a15f50 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Thu, 1 Nov 2018 10:38:13 +0200
Subject: Replace 0 with nullptr

Prevents a lot of warnings seen in QtCreator

Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 src/libs/installer/lib7z_facade.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libs/installer/lib7z_facade.cpp')

diff --git a/src/libs/installer/lib7z_facade.cpp b/src/libs/installer/lib7z_facade.cpp
index f5561af2f..b3b3319e8 100644
--- a/src/libs/installer/lib7z_facade.cpp
+++ b/src/libs/installer/lib7z_facade.cpp
@@ -64,7 +64,7 @@
 #include <memory>
 
 #ifdef Q_OS_WIN
-HINSTANCE g_hInstance = 0;
+HINSTANCE g_hInstance = nullptr;
 
 # define S_IFMT 00170000
 # define S_IFLNK 0120000
@@ -353,16 +353,16 @@ static quint32 getUInt32Property(IInArchive *archive, int index, int propId, qui
 static QFile::Permissions getPermissions(IInArchive *archive, int index, bool *hasPermissions)
 {
     quint32 attributes = getUInt32Property(archive, index, kpidAttrib, 0);
-    QFile::Permissions permissions = 0;
+    QFile::Permissions permissions = nullptr;
     if (attributes & FILE_ATTRIBUTE_UNIX_EXTENSION) {
-        if (hasPermissions != 0)
+        if (hasPermissions != nullptr)
             *hasPermissions = true;
         // filter the Unix permissions
         attributes = (attributes >> 16) & 0777;
         permissions |= static_cast<QFile::Permissions>((attributes & 0700) << 2);  // owner rights
         permissions |= static_cast<QFile::Permissions>((attributes & 0070) << 1);  // group
         permissions |= static_cast<QFile::Permissions>((attributes & 0007) << 0);  // and world rights
-    } else if (hasPermissions != 0) {
+    } else if (hasPermissions != nullptr) {
         *hasPermissions = false;
     }
     return permissions;
@@ -536,7 +536,7 @@ QVector<File> listArchive(QFileDevice *archive)
                 f.archiveIndex.setY(item);
                 f.path = UString2QString(s).replace(QLatin1Char('\\'), QLatin1Char('/'));
                 Archive_IsItem_Folder(arch, item, f.isDirectory);
-                f.permissions = getPermissions(arch, item, 0);
+                f.permissions = getPermissions(arch, item, nullptr);
                 getDateTimeProperty(arch, item, kpidMTime, &(f.utcTime));
                 f.uncompressedSize = getUInt64Property(arch, item, kpidSize, 0);
                 f.compressedSize = getUInt64Property(arch, item, kpidPackSize, 0);
@@ -579,7 +579,7 @@ STDMETHODIMP ExtractCallback::SetCompleted(const UInt64 *c)
 // CDecoder::CodeSpec extracted content to an output stream.
 STDMETHODIMP ExtractCallback::GetStream(UInt32 index, ISequentialOutStream **outStream, Int32 /*askExtractMode*/)
 {
-    *outStream = 0;
+    *outStream = nullptr;
     if (targetDir.isEmpty())
         return E_FAIL;
 
@@ -790,14 +790,14 @@ HRESULT UpdateCallback::OpenFileError(const wchar_t*, DWORD)
 
 HRESULT UpdateCallback::CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password)
 {
-    *password = 0;
+    *password = nullptr;
     *passwordIsDefined = false;
     return S_OK;
 }
 
 HRESULT UpdateCallback::CryptoGetTextPassword(BSTR *password)
 {
-    *password = 0;
+    *password = nullptr;
     return E_NOTIMPL;
 }
 
-- 
cgit v1.2.3