diff options
Diffstat (limited to 'src/corelib/text/qstringliteral.h')
| -rw-r--r-- | src/corelib/text/qstringliteral.h | 60 |
1 files changed, 17 insertions, 43 deletions
diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h index d86e6eafd9..429d9c02ad 100644 --- a/src/corelib/text/qstringliteral.h +++ b/src/corelib/text/qstringliteral.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2020 Intel Corporation. -** Contact: https://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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2020 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QSTRINGLITERAL_H #define QSTRINGLITERAL_H @@ -56,13 +20,23 @@ QT_BEGIN_NAMESPACE // core language feature, so just use u"" here unconditionally: #define QT_UNICODE_LITERAL(str) u"" str + +using QStringPrivate = QArrayDataPointer<char16_t>; + +namespace QtPrivate { +template <qsizetype N> +static Q_ALWAYS_INLINE QStringPrivate qMakeStringPrivate(const char16_t (&literal)[N]) +{ + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-const-cast) + auto str = const_cast<char16_t *>(literal); + return { nullptr, str, N - 1 }; +} +} + #define QStringLiteral(str) \ - (QString(QStringPrivate(nullptr, \ - const_cast<char16_t *>(QT_UNICODE_LITERAL(str)), \ - sizeof(QT_UNICODE_LITERAL(str))/2 - 1))) \ + (QString(QtPrivate::qMakeStringPrivate(QT_UNICODE_LITERAL(str)))) \ /**/ -using QStringPrivate = QArrayDataPointer<char16_t>; QT_END_NAMESPACE |