diff options
Diffstat (limited to 'src/multimediaquick/qquickimagecapture.cpp')
| -rw-r--r-- | src/multimediaquick/qquickimagecapture.cpp | 69 |
1 files changed, 16 insertions, 53 deletions
diff --git a/src/multimediaquick/qquickimagecapture.cpp b/src/multimediaquick/qquickimagecapture.cpp index 95519ef28..b7e56d18d 100644 --- a/src/multimediaquick/qquickimagecapture.cpp +++ b/src/multimediaquick/qquickimagecapture.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 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 "qquickimagecapture_p.h" #include "qquickimagepreviewprovider_p.h" @@ -92,7 +56,7 @@ QT_BEGIN_NAMESPACE QQuickImageCapture::QQuickImageCapture(QObject *parent) : QImageCapture(parent) { - connect(this, SIGNAL(imageCaptured(int,QImage)), this, SLOT(_q_imageCaptured(int,QImage))); + connect(this, &QImageCapture::imageCaptured, this, &QQuickImageCapture::_q_imageCaptured); } QQuickImageCapture::~QQuickImageCapture() = default; @@ -176,46 +140,45 @@ void QQuickImageCapture::saveToFile(const QUrl &location) const void QQuickImageCapture::_q_imageCaptured(int id, const QImage &preview) { - QString previewId = QString::fromLatin1("preview_%1").arg(id); + QString previewId = QStringLiteral("preview_%1").arg(id); QQuickImagePreviewProvider::registerPreview(previewId, preview); - m_capturedImagePath = QString::fromLatin1("image://camera/%2").arg(previewId); + m_capturedImagePath = QStringLiteral("image://camera/%2").arg(previewId); m_lastImage = preview; emit previewChanged(); } /*! - \qmlsignal QtMultimedia::ImageCapture::errorOccurred(requestId, error, message) + \qmlsignal QtMultimedia::ImageCapture::errorOccurred(id, error, errorString) - This signal is emitted when an error occurs during capture with \a requestId. + This signal is emitted when an error occurs during capture with requested \a id. \a error is an enumeration of type ImageCapture::Error. - A descriptive message is available in \a message. + A descriptive message is available in \a errorString. */ /*! - \qmlsignal QtMultimedia::ImageCapture::imageCaptured(requestId, previewImage) + \qmlsignal QtMultimedia::ImageCapture::imageCaptured(requestId, preview) - This signal is emitted when an image with \a requestId has been captured - but not yet saved to the filesystem. The \a previewImage + This signal is emitted when an image with requested id \a requestId has been captured + but not yet saved to the filesystem. The \a preview parameter is the captured image. \sa imageSaved, preview */ /*! - \qmlsignal QtMultimedia::ImageCapture::imageSaved(requestId, path) + \qmlsignal QtMultimedia::ImageCapture::imageSaved(id, fileName) - This signal is emitted after the image with \a requestId has been written to the filesystem. - The \a path is a local file path, not a URL. + This signal is emitted after the image with requested \a id has been written to the filesystem. + The \a fileName is a local file path, not a URL. \sa imageCaptured */ /*! - \qmlsignal QtMultimedia::ImageCapture::imageMetadataAvailable(requestId, key, value) + \qmlsignal QtMultimedia::ImageCapture::imageMetadataAvailable(id, metaData) - This signal is emitted when the image with \a requestId has new metadata - available with the key \a key and value \a value. + This signal is emitted when the image with requested \a id has new \a metaData. \sa imageCaptured */ |