aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlstringconverters.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml/qqmlstringconverters.cpp')
-rw-r--r--src/qml/qml/qqmlstringconverters.cpp231
1 files changed, 18 insertions, 213 deletions
diff --git a/src/qml/qml/qqmlstringconverters.cpp b/src/qml/qml/qqmlstringconverters.cpp
index e53f90b45b..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,25 +12,9 @@
QT_BEGIN_NAMESPACE
-QVariant QQmlStringConverters::variantFromString(const QString &s)
+QVariant QQmlStringConverters::variantFromString(const QString &s, QMetaType preferredType, bool *ok)
{
- if (s.isEmpty())
- return QVariant(s);
-
- bool ok = false;
- QRectF r = rectFFromString(s, &ok);
- if (ok) return QVariant(r);
- QPointF p = pointFFromString(s, &ok);
- if (ok) return QVariant(p);
- QSizeF sz = sizeFFromString(s, &ok);
- if (ok) return QVariant(sz);
-
- return QQml_valueTypeProvider()->createVariantFromString(s);
-}
-
-QVariant QQmlStringConverters::variantFromString(const QString &s, int preferredType, bool *ok)
-{
- switch (preferredType) {
+ switch (preferredType.id()) {
case QMetaType::Int:
return QVariant(int(qRound(s.toDouble(ok))));
case QMetaType::UInt:
@@ -91,8 +39,17 @@ QVariant QQmlStringConverters::variantFromString(const QString &s, int preferred
return QVariant::fromValue(rectFFromString(s, ok));
case QMetaType::QRect:
return QVariant::fromValue(rectFFromString(s, ok).toRect());
- default:
- return QQml_valueTypeProvider()->createVariantFromString(preferredType, s, ok);
+ default: {
+ const QVariant ret = QQmlValueTypeProvider::createValueType(s, preferredType);
+ if (ret.isValid()) {
+ if (ok)
+ *ok = true;
+ return ret;
+ }
+ if (ok)
+ *ok = false;
+ return QVariant();
+ }
}
}
@@ -125,9 +82,6 @@ QDateTime QQmlStringConverters::dateTimeFromString(const QString &s, bool *ok)
{
QDateTime d = QDateTime::fromString(s, Qt::ISODate);
if (ok) *ok = d.isValid();
- // V8 never parses a date string as local time. For consistency do the same here.
- if (d.timeSpec() == Qt::LocalTime)
- d.setTimeSpec(Qt::UTC);
return d;
}
#endif // datestring
@@ -135,168 +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 = s.leftRef(index).toDouble(&xGood);
- qreal yCoord = s.midRef(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 = s.leftRef(index).toDouble(&wGood);
- qreal height = s.midRef(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 = s.leftRef(index).toDouble(&xGood);
- int index2 = s.indexOf(QLatin1Char(','), index+1);
- qreal y = s.midRef(index+1, index2-index-1).toDouble(&yGood);
- index = s.indexOf(QLatin1Char('x'), index2+1);
- qreal width = s.midRef(index2+1, index-index2-1).toDouble(&wGood);
- qreal height = s.midRef(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);
-}
-
-bool QQmlStringConverters::createFromString(int type, const QString &s, void *data, size_t n)
-{
- Q_ASSERT(data);
-
- bool ok = false;
-
- switch (type) {
- case QMetaType::Int:
- {
- Q_ASSERT(n >= sizeof(int));
- int *p = reinterpret_cast<int *>(data);
- *p = int(qRound(s.toDouble(&ok)));
- return ok;
- }
- case QMetaType::UInt:
- {
- Q_ASSERT(n >= sizeof(uint));
- uint *p = reinterpret_cast<uint *>(data);
- *p = uint(qRound(s.toDouble(&ok)));
- return ok;
- }
-#if QT_CONFIG(datestring)
- case QMetaType::QDate:
- {
- Q_ASSERT(n >= sizeof(QDate));
- QDate *p = reinterpret_cast<QDate *>(data);
- *p = dateFromString(s, &ok);
- return ok;
- }
- case QMetaType::QTime:
- {
- Q_ASSERT(n >= sizeof(QTime));
- QTime *p = reinterpret_cast<QTime *>(data);
- *p = timeFromString(s, &ok);
- return ok;
- }
- case QMetaType::QDateTime:
- {
- Q_ASSERT(n >= sizeof(QDateTime));
- QDateTime *p = reinterpret_cast<QDateTime *>(data);
- *p = dateTimeFromString(s, &ok);
- return ok;
- }
-#endif // datestring
- case QMetaType::QPointF:
- {
- Q_ASSERT(n >= sizeof(QPointF));
- QPointF *p = reinterpret_cast<QPointF *>(data);
- *p = pointFFromString(s, &ok);
- return ok;
- }
- case QMetaType::QPoint:
- {
- Q_ASSERT(n >= sizeof(QPoint));
- QPoint *p = reinterpret_cast<QPoint *>(data);
- *p = pointFFromString(s, &ok).toPoint();
- return ok;
- }
- case QMetaType::QSizeF:
- {
- Q_ASSERT(n >= sizeof(QSizeF));
- QSizeF *p = reinterpret_cast<QSizeF *>(data);
- *p = sizeFFromString(s, &ok);
- return ok;
- }
- case QMetaType::QSize:
- {
- Q_ASSERT(n >= sizeof(QSize));
- QSize *p = reinterpret_cast<QSize *>(data);
- *p = sizeFFromString(s, &ok).toSize();
- return ok;
- }
- case QMetaType::QRectF:
- {
- Q_ASSERT(n >= sizeof(QRectF));
- QRectF *p = reinterpret_cast<QRectF *>(data);
- *p = rectFFromString(s, &ok);
- return ok;
- }
- case QMetaType::QRect:
- {
- Q_ASSERT(n >= sizeof(QRect));
- QRect *p = reinterpret_cast<QRect *>(data);
- *p = rectFFromString(s, &ok).toRect();
- return ok;
- }
- default:
- return QQml_valueTypeProvider()->createValueFromString(type, s, data, n);
- }
+ return valueTypeFromNumberString<QRectF, 4, u',', u',', u'x'>(s, ok);
}
QT_END_NAMESPACE
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 22:20:06 +0000