diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2019-09-03 15:18:14 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-09-04 18:43:35 +0200 |
commit | 46ec24d2b9a0fb1d59955f11dab0ead05dd017f9 (patch) | |
tree | 552d32c9f7b8d447359771987f25a0fcfa15b764 /src/corelib/text | |
parent | 978f579a8c6a6cff3803cc62d4b09c974f476285 (diff) |
Rename calendar methods from m{in,ax} to m{in,ax}imum
Words should not be abbreviated.
Split a long line and reflowed some comments in the process.
Fixes: QTBUG-78008
Change-Id: I52d75409f02e2cecbed3e94d424617ad594c275b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/text')
-rw-r--r-- | src/corelib/text/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 91e393e343..48d57e5e6e 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -2916,7 +2916,7 @@ static QString rawStandaloneWeekDayName(const QLocaleData *data, const int day, QString QCalendarBackend::monthName(const QLocale &locale, int month, int, QLocale::FormatType format) const { - Q_ASSERT(month >= 1 && month <= maxMonthsInYear()); + Q_ASSERT(month >= 1 && month <= maximumMonthsInYear()); return rawMonthName(localeMonthIndexData()[locale.d->m_data_offset], localeMonthData(), month, format); } @@ -2942,7 +2942,7 @@ QString QGregorianCalendar::monthName(const QLocale &locale, int month, int year QString QCalendarBackend::standaloneMonthName(const QLocale &locale, int month, int, QLocale::FormatType format) const { - Q_ASSERT(month >= 1 && month <= maxMonthsInYear()); + Q_ASSERT(month >= 1 && month <= maximumMonthsInYear()); return rawStandaloneMonthName(localeMonthIndexData()[locale.d->m_data_offset], localeMonthData(), month, format); } |