diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-17 13:40:00 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-23 09:50:21 +0100 |
commit | f61f8bb966fdc04662fb4e6597698b573fcb8b94 (patch) | |
tree | 80871d6271c059376edb205b8aa69d0b4621c9a3 /src/corelib/global | |
parent | 03ab48657d0486bd0e3754f1447a6fcd05846a5d (diff) |
Replace qt_make_unique with std::make_unique
We can depend on C++14 now.
Change-Id: Iee9796cd22dbfbb70d4bdb25f0eee1662a026d6d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/global.pri | 1 | ||||
-rw-r--r-- | src/corelib/global/qmemory_p.h | 71 |
2 files changed, 0 insertions, 72 deletions
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 4e9a0a0c8b..5850792bdb 100644 --- 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 deleted file mode 100644 index ac791385bd..0000000000 --- a/src/corelib/global/qmemory_p.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef QMEMORY_P_H -#define QMEMORY_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/qglobal.h> - -#include <memory> -#include <type_traits> -#include <utility> - -QT_BEGIN_NAMESPACE - -// Like std::make_unique, but less ambitious, so keep as private API, for use in Qt itself: -template <typename T, typename... Args> -typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type -qt_make_unique(Args &&...args) -{ - return std::unique_ptr<T>{new T(std::forward<Args>(args)...)}; -} - -QT_END_NAMESPACE - -#endif /* QMEMORY_P_H */ |