From 779bdf481ca208c20cfabd02d02d74175b0624b9 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <a.samirh78@gmail.com>
Date: Tue, 28 Feb 2023 01:04:40 +0200
Subject: [PATCH] QLockFilePrivate: initialize members in-class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cleans up the constructor.

Except for fileHandle member on Windows, initialize it in the
constructor with INVALID_HANDLE_VALUE as before. I don't know why
exactly that makes the build fail on Windows.

Change-Id: I8ade6f35ea6d9b3d31ef369d1f90d145e52ae8fc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
---
 src/corelib/io/qlockfile_p.h | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/corelib/io/qlockfile_p.h b/src/corelib/io/qlockfile_p.h
index 42aa5ecc251..4eea312ef5d 100644
--- a/src/corelib/io/qlockfile_p.h
+++ b/src/corelib/io/qlockfile_p.h
@@ -32,15 +32,7 @@ class QLockFilePrivate
 {
 public:
     QLockFilePrivate(const QString &fn)
-        : fileName(fn),
-#ifdef Q_OS_WIN
-          fileHandle(INVALID_HANDLE_VALUE),
-#else
-          fileHandle(-1),
-#endif
-          staleLockTime(30 * 1000), // 30 seconds
-          lockError(QLockFile::NoError),
-          isLocked(false)
+        : fileName(fn)
     {
     }
     QLockFile::LockError tryLock_sys();
@@ -55,14 +47,16 @@ public:
     static bool isProcessRunning(qint64 pid, const QString &appname);
 
     QString fileName;
+
 #ifdef Q_OS_WIN
-    Qt::HANDLE fileHandle;
+    Qt::HANDLE fileHandle = INVALID_HANDLE_VALUE;
 #else
-    int fileHandle;
+    int fileHandle = -1;
 #endif
-    int staleLockTime; // "int milliseconds" is big enough for 24 days
-    QLockFile::LockError lockError;
-    bool isLocked;
+    // "int milliseconds" is big enough for 24 days
+    int staleLockTime = 30 * 1000; // 30 seconds
+    QLockFile::LockError lockError = QLockFile::NoError;
+    bool isLocked = false;
 
     static int getLockFileHandle(QLockFile *f)
     {