diff options
author | John Layt <jlayt@kde.org> | 2012-01-16 20:20:39 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 04:02:25 +0100 |
commit | 35b96c0d3d45ac991528099f4effa708bbb170e8 (patch) | |
tree | 5344cca7ff27d9e5c84c1272fbface74ac0fc1e8 /src | |
parent | 21b5d0e2c3dfcafcca098d285498ffc9fbbf0498 (diff) |
QDateTime: Deprecate setYMD()
Change-Id: I077332df554fb750666d51486c97724411276679
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qdatetime.cpp | 11 | ||||
-rw-r--r-- | src/corelib/tools/qdatetime.h | 6 | ||||
-rw-r--r-- | src/dbus/qdbusargument.cpp | 2 | ||||
-rw-r--r-- | src/network/access/qftp.cpp | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 530b9e6b3f..6430e2c8bc 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -832,7 +832,9 @@ QString QDate::toString(const QString& format) const #endif //QT_NO_DATESTRING /*! - \obsolete + \fn bool setYMD(int y, int m, int d) + + \deprecated in 5.0, use setDate() instead. Sets the date's year \a y, month \a m, and day \a d. @@ -842,13 +844,6 @@ QString QDate::toString(const QString& format) const Use setDate() instead. */ -bool QDate::setYMD(int y, int m, int d) -{ - if (uint(y) <= 99) - y += 1900; - return setDate(y, m, d); -} - /*! \since 4.2 diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 1a0526a64b..056b0debf1 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -84,7 +84,11 @@ public: QString toString(Qt::DateFormat f = Qt::TextDate) const; QString toString(const QString &format) const; #endif - bool setYMD(int y, int m, int d); +#if QT_DEPRECATED_SINCE(5,0) +QT_DEPRECATED inline bool setYMD(int y, int m, int d) +{ if (uint(y) <= 99) y += 1900; return setDate(y, m, d); } +#endif + bool setDate(int year, int month, int day); void getDate(int *year, int *month, int *day); diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index b88d66696f..1c2cb6f0f0 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -1134,7 +1134,7 @@ const QDBusArgument &operator>>(const QDBusArgument &a, QDate &date) a.endStructure(); if (y != 0 && m != 0 && d != 0) - date.setYMD(y, m, d); + date.setDate(y, m, d); else date = QDate(); return a; diff --git a/src/network/access/qftp.cpp b/src/network/access/qftp.cpp index de3b07750a..c7ad810084 100644 --- a/src/network/access/qftp.cpp +++ b/src/network/access/qftp.cpp @@ -472,7 +472,7 @@ static void _q_fixupDateTime(QDateTime *dateTime) const int futureTolerance = 86400; if (dateTime->secsTo(QDateTime::currentDateTime()) < -futureTolerance) { QDate d = dateTime->date(); - d.setYMD(d.year() - 1, d.month(), d.day()); + d.setDate(d.year() - 1, d.month(), d.day()); dateTime->setDate(d); } } |