diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-26 22:18:40 +0300 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-29 11:17:28 +0300 |
| commit | adab531771a1ddce7df6652449b7977f340ebfc7 (patch) | |
| tree | e4373c2c618af1c0bd54178cf502f6ca2fd1be5c /src/corelib/time | |
| parent | eb39185acba01250240c289b1b3e64892f615357 (diff) | |
Port from QStringViewLiteral to u""
Now that all our supported compilers know char16_t, we no longer need
QStringViewLiteral, whose only purpose in life was to turn u"" into
L"" for MSVC < 2015.
Change-Id: I25a094fe7992d9d5dbeb4a524d9e99e043dcb8ce
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 5142d2442c..64943bdaaf 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -1129,7 +1129,7 @@ QString QDate::toString(Qt::DateFormat format) const case Qt::DefaultLocaleLongDate: return QLocale().toString(*this, QLocale::LongFormat); case Qt::RFC2822Date: - return QLocale::c().toString(*this, QStringViewLiteral("dd MMM yyyy")); + return QLocale::c().toString(*this, u"dd MMM yyyy"); default: #if QT_CONFIG(textdate) case Qt::TextDate: @@ -4122,7 +4122,7 @@ QString QDateTime::toString(Qt::DateFormat format) const case Qt::DefaultLocaleLongDate: return QLocale().toString(*this, QLocale::LongFormat); case Qt::RFC2822Date: { - buf = QLocale::c().toString(*this, QStringViewLiteral("dd MMM yyyy hh:mm:ss ")); + buf = QLocale::c().toString(*this, u"dd MMM yyyy hh:mm:ss "); buf += toOffsetString(Qt::TextDate, offsetFromUtc()); return buf; } @@ -5622,7 +5622,7 @@ QDebug operator<<(QDebug dbg, const QTime &time) QDebugStateSaver saver(dbg); dbg.nospace() << "QTime("; if (time.isValid()) - dbg.nospace() << time.toString(QStringViewLiteral("HH:mm:ss.zzz")); + dbg.nospace() << time.toString(u"HH:mm:ss.zzz"); else dbg.nospace() << "Invalid"; dbg.nospace() << ')'; @@ -5635,7 +5635,7 @@ QDebug operator<<(QDebug dbg, const QDateTime &date) dbg.nospace() << "QDateTime("; if (date.isValid()) { const Qt::TimeSpec ts = date.timeSpec(); - dbg.noquote() << date.toString(QStringViewLiteral("yyyy-MM-dd HH:mm:ss.zzz t")) + dbg.noquote() << date.toString(u"yyyy-MM-dd HH:mm:ss.zzz t") << ' ' << ts; switch (ts) { case Qt::UTC: |