qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QML builtins: pass QDate and QTime by value rather than const ref 

They're simple integral types, for all the special semantics they're
wrapped in.

Change-Id: I80934f3feec94b82a8ccdf5f8320b04b18939348
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Edward Welbourne 2023-07-26 14:07:21 +02:00
parent e2a79cf159
commit 933d379f92
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qml/qml/qqmlbuiltinfunctions.cpp
View File

@ -808,12 +808,12 @@ static std::optional<QDate> dateFromString(const QString &string, QV4::Execution
return std::nullopt;
}
QString QtObject::formatDate(const QDate &date, const QString &format) const
QString QtObject::formatDate(QDate date, const QString &format) const
{
return date.toString(format);
}
QString QtObject::formatDate(const QDate &date, Qt::DateFormat format) const
QString QtObject::formatDate(QDate date, Qt::DateFormat format) const
{
return formatDateTimeObjectUsingDateFormat(date, format);
}
@ -845,7 +845,7 @@ QString QtObject::formatDate(const QString &string, Qt::DateFormat format) const
}
#if QT_CONFIG(qml_locale)
QString QtObject::formatDate(const QDate &date, const QLocale &locale,
QString QtObject::formatDate(QDate date, const QLocale &locale,
QLocale::FormatType formatType) const
{
return locale.toString(date, formatType);
@ -913,7 +913,7 @@ static std::optional<QTime> timeFromString(const QString &string, QV4::Execution
return std::nullopt;
}
QString QtObject::formatTime(const QTime &time, const QString &format) const
QString QtObject::formatTime(QTime time, const QString &format) const
{
return time.toString(format);
}
@ -932,7 +932,7 @@ QString QtObject::formatTime(const QString &time, const QString &format) const
return QString();
}
QString QtObject::formatTime(const QTime &time, Qt::DateFormat format) const
QString QtObject::formatTime(QTime time, Qt::DateFormat format) const
{
return formatDateTimeObjectUsingDateFormat(time, format);
}
@ -951,7 +951,7 @@ QString QtObject::formatTime(const QString &time, Qt::DateFormat format) const
}
#if QT_CONFIG(qml_locale)
QString QtObject::formatTime(const QTime &time, const QLocale &locale,
QString QtObject::formatTime(QTime time, const QLocale &locale,
QLocale::FormatType formatType) const
{
return locale.toString(time, formatType);

12
src/qml/qml/qqmlbuiltinfunctions_p.h
View File

@ -85,17 +85,17 @@ public:
Q_INVOKABLE QVariant alpha(const QJSValue &baseColor, double value) const;
Q_INVOKABLE QVariant tint(const QJSValue &baseColor, const QJSValue &tintColor) const;
Q_INVOKABLE QString formatDate(const QDate &date, const QString &format) const;
Q_INVOKABLE QString formatDate(QDate date, const QString &format) const;
Q_INVOKABLE QString formatDate(const QDateTime &dateTime, const QString &format) const;
Q_INVOKABLE QString formatDate(const QString &string, const QString &format) const;
Q_INVOKABLE QString formatDate(const QDate &date, Qt::DateFormat format) const;
Q_INVOKABLE QString formatDate(QDate date, Qt::DateFormat format) const;
Q_INVOKABLE QString formatDate(const QDateTime &dateTime, Qt::DateFormat format) const;
Q_INVOKABLE QString formatDate(const QString &string, Qt::DateFormat format) const;
Q_INVOKABLE QString formatTime(const QTime &time, const QString &format) const;
Q_INVOKABLE QString formatTime(QTime time, const QString &format) const;
Q_INVOKABLE QString formatTime(const QDateTime &dateTime, const QString &format) const;
Q_INVOKABLE QString formatTime(const QString &time, const QString &format) const;
Q_INVOKABLE QString formatTime(const QTime &time, Qt::DateFormat format) const;
Q_INVOKABLE QString formatTime(QTime time, Qt::DateFormat format) const;
Q_INVOKABLE QString formatTime(const QDateTime &dateTime, Qt::DateFormat format) const;
Q_INVOKABLE QString formatTime(const QString &time, Qt::DateFormat format) const;
@ -105,13 +105,13 @@ public:
Q_INVOKABLE QString formatDateTime(const QString &string, Qt::DateFormat format) const;
#if QT_CONFIG(qml_locale)
Q_INVOKABLE QString formatDate(const QDate &date, const QLocale &locale = QLocale(),
Q_INVOKABLE QString formatDate(QDate date, const QLocale &locale = QLocale(),
QLocale::FormatType formatType = QLocale::ShortFormat) const;
Q_INVOKABLE QString formatDate(const QDateTime &dateTime, const QLocale &locale = QLocale(),
QLocale::FormatType formatType = QLocale::ShortFormat) const;
Q_INVOKABLE QString formatDate(const QString &string, const QLocale &locale = QLocale(),
QLocale::FormatType formatType = QLocale::ShortFormat) const;
Q_INVOKABLE QString formatTime(const QTime &time, const QLocale &locale = QLocale(),
Q_INVOKABLE QString formatTime(QTime time, const QLocale &locale = QLocale(),
QLocale::FormatType formatType = QLocale::ShortFormat) const;
Q_INVOKABLE QString formatTime(const QDateTime &dateTime, const QLocale &locale = QLocale(),
QLocale::FormatType formatType = QLocale::ShortFormat) const;

4
tests/auto/qml/qqmlvaluetypeproviders/testtypes.h
View File

@ -307,7 +307,7 @@ public:
{
return m_aDate;
}
void setADate(const QDate &newADate)
void setADate(QDate newADate)
{
if (m_aDate == newADate)
return;
@ -319,7 +319,7 @@ public:
{
return m_aTime;
}
void setATime(const QTime &newATime)
void setATime(QTime newATime)
{
if (m_aTime == newATime)
return;