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

QDateTime - Use the copy constructor in addDays/Months/Years

Browse Source 
Currently the QDateTime::addDays/Months/Years methods copy all the
d member variables themselves, but this is bad practice as it means 3
more places where we have to get the copy code correct.  Instead use
the copy constructor to do what it's meant to.  This saves more changes
when we add proper OffsetFromUTC and TimeZone support.

Change-Id: Ie2641d0cb58405335206edcce2e2db30702b78bf
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
John Layt 2013-08-01 15:51:08 +02:00 committed by The Qt Project
parent c8b0c428d2
commit 6be9cb2068
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2716,7 +2716,10 @@ QString QDateTime::toString(const QString& format) const
QDateTime QDateTime::addDays(qint64 ndays) const
{
return QDateTime(d->date.addDays(ndays), d->time, timeSpec());
QDateTime dt(*this);
dt.detach();
dt.d->date = d->date.addDays(ndays);
return dt;
}
/*!
@ -2729,7 +2732,10 @@ QDateTime QDateTime::addDays(qint64 ndays) const
QDateTime QDateTime::addMonths(int nmonths) const
{
return QDateTime(d->date.addMonths(nmonths), d->time, timeSpec());
QDateTime dt(*this);
dt.detach();
dt.d->date = d->date.addMonths(nmonths);
return dt;
}
/*!
@ -2742,7 +2748,10 @@ QDateTime QDateTime::addMonths(int nmonths) const
QDateTime QDateTime::addYears(int nyears) const
{
return QDateTime(d->date.addYears(nyears), d->time, timeSpec());
QDateTime dt(*this);
dt.detach();
dt.d->date = d->date.addYears(nyears);
return dt;
}
QDateTime QDateTimePrivate::addMSecs(const QDateTime &dt, qint64 msecs)