diff options
Diffstat (limited to 'src/gui/kernel/qclipboard.cpp')
-rw-r--r-- | src/gui/kernel/qclipboard.cpp | 66 |
1 files changed, 19 insertions, 47 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp index 87fd222cb8..6a36862a04 100644 --- a/src/gui/kernel/qclipboard.cpp +++ b/src/gui/kernel/qclipboard.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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$ -** -****************************************************************************/ +// 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 "qclipboard.h" @@ -54,6 +18,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QClipboard \brief The QClipboard class provides access to the window system clipboard. @@ -137,6 +103,10 @@ QT_BEGIN_NAMESPACE \endlist + \section1 Notes for Android Users + + On Android only these mime types are supported: text/plain, text/html, and text/uri-list. + \sa QGuiApplication */ @@ -270,22 +240,23 @@ QString QClipboard::text(QString &subtype, Mode mode) const const QStringList formats = data->formats(); if (subtype.isEmpty()) { - if (formats.contains(QLatin1String("text/plain"))) - subtype = QLatin1String("plain"); + if (formats.contains("text/plain"_L1)) + subtype = "plain"_L1; else { - for (int i = 0; i < formats.size(); ++i) - if (formats.at(i).startsWith(QLatin1String("text/"))) { - subtype = formats.at(i).mid(5); + for (const auto &format : formats) { + if (format.startsWith("text/"_L1)) { + subtype = format.sliced(5); break; } + } if (subtype.isEmpty()) return QString(); } - } else if (!formats.contains(QLatin1String("text/") + subtype)) { + } else if (!formats.contains("text/"_L1 + subtype)) { return QString(); } - const QByteArray rawData = data->data(QLatin1String("text/") + subtype); + const QByteArray rawData = data->data("text/"_L1 + subtype); auto encoding = QStringConverter::encodingForData(rawData); if (!encoding) encoding = QStringConverter::Utf8; @@ -582,12 +553,13 @@ void QClipboard::emitChanged(Mode mode) case FindBuffer: emit findBufferChanged(); break; - default: - break; } + emit changed(mode); } QT_END_NAMESPACE +#include "moc_qclipboard.cpp" + #endif // QT_NO_CLIPBOARD |