diff options
Diffstat (limited to 'src/labs/sharedimage/qsharedimageloader.cpp')
| -rw-r--r-- | src/labs/sharedimage/qsharedimageloader.cpp | 49 |
1 files changed, 9 insertions, 40 deletions
diff --git a/src/labs/sharedimage/qsharedimageloader.cpp b/src/labs/sharedimage/qsharedimageloader.cpp index c9e3ef3eb3..f3c17f9ebb 100644 --- a/src/labs/sharedimage/qsharedimageloader.cpp +++ b/src/labs/sharedimage/qsharedimageloader.cpp @@ -1,47 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qsharedimageloader_p.h" #include <private/qobject_p.h> #include <private/qimage_p.h> + +#include <QtCore/qpointer.h> #include <QSharedMemory> +#include <memory> QT_BEGIN_NAMESPACE @@ -165,7 +132,7 @@ QImage QSharedImageLoaderPrivate::load(const QString &path, QSharedImageLoader:: if (path.isEmpty()) return nil; - QScopedPointer<QSharedMemory> shm(new QSharedMemory(q->key(path, params))); + auto shm = std::make_unique<QSharedMemory>(QSharedMemory::legacyNativeKey(q->key(path, params))); bool locked = false; if (!shm->attach(QSharedMemory::ReadOnly)) { @@ -213,7 +180,7 @@ QImage QSharedImageLoaderPrivate::load(const QString &path, QSharedImageLoader:: return nil; } - QSharedMemory *shmp = shm.take(); + QSharedMemory *shmp = shm.release(); SharedImageInfo *sii = new SharedImageInfo; sii->path = path; sii->shmp = shmp; @@ -264,3 +231,5 @@ QString QSharedImageLoader::key(const QString &path, ImageParameters *params) QT_END_NAMESPACE + +#include "moc_qsharedimageloader_p.cpp" |