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

QLocale: purge deprecated API

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2020-07-16 17:28:25 +02:00
parent db0dc4f1db
commit cbae0301c7
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/corelib/text/qlocale.cpp
View File

@ -2175,20 +2175,6 @@ QTime QLocale::toTime(const QString &string, FormatType format) const
return toTime(string, timeFormat(format)); 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 \since 4.4
@ -2265,29 +2251,6 @@ QTime QLocale::toTime(const QString &string, const QString &format) const
return time; 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 \since 4.4

6
src/corelib/text/qlocale.h
View File

@ -1030,12 +1030,6 @@ public:
QDateTime toDateTime(const QString &string, FormatType format, QCalendar cal) const; QDateTime toDateTime(const QString &string, FormatType format, QCalendar cal) const;
QDate toDate(const QString &string, const QString &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; 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 #endif
QString decimalPoint() const; QString decimalPoint() const;