From 35b96c0d3d45ac991528099f4effa708bbb170e8 Mon Sep 17 00:00:00 2001 From: John Layt Date: Mon, 16 Jan 2012 20:20:39 +0000 Subject: QDateTime: Deprecate setYMD() Change-Id: I077332df554fb750666d51486c97724411276679 Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/tools/qdatetime.cpp | 11 +++-------- src/corelib/tools/qdatetime.h | 6 +++++- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/corelib') 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); -- cgit v1.2.3