From 9536a0ad48a54fef504689cc7a1e65ab865c5ff4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 15 Sep 2022 13:56:07 -0700 Subject: [PATCH] {QSharedMemory,QSystemSemaphore}Private: use NSDMI for the members Change-Id: If4c23ea3719947d790d4fffd171524225cc125fc Reviewed-by: Volker Hilsheimer --- src/corelib/kernel/qsharedmemory_android.cpp | 9 --------- src/corelib/kernel/qsharedmemory_p.h | 18 ++++++++---------- src/corelib/kernel/qsharedmemory_unix.cpp | 13 ------------- src/corelib/kernel/qsharedmemory_win.cpp | 6 ------ .../kernel/qsystemsemaphore_android.cpp | 6 ------ src/corelib/kernel/qsystemsemaphore_p.h | 17 ++++++++--------- src/corelib/kernel/qsystemsemaphore_unix.cpp | 10 ---------- src/corelib/kernel/qsystemsemaphore_win.cpp | 5 ----- 8 files changed, 16 insertions(+), 68 deletions(-) diff --git a/src/corelib/kernel/qsharedmemory_android.cpp b/src/corelib/kernel/qsharedmemory_android.cpp index e642a6fdd95..0cee2ab3af7 100644 --- a/src/corelib/kernel/qsharedmemory_android.cpp +++ b/src/corelib/kernel/qsharedmemory_android.cpp @@ -8,15 +8,6 @@ #if QT_CONFIG(sharedmemory) QT_BEGIN_NAMESPACE -QSharedMemoryPrivate::QSharedMemoryPrivate() - : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError), -#if QT_CONFIG(systemsemaphore) - systemSemaphore(QString()), lockedByMe(false), -#endif - unix_key(0) -{ -} - void QSharedMemoryPrivate::setErrorString(QLatin1StringView function) { Q_UNUSED(function); diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index d3cf56020bf..6d7973faf87 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -82,17 +82,15 @@ class Q_AUTOTEST_EXPORT QSharedMemoryPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QSharedMemory) public: - QSharedMemoryPrivate(); - - void *memory; - qsizetype size; + void *memory = nullptr; + qsizetype size = 0; QString key; QString nativeKey; - QSharedMemory::SharedMemoryError error; + QSharedMemory::SharedMemoryError error = QSharedMemory::NoError; QString errorString; #if QT_CONFIG(systemsemaphore) - QSystemSemaphore systemSemaphore; - bool lockedByMe; + QSystemSemaphore systemSemaphore{QString()}; + bool lockedByMe = false; #endif static int createUnixKeyFile(const QString &fileName); @@ -126,11 +124,11 @@ public: private: #ifdef Q_OS_WIN - Qt::HANDLE hand; + Qt::HANDLE hand = nullptr; #elif defined(QT_POSIX_IPC) - int hand; + int hand = -1; #else - key_t unix_key; + key_t unix_key = 0; #endif }; diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 7cbc4aa27fb..0696c3fe1d6 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -28,19 +28,6 @@ #if QT_CONFIG(sharedmemory) QT_BEGIN_NAMESPACE -QSharedMemoryPrivate::QSharedMemoryPrivate() : - memory(nullptr), size(0), error(QSharedMemory::NoError), -#if QT_CONFIG(systemsemaphore) - systemSemaphore(QString()), lockedByMe(false), -#endif -#ifndef QT_POSIX_IPC - unix_key(0) -#else - hand(-1) -#endif -{ -} - void QSharedMemoryPrivate::setErrorString(QLatin1StringView function) { // EINVAL is handled in functions so they can give better error strings diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index d73680daea7..bf8c625b396 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -13,12 +13,6 @@ using namespace Qt::StringLiterals; #if QT_CONFIG(sharedmemory) -QSharedMemoryPrivate::QSharedMemoryPrivate() : - memory(0), size(0), error(QSharedMemory::NoError), - systemSemaphore(QString()), lockedByMe(false), hand(0) -{ -} - void QSharedMemoryPrivate::setErrorString(QLatin1StringView function) { DWORD windowsError = GetLastError(); diff --git a/src/corelib/kernel/qsystemsemaphore_android.cpp b/src/corelib/kernel/qsystemsemaphore_android.cpp index 1a2a3fff8b0..5421dcbe8d5 100644 --- a/src/corelib/kernel/qsystemsemaphore_android.cpp +++ b/src/corelib/kernel/qsystemsemaphore_android.cpp @@ -10,12 +10,6 @@ QT_BEGIN_NAMESPACE -QSystemSemaphorePrivate::QSystemSemaphorePrivate() : - unix_key(-1), semaphore(-1), createdFile(false), - createdSemaphore(false), error(QSystemSemaphore::NoError) -{ -} - void QSystemSemaphorePrivate::setErrorString(const QString &function) { Q_UNUSED(function); diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index da04b662490..47c9cdfe22a 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -32,7 +32,6 @@ class QSystemSemaphorePrivate { public: - QSystemSemaphorePrivate(); QString makeKeyFileName() { @@ -61,18 +60,18 @@ public: QString fileName; int initialValue; #ifdef Q_OS_WIN - Qt::HANDLE semaphore; + Qt::HANDLE semaphore = nullptr; #elif defined(QT_POSIX_IPC) - sem_t *semaphore; - bool createdSemaphore; + sem_t *semaphore = SEM_FAILED; + bool createdSemaphore = false; #else - key_t unix_key; - int semaphore; - bool createdFile; - bool createdSemaphore; + key_t unix_key = -1; + int semaphore = -1; + bool createdFile = false; + bool createdSemaphore = false; #endif QString errorString; - QSystemSemaphore::SystemSemaphoreError error; + QSystemSemaphore::SystemSemaphoreError error = QSystemSemaphore::NoError; }; QT_END_NAMESPACE diff --git a/src/corelib/kernel/qsystemsemaphore_unix.cpp b/src/corelib/kernel/qsystemsemaphore_unix.cpp index 8c62434ffa5..5cb891129a3 100644 --- a/src/corelib/kernel/qsystemsemaphore_unix.cpp +++ b/src/corelib/kernel/qsystemsemaphore_unix.cpp @@ -21,16 +21,6 @@ QT_BEGIN_NAMESPACE -QSystemSemaphorePrivate::QSystemSemaphorePrivate() : -#ifndef QT_POSIX_IPC - unix_key(-1), semaphore(-1), createdFile(false), -#else - semaphore(SEM_FAILED), -#endif // QT_POSIX_IPC - createdSemaphore(false), error(QSystemSemaphore::NoError) -{ -} - void QSystemSemaphorePrivate::setErrorString(const QString &function) { // EINVAL is handled in functions so they can give better error strings diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index b84cf9f859a..f1b7e78ff7a 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -13,11 +13,6 @@ using namespace Qt::StringLiterals; #if QT_CONFIG(systemsemaphore) -QSystemSemaphorePrivate::QSystemSemaphorePrivate() : - semaphore(0), error(QSystemSemaphore::NoError) -{ -} - void QSystemSemaphorePrivate::setErrorString(const QString &function) { BOOL windowsError = GetLastError();