diff options
Diffstat (limited to 'src/qml/qml/qqmlstringconverters.cpp')
| -rw-r--r-- | src/qml/qml/qqmlstringconverters.cpp | 120 |
1 files changed, 15 insertions, 105 deletions
diff --git a/src/qml/qml/qqmlstringconverters.cpp b/src/qml/qml/qqmlstringconverters.cpp index 9c2e715a6a..a1f8cce67c 100644 --- a/src/qml/qml/qqmlstringconverters.cpp +++ b/src/qml/qml/qqmlstringconverters.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml 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 "qqmlstringconverters_p.h" #include <private/qqmlglobal_p.h> @@ -48,9 +12,9 @@ QT_BEGIN_NAMESPACE -QVariant QQmlStringConverters::variantFromString(const QString &s, int preferredType, bool *ok) +QVariant QQmlStringConverters::variantFromString(const QString &s, QMetaType preferredType, bool *ok) { - switch (preferredType) { + switch (preferredType.id()) { case QMetaType::Int: return QVariant(int(qRound(s.toDouble(ok)))); case QMetaType::UInt: @@ -76,11 +40,15 @@ QVariant QQmlStringConverters::variantFromString(const QString &s, int preferred case QMetaType::QRect: return QVariant::fromValue(rectFFromString(s, ok).toRect()); default: { - QVariant ret; - bool success = QQml_valueTypeProvider()->createValueType(preferredType, QJSValue(s), ret); + const QVariant ret = QQmlValueTypeProvider::createValueType(s, preferredType); + if (ret.isValid()) { + if (ok) + *ok = true; + return ret; + } if (ok) - *ok = success; - return ret; + *ok = false; + return QVariant(); } } } @@ -121,77 +89,19 @@ QDateTime QQmlStringConverters::dateTimeFromString(const QString &s, bool *ok) //expects input of "x,y" QPointF QQmlStringConverters::pointFFromString(const QString &s, bool *ok) { - if (s.count(QLatin1Char(',')) != 1) { - if (ok) - *ok = false; - return QPointF(); - } - - bool xGood, yGood; - int index = s.indexOf(QLatin1Char(',')); - qreal xCoord = QStringView{s}.left(index).toDouble(&xGood); - qreal yCoord = QStringView{s}.mid(index+1).toDouble(&yGood); - if (!xGood || !yGood) { - if (ok) - *ok = false; - return QPointF(); - } - - if (ok) - *ok = true; - return QPointF(xCoord, yCoord); + return valueTypeFromNumberString<QPointF, 2, u','>(s, ok); } //expects input of "widthxheight" QSizeF QQmlStringConverters::sizeFFromString(const QString &s, bool *ok) { - if (s.count(QLatin1Char('x')) != 1) { - if (ok) - *ok = false; - return QSizeF(); - } - - bool wGood, hGood; - int index = s.indexOf(QLatin1Char('x')); - qreal width = QStringView{s}.left(index).toDouble(&wGood); - qreal height = QStringView{s}.mid(index+1).toDouble(&hGood); - if (!wGood || !hGood) { - if (ok) - *ok = false; - return QSizeF(); - } - - if (ok) - *ok = true; - return QSizeF(width, height); + return valueTypeFromNumberString<QSizeF, 2, u'x'>(s, ok); } //expects input of "x,y,widthxheight" //### use space instead of second comma? QRectF QQmlStringConverters::rectFFromString(const QString &s, bool *ok) { - if (s.count(QLatin1Char(',')) != 2 || s.count(QLatin1Char('x')) != 1) { - if (ok) - *ok = false; - return QRectF(); - } - - bool xGood, yGood, wGood, hGood; - int index = s.indexOf(QLatin1Char(',')); - qreal x = QStringView{s}.left(index).toDouble(&xGood); - int index2 = s.indexOf(QLatin1Char(','), index+1); - qreal y = QStringView{s}.mid(index+1, index2-index-1).toDouble(&yGood); - index = s.indexOf(QLatin1Char('x'), index2+1); - qreal width = QStringView{s}.mid(index2+1, index-index2-1).toDouble(&wGood); - qreal height = QStringView{s}.mid(index+1).toDouble(&hGood); - if (!xGood || !yGood || !wGood || !hGood) { - if (ok) - *ok = false; - return QRectF(); - } - - if (ok) - *ok = true; - return QRectF(x, y, width, height); + return valueTypeFromNumberString<QRectF, 4, u',', u',', u'x'>(s, ok); } QT_END_NAMESPACE |