diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /src/corelib/time/qcalendar.h | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'src/corelib/time/qcalendar.h')
| -rw-r--r-- | src/corelib/time/qcalendar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/time/qcalendar.h b/src/corelib/time/qcalendar.h index b117f4d6a9..42c8e150c5 100644 --- a/src/corelib/time/qcalendar.h +++ b/src/corelib/time/qcalendar.h @@ -128,7 +128,7 @@ public: User = -1 }; // New entries must be added to the \enum doc in qcalendar.cpp and - // handled in QCalendar::fromEnum() + // handled in QCalendarBackend::fromEnum() Q_ENUM(System) explicit QCalendar(); // Gregorian, optimised @@ -137,7 +137,7 @@ public: explicit QCalendar(QStringView name); // QCalendar is a trivially copyable value type. - bool isValid() { return d != nullptr; } + bool isValid() const { return d != nullptr; } // Date queries: int daysInMonth(int month, int year = Unspecified) const; @@ -155,9 +155,9 @@ public: bool isSolar() const; bool isProleptic() const; bool hasYearZero() const; - int maxDaysInMonth() const; - int minDaysInMonth() const; - int maxMonthsInYear() const; + int maximumDaysInMonth() const; + int minimumDaysInMonth() const; + int maximumMonthsInYear() const; QString name() const; // QDate conversions: |