diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 17:28:25 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-23 11:05:15 +0200 |
| commit | cbae0301c721a2767b4626138f4a7c0c69c487d4 (patch) | |
| tree | 62d6419d69741f461ad3b9b84500af89623cac02 /src | |
| parent | db0dc4f1db1094cfa0f27c3085aada0a0cf68cc6 (diff) | |
QLocale: purge deprecated API
Since 5.15 - toTime() with a calendar in the argument list
The calendar was never used.
Change-Id: I37897d47b42e69d1a8312e6389d6349febb889ae
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 37 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.h | 6 |
2 files changed, 0 insertions, 43 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 2febee62a9..b40ca317ea 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -2175,20 +2175,6 @@ QTime QLocale::toTime(const QString &string, FormatType format) const return toTime(string, timeFormat(format)); } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \since 5.14 - \overload - \deprecated -*/ -QTime QLocale::toTime(const QString &string, FormatType format, QCalendar cal) const -{ -QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED - return toTime(string, timeFormat(format), cal); -QT_WARNING_POP -} -#endif - /*! \since 4.4 @@ -2265,29 +2251,6 @@ QTime QLocale::toTime(const QString &string, const QString &format) const return time; } -#if QT_DEPRECATED_SINCE(5, 15) -/*! - \since 5.14 - \overload - \deprecated -*/ -QTime QLocale::toTime(const QString &string, const QString &format, QCalendar cal) const -{ - QTime time; -#if QT_CONFIG(datetimeparser) - QDateTimeParser dt(QMetaType::QTime, QDateTimeParser::FromString, cal); - dt.setDefaultLocale(*this); - if (dt.parseFormat(format)) - dt.fromString(string, nullptr, &time); -#else - Q_UNUSED(cal); - Q_UNUSED(string); - Q_UNUSED(format); -#endif - return time; -} -#endif - /*! \since 4.4 diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index ee7e978e48..f4a36123b6 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1030,12 +1030,6 @@ public: QDateTime toDateTime(const QString &string, FormatType format, QCalendar cal) const; QDate toDate(const QString &string, const QString &format, QCalendar cal) const; QDateTime toDateTime(const QString &string, const QString &format, QCalendar cal) const; -# if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Calendar is ignored when parsing times") - QTime toTime(const QString &string, FormatType format, QCalendar cal) const; - QT_DEPRECATED_X("Calendar is ignored when parsing times") - QTime toTime(const QString &string, const QString &format, QCalendar cal) const; -# endif // 5.15 #endif QString decimalPoint() const; |