AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QDateTime: replace home-grown version of qToStringViewIgnoringNull with the real thing

Browse Source 
Change-Id: Ie71ed4f5c9a2bd0b14818f0f3cff4f88c2100546
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2017-04-20 01:33:21 +02:00
parent f73dbbaa3b
commit c38a1b4bb9
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/tools/qdatetime.cpp
View File

@ -70,13 +70,6 @@
QT_BEGIN_NAMESPACE
#if QT_STRINGVIEW_LEVEL < 2
static inline QStringView quick_stringview_cast(const QString &format)
{
return QStringView(format.data(), format.size()); // avoids isNull() check as we don't care
}
#endif
/*****************************************************************************
Date/Time Constants
*****************************************************************************/
@ -945,7 +938,7 @@ QString QDate::toString(QStringView format) const
#if QT_STRINGVIEW_LEVEL < 2
QString QDate::toString(const QString &format) const
{
return toString(quick_stringview_cast(format));
return toString(qToStringViewIgnoringNull(format));
}
#endif
@ -1704,7 +1697,7 @@ QString QTime::toString(QStringView format) const
#if QT_STRINGVIEW_VERSION < 2
QString QTime::toString(const QString &format) const
{
return toString(quick_stringview_cast(format));
return toString(qToStringViewIgnoringNull(format));
}
#endif
@ -3967,7 +3960,7 @@ QString QDateTime::toString(QStringView format) const
#if QT_STRINGVIEW_LEVEL < 2
QString QDateTime::toString(const QString &format) const
{
return toString(quick_stringview_cast(format));
return toString(qToStringViewIgnoringNull(format));
}
#endif