1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDateTime: s/QPair/std::pair/

Browse Source 
Task-number: QTBUG-115841
Change-Id: I8c225e51ca3539b816e549aaf589383ba90ac306
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 44df0a44b20138ff6b6232743afb5d8954374c3d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-12-12 10:09:06 +01:00 committed by Qt Cherry-pick Bot
parent f77af70148
commit 0710e9cd03
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/time/qdatetime.cpp
View File

@ -3299,7 +3299,7 @@ static void setDateTime(QDateTimeData &d, QDate date, QTime time)
} }
} }
static QPair<QDate, QTime> getDateTime(const QDateTimeData &d) static std::pair<QDate, QTime> getDateTime(const QDateTimeData &d)
{ {
auto status = getStatus(d); auto status = getStatus(d);
const qint64 msecs = getMSecs(d); const qint64 msecs = getMSecs(d);
@ -4568,7 +4568,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
return buf; return buf;
default: default:
case Qt::TextDate: { case Qt::TextDate: {
const QPair<QDate, QTime> p = getDateTime(d); const std::pair<QDate, QTime> p = getDateTime(d);
buf = toStringTextDate(p.first); buf = toStringTextDate(p.first);
// Insert time between date's day and year: // Insert time between date's day and year:
buf.insert(buf.lastIndexOf(u' '), buf.insert(buf.lastIndexOf(u' '),
@ -4596,7 +4596,7 @@ QString QDateTime::toString(Qt::DateFormat format) const
} }
case Qt::ISODate: case Qt::ISODate:
case Qt::ISODateWithMs: { case Qt::ISODateWithMs: {
const QPair<QDate, QTime> p = getDateTime(d); const std::pair<QDate, QTime> p = getDateTime(d);
buf = toStringIsoDate(p.first); buf = toStringIsoDate(p.first);
if (buf.isEmpty()) if (buf.isEmpty())
return QString(); // failed to convert return QString(); // failed to convert
@ -4720,7 +4720,7 @@ QDateTime QDateTime::addDays(qint64 ndays) const
return QDateTime(); return QDateTime();
QDateTime dt(*this); QDateTime dt(*this);
QPair<QDate, QTime> p = getDateTime(d); std::pair<QDate, QTime> p = getDateTime(d);
massageAdjustedDateTime(dt.d, p.first.addDays(ndays), p.second, ndays >= 0); massageAdjustedDateTime(dt.d, p.first.addDays(ndays), p.second, ndays >= 0);
return dt; return dt;
} }
@ -4746,7 +4746,7 @@ QDateTime QDateTime::addMonths(int nmonths) const
return QDateTime(); return QDateTime();
QDateTime dt(*this); QDateTime dt(*this);
QPair<QDate, QTime> p = getDateTime(d); std::pair<QDate, QTime> p = getDateTime(d);
massageAdjustedDateTime(dt.d, p.first.addMonths(nmonths), p.second, nmonths >= 0); massageAdjustedDateTime(dt.d, p.first.addMonths(nmonths), p.second, nmonths >= 0);
return dt; return dt;
} }
@ -4772,7 +4772,7 @@ QDateTime QDateTime::addYears(int nyears) const
return QDateTime(); return QDateTime();
QDateTime dt(*this); QDateTime dt(*this);
QPair<QDate, QTime> p = getDateTime(d); std::pair<QDate, QTime> p = getDateTime(d);
massageAdjustedDateTime(dt.d, p.first.addYears(nyears), p.second, nyears >= 0); massageAdjustedDateTime(dt.d, p.first.addYears(nyears), p.second, nyears >= 0);
return dt; return dt;
} }
@ -5941,7 +5941,7 @@ QDataStream &operator>>(QDataStream &in, QTime &time)
*/ */
QDataStream &operator<<(QDataStream &out, const QDateTime &dateTime) QDataStream &operator<<(QDataStream &out, const QDateTime &dateTime)
{ {
QPair<QDate, QTime> dateAndTime; std::pair<QDate, QTime> dateAndTime;
// TODO: new version, route spec and details via QTimeZone // TODO: new version, route spec and details via QTimeZone
if (out.version() >= QDataStream::Qt_5_2) { if (out.version() >= QDataStream::Qt_5_2) {