aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-09-16 12:56:04 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-09-16 14:55:09 +0200
commit876408197b0b2fc8e11e82d318b8ea420206880e (patch)
treeabed646011b6c306587ab62506c1695e1627f769
parent1d67ecd790fe08a7cea1327ee754a9b8e74d113f (diff)
QQmlStringConverters: Remove dead code
createFromString() is only ever called for QVector2D, QVector3D, QVector4D, and QQuaternion. Those are all handled by the QtQuick implementation. Change-Id: Iaf2662207bf1110cb21761e4ffb401d8ebe521c6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/qml/qml/qqmlstringconverters.cpp87
1 files changed, 1 insertions, 86 deletions
diff --git a/src/qml/qml/qqmlstringconverters.cpp b/src/qml/qml/qqmlstringconverters.cpp
index bf291f0549..dd86f465a1 100644
--- a/src/qml/qml/qqmlstringconverters.cpp
+++ b/src/qml/qml/qqmlstringconverters.cpp
@@ -192,92 +192,7 @@ QRectF QQmlStringConverters::rectFFromString(const QString &s, bool *ok)
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 QQml_valueTypeProvider()->createValueFromString(type, s, data, n);
}
QT_END_NAMESPACE