From de25c1d27dad66fdc72cab194a9f87bdd9f11eb9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 15 Sep 2022 13:30:48 -0700
Subject: [PATCH] QSharedMemory: remove QT_NO_QOBJECT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was only needed for bootstrapped builds, but QSharedMemory is no
longer part of it since commit 75082c9f20271eb7916a7e8e85d2e58b8e4b1392.

Change-Id: If4c23ea3719947d790d4fffd171522c0d5f9aafb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/kernel/qsharedmemory.cpp      | 18 +-----------------
 src/corelib/kernel/qsharedmemory.h        | 19 +------------------
 src/corelib/kernel/qsharedmemory_p.h      | 12 ++----------
 src/corelib/kernel/qsharedmemory_unix.cpp |  3 ---
 src/corelib/kernel/qsharedmemory_win.cpp  |  3 ---
 5 files changed, 4 insertions(+), 51 deletions(-)

diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 65ebd7aa82..58fc7d776f 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -174,17 +174,11 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
   \sa setKey()
  */
 
-#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(QObject *parent)
   : QObject(*new QSharedMemoryPrivate, parent)
 {
 }
-#else
-QSharedMemory::QSharedMemory()
-    : d_ptr(new QSharedMemoryPrivate)
-{
-}
-#endif
+
 /*!
   Constructs a shared memory object with the given \a parent and with
   its key set to \a key. Because its key is set, its create() and
@@ -192,19 +186,11 @@ QSharedMemory::QSharedMemory()
 
   \sa setKey(), create(), attach()
  */
-#ifndef QT_NO_QOBJECT
 QSharedMemory::QSharedMemory(const QString &key, QObject *parent)
     : QObject(*new QSharedMemoryPrivate, parent)
 {
     setKey(key);
 }
-#else
-QSharedMemory::QSharedMemory(const QString &key)
-    : d_ptr(new QSharedMemoryPrivate)
-{
-    setKey(key);
-}
-#endif
 
 /*!
   The destructor clears the key, which forces the shared memory object
@@ -642,6 +628,4 @@ QString QSharedMemory::errorString() const
 
 QT_END_NAMESPACE
 
-#ifndef QT_NO_QOBJECT
 #include "moc_qsharedmemory.cpp"
-#endif
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h
index b52a67f044..653fb1fb64 100644
--- a/src/corelib/kernel/qsharedmemory.h
+++ b/src/corelib/kernel/qsharedmemory.h
@@ -19,14 +19,9 @@ QT_BEGIN_NAMESPACE
 
 class QSharedMemoryPrivate;
 
-class Q_CORE_EXPORT QSharedMemory
-#ifndef QT_NO_QOBJECT
-    : public QObject
-#endif
+class Q_CORE_EXPORT QSharedMemory : public QObject
 {
-#ifndef QT_NO_QOBJECT
     Q_OBJECT
-#endif
     Q_DECLARE_PRIVATE(QSharedMemory)
 
 public:
@@ -49,17 +44,8 @@ public:
         UnknownError
     };
 
-#ifndef QT_NO_QOBJECT
     QSharedMemory(QObject *parent = nullptr);
     QSharedMemory(const QString &key, QObject *parent = nullptr);
-#else
-    QSharedMemory();
-    QSharedMemory(const QString &key);
-    static QString tr(const char * str)
-    {
-        return QString::fromLatin1(str);
-    }
-#endif
     ~QSharedMemory();
 
     void setKey(const QString &key);
@@ -88,9 +74,6 @@ public:
 
 private:
     Q_DISABLE_COPY(QSharedMemory)
-#ifdef QT_NO_QOBJECT
-    QScopedPointer<QSharedMemoryPrivate> d_ptr;
-#endif
 };
 
 #endif // QT_CONFIG(sharedmemory)
diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h
index a9ac2c59ed..d3cf56020b 100644
--- a/src/corelib/kernel/qsharedmemory_p.h
+++ b/src/corelib/kernel/qsharedmemory_p.h
@@ -37,10 +37,7 @@ QT_END_NAMESPACE
 #else
 
 #include "qsystemsemaphore.h"
-
-#ifndef QT_NO_QOBJECT
-# include "private/qobject_p.h"
-#endif
+#include "private/qobject_p.h"
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS)
 #  include <sys/sem.h>
@@ -80,14 +77,9 @@ private:
 };
 #endif // QT_CONFIG(systemsemaphore)
 
-class Q_AUTOTEST_EXPORT QSharedMemoryPrivate
-#ifndef QT_NO_QOBJECT
-        : public QObjectPrivate
-#endif
+class Q_AUTOTEST_EXPORT QSharedMemoryPrivate : public QObjectPrivate
 {
-#ifndef QT_NO_QOBJECT
     Q_DECLARE_PUBLIC(QSharedMemory)
-#endif
 
 public:
     QSharedMemoryPrivate();
diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 2c071f3735..7cbc4aa27f 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -29,9 +29,6 @@
 QT_BEGIN_NAMESPACE
 
 QSharedMemoryPrivate::QSharedMemoryPrivate() :
-#ifndef QT_NO_QOBJECT
-    QObjectPrivate(),
-#endif
     memory(nullptr), size(0), error(QSharedMemory::NoError),
 #if QT_CONFIG(systemsemaphore)
       systemSemaphore(QString()), lockedByMe(false),
diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp
index 8c0c295ae0..d73680daea 100644
--- a/src/corelib/kernel/qsharedmemory_win.cpp
+++ b/src/corelib/kernel/qsharedmemory_win.cpp
@@ -14,9 +14,6 @@ using namespace Qt::StringLiterals;
 #if QT_CONFIG(sharedmemory)
 
 QSharedMemoryPrivate::QSharedMemoryPrivate() :
-#ifndef QT_NO_QOBJECT
-    QObjectPrivate(),
-#endif
         memory(0), size(0), error(QSharedMemory::NoError),
            systemSemaphore(QString()), lockedByMe(false), hand(0)
 {