Replace qt_make_unique with std::make_unique

We can depend on C++14 now. Change-Id: Iee9796cd22dbfbb70d4bdb25f0eee1662a026d6d Reviewed-by: Lars Knoll <[email protected]>
fwcd · Nov 23, 2020 · f61f8bb · f61f8bb
1 parent 03ab486
commit f61f8bb
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 123 deletions.
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
@@ -43,7 +43,6 @@ qt_internal_add_module(Core
         global/qlibraryinfo.cpp global/qlibraryinfo.h
         global/qlogging.cpp global/qlogging.h
         global/qmalloc.cpp
-        global/qmemory_p.h
         # global/qnamespace.h  # special case
         global/qnumeric.cpp global/qnumeric.h global/qnumeric_p.h
         global/qoperatingsystemversion.cpp global/qoperatingsystemversion.h global/qoperatingsystemversion_p.h

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
@@ -8,7 +8,6 @@ HEADERS +=  \
         global/qcompilerdetection.h \
         global/qcontainerinfo.h \
         global/qprocessordetection.h \
-        global/qmemory_p.h \
 	global/qnamespace.h \
         global/qendian.h \
         global/qendian_p.h \

diff --git a/src/corelib/global/qmemory_p.h b/src/corelib/global/qmemory_p.h
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
@@ -55,8 +55,6 @@
 # include "qcoreapplication.h"
 #endif
 
-#include <private/qmemory_p.h>
-
 #ifdef QT_NO_QOBJECT
 #define tr(X) QString::fromLatin1(X)
 #endif
@@ -87,7 +85,7 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF
     Q_UNUSED(fd);
     return false;
 #else
-    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fs = std::make_unique<QFSFileEngine>();
     auto fe = fs.get();
     fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fd, handleFlags);
@@ -102,7 +100,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl
     Q_UNUSED(fh);
     return false;
 #else
-    auto fs = qt_make_unique<QFSFileEngine>();
+    auto fs = std::make_unique<QFSFileEngine>();
     auto fe = fs.get();
     fileEngine = std::move(fs);
     return fe->open(QIODevice::OpenMode(flags), fh, handleFlags);

diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp
@@ -42,8 +42,6 @@
 #include "qfiledevice_p.h"
 #include "qfsfileengine_p.h"
 
-#include <private/qmemory_p.h>
-
 #ifdef QT_NO_QOBJECT
 #define tr(X) QString::fromLatin1(X)
 #endif
@@ -66,7 +64,7 @@ QFileDevicePrivate::~QFileDevicePrivate() = default;
 QAbstractFileEngine *QFileDevicePrivate::engine() const
 {
     if (!fileEngine)
-        fileEngine = qt_make_unique<QFSFileEngine>();
+        fileEngine = std::make_unique<QFSFileEngine>();
     return fileEngine.get();
 }
 

diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
@@ -418,7 +418,6 @@
 #include "private/qipaddress_p.h"
 #include "qurlquery.h"
 #include "private/qdir_p.h"
-#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -617,7 +616,7 @@ inline QUrlPrivate::~QUrlPrivate()
 
 std::unique_ptr<QUrlPrivate::Error> QUrlPrivate::cloneError() const
 {
-    return error ? qt_make_unique<Error>(*error) : nullptr;
+    return error ? std::make_unique<Error>(*error) : nullptr;
 }
 
 inline void QUrlPrivate::clearError()
@@ -631,7 +630,7 @@ inline void QUrlPrivate::setError(ErrorCode errorCode, const QString &source, in
         // don't overwrite an error set in a previous section during parsing
         return;
     }
-    error = qt_make_unique<Error>();
+    error = std::make_unique<Error>();
     error->code = errorCode;
     error->source = source;
     error->position = supplement;

diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp
@@ -52,8 +52,6 @@
 #include "qjson_p.h"
 #include "qdatastream.h"
 
-#include <private/qmemory_p.h>
-
 QT_BEGIN_NAMESPACE
 
 /*! \class QJsonDocument
@@ -139,7 +137,7 @@ QJsonDocument::QJsonDocument(const QJsonArray &array)
     \internal
  */
 QJsonDocument::QJsonDocument(const QCborValue &data)
-    : d(qt_make_unique<QJsonDocumentPrivate>(data))
+    : d(std::make_unique<QJsonDocumentPrivate>(data))
 {
     Q_ASSERT(d);
 }
@@ -158,7 +156,7 @@ QJsonDocument::QJsonDocument(const QJsonDocument &other)
 {
     if (other.d) {
         if (!d)
-            d = qt_make_unique<QJsonDocumentPrivate>();
+            d = std::make_unique<QJsonDocumentPrivate>();
         d->value = other.d->value;
     } else {
         d.reset();
@@ -184,7 +182,7 @@ QJsonDocument &QJsonDocument::operator =(const QJsonDocument &other)
     if (this != &other) {
         if (other.d) {
             if (!d)
-                d = qt_make_unique<QJsonDocumentPrivate>();
+                d = std::make_unique<QJsonDocumentPrivate>();
             else
                 d->clearRawData();
             d->value = other.d->value;
@@ -239,7 +237,7 @@ QJsonDocument QJsonDocument::fromVariant(const QVariant &variant)
         doc.setArray(QJsonArray::fromVariantList(variant.toList()));
         break;
     case QMetaType::QStringList:
-        doc.d = qt_make_unique<QJsonDocumentPrivate>();
+        doc.d = std::make_unique<QJsonDocumentPrivate>();
         doc.d->value = QCborArray::fromStringList(variant.toStringList());
         break;
     default:
@@ -320,7 +318,7 @@ QJsonDocument QJsonDocument::fromJson(const QByteArray &json, QJsonParseError *e
     QJsonDocument result;
     const QCborValue val = parser.parse(error);
     if (val.isArray() || val.isMap()) {
-        result.d = qt_make_unique<QJsonDocumentPrivate>();
+        result.d = std::make_unique<QJsonDocumentPrivate>();
         result.d->value = val;
     }
     return result;
@@ -405,7 +403,7 @@ QJsonArray QJsonDocument::array() const
 void QJsonDocument::setObject(const QJsonObject &object)
 {
     if (!d)
-        d = qt_make_unique<QJsonDocumentPrivate>();
+        d = std::make_unique<QJsonDocumentPrivate>();
     else
         d->clearRawData();
 
@@ -420,7 +418,7 @@ void QJsonDocument::setObject(const QJsonObject &object)
 void QJsonDocument::setArray(const QJsonArray &array)
 {
     if (!d)
-        d = qt_make_unique<QJsonDocumentPrivate>();
+        d = std::make_unique<QJsonDocumentPrivate>();
     else
         d->clearRawData();
 

diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
@@ -63,7 +63,6 @@ public: \
         { return QString::fromUtf8(sourceText); } \
 private:
 #endif
-#include <private/qmemory_p.h>
 
 #include <iterator>
 #include "qxmlstream_p.h"
@@ -875,7 +874,7 @@ void QXmlStreamReaderPrivate::parseEntity(const QString &value)
 
 
     if (!entityParser)
-        entityParser = qt_make_unique<QXmlStreamReaderPrivate>(q);
+        entityParser = std::make_unique<QXmlStreamReaderPrivate>(q);
     else
         entityParser->init();
     entityParser->inParseEntity = true;

diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -67,7 +67,6 @@
 #if defined(Q_OS_UNIX)
 #include <QtCore/qdir.h>
 #endif
-#include <QtCore/private/qmemory_p.h>
 #include <QtCore/private/qduplicatetracker_p.h>
 #if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
 #include <link.h>
@@ -658,12 +657,12 @@ struct LoadedOpenSsl {
 
 static bool tryToLoadOpenSslWin32Library(QLatin1String ssleay32LibName, QLatin1String libeay32LibName, LoadedOpenSsl &result)
 {
-    auto ssleay32 = qt_make_unique<QSystemLibrary>(ssleay32LibName);
+    auto ssleay32 = std::make_unique<QSystemLibrary>(ssleay32LibName);
     if (!ssleay32->load(false)) {
         return FALSE;
     }
 
-    auto libeay32 = qt_make_unique<QSystemLibrary>(libeay32LibName);
+    auto libeay32 = std::make_unique<QSystemLibrary>(libeay32LibName);
     if (!libeay32->load(false)) {
         return FALSE;
     }
@@ -700,7 +699,7 @@ struct LoadedOpenSsl {
 
 static LoadedOpenSsl loadOpenSsl()
 {
-    LoadedOpenSsl result = {qt_make_unique<QLibrary>(), qt_make_unique<QLibrary>()};
+    LoadedOpenSsl result = { std::make_unique<QLibrary>(), std::make_unique<QLibrary>() };
 
 # if defined(Q_OS_UNIX)
     QLibrary * const libssl = result.ssl.get();

diff --git a/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp b/src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
@@ -48,7 +48,6 @@
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
-#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -96,7 +95,7 @@ QEvdevTabletManager::~QEvdevTabletManager()
 void QEvdevTabletManager::addDevice(const QString &deviceNode)
 {
     qCDebug(qLcEvdevTablet, "Adding device at %ls", qUtf16Printable(deviceNode));
-    auto handler = qt_make_unique<QEvdevTabletHandlerThread>(deviceNode, m_spec);
+    auto handler = std::make_unique<QEvdevTabletHandlerThread>(deviceNode, m_spec);
     if (handler) {
         m_activeDevices.add(deviceNode, std::move(handler));
         updateDeviceCount();

diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp b/src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
@@ -48,7 +48,6 @@
 #include <QtDeviceDiscoverySupport/private/qdevicediscovery_p.h>
 #include <private/qguiapplication_p.h>
 #include <private/qinputdevicemanager_p_p.h>
-#include <private/qmemory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -96,7 +95,7 @@ QEvdevTouchManager::~QEvdevTouchManager()
 void QEvdevTouchManager::addDevice(const QString &deviceNode)
 {
     qCDebug(qLcEvdevTouch, "evdevtouch: Adding device at %ls", qUtf16Printable(deviceNode));
-    auto handler = qt_make_unique<QEvdevTouchScreenHandlerThread>(deviceNode, m_spec);
+    auto handler = std::make_unique<QEvdevTouchScreenHandlerThread>(deviceNode, m_spec);
     if (handler) {
         connect(handler.get(), &QEvdevTouchScreenHandlerThread::touchDeviceRegistered, this, &QEvdevTouchManager::updateInputDeviceCount);
         m_activeDevices.add(deviceNode, std::move(handler));

diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp
@@ -51,8 +51,6 @@
 #include <QtWidgets/QStyleOptionTitleBar>
 #include <QtWidgets/QGraphicsSceneMouseEvent>
 
-#include <private/qmemory_p.h>
-
 QT_BEGIN_NAMESPACE
 
 void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFlags)
@@ -121,7 +119,7 @@ QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate()
 void QGraphicsWidgetPrivate::ensureMargins() const
 {
     if (!margins)
-        margins = qt_make_unique<QMarginsF>();
+        margins = std::make_unique<QMarginsF>();
 }
 
 /*!
@@ -133,7 +131,7 @@ void QGraphicsWidgetPrivate::ensureMargins() const
 void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const
 {
     if (!windowFrameMargins)
-        windowFrameMargins = qt_make_unique<QMarginsF>();
+        windowFrameMargins = std::make_unique<QMarginsF>();
 }
 
 /*!
@@ -145,7 +143,7 @@ void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const
 void QGraphicsWidgetPrivate::ensureWindowData()
 {
     if (!windowData)
-        windowData = qt_make_unique<WindowData>();
+        windowData = std::make_unique<WindowData>();
 }
 
 void QGraphicsWidgetPrivate::setPalette_helper(const QPalette &palette)