diff --git a/src/libs/vmisc/vlockguard.h b/src/libs/vmisc/vlockguard.h index 66491f1a6..8d6a213d0 100644 --- a/src/libs/vmisc/vlockguard.h +++ b/src/libs/vmisc/vlockguard.h @@ -36,7 +36,7 @@ #endif /*Q_OS_WIN*/ #include -#include +#include #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) #include "../vmisc/defglobal.h" @@ -57,6 +57,7 @@ template class VLockGuard { public: explicit VLockGuard(const QString &lockName, int stale = 0, int timeout = 0); + ~VLockGuard() = default; template VLockGuard(const QString &lockName, Alloc a, int stale = 0, int timeout = 0); @@ -73,21 +74,16 @@ private: // cppcheck-suppress unknownMacro Q_DISABLE_COPY_MOVE(VLockGuard) // NOLINT - QSharedPointer holder; - int lockError; - QString lockFile; - QSharedPointer lock; + QSharedPointer holder{}; + int lockError{0}; + QString lockFile{}; + QSharedPointer lock{}; auto TryLock(const QString &lockName, int stale, int timeout) -> bool; }; //--------------------------------------------------------------------------------------------------------------------- -template -VLockGuard::VLockGuard(const QString &lockName, int stale, int timeout) - : holder(nullptr), - lockError(0), - lockFile(), - lock(nullptr) +template VLockGuard::VLockGuard(const QString &lockName, int stale, int timeout) { if (TryLock(lockName, stale, timeout)) { @@ -101,10 +97,6 @@ VLockGuard::VLockGuard(const QString &lockName, int stale, int timeout) template template VLockGuard::VLockGuard(const QString &lockName, Alloc a, int stale, int timeout) - : holder(nullptr), - lockError(0), - lockFile(), - lock(nullptr) { if (TryLock(lockName, stale, timeout)) { @@ -116,10 +108,6 @@ VLockGuard::VLockGuard(const QString &lockName, Alloc a, int stale, int template template VLockGuard::VLockGuard(const QString &lockName, Alloc a, Delete d, int stale, int timeout) - : holder(nullptr), - lockError(0), - lockFile(), - lock(nullptr) { if (TryLock(lockName, stale, timeout)) {