1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QLockFilePrivate: initialize members in-class

Browse Source 
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>
This commit is contained in:
Ahmad Samir 2023-02-28 01:04:40 +02:00
parent 3dcd6b7ec9
commit 779bdf481c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/corelib/io/qlockfile_p.h
View File

@ -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)
{