diff options
Diffstat (limited to 'src/corelib/time')
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/time/qdatetime_p.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index a9bd59a156..9638c5b5e8 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -2848,7 +2848,7 @@ static int systemTimeYearMatching(int year) // Convert an MSecs Since Epoch into Local Time bool QDateTimePrivate::epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTime, - QDateTimePrivate::DaylightStatus *daylightStatus) + DaylightStatus *daylightStatus) { if (!millisInSystemRange(msecs)) { // Docs state any LocalTime after 2038-01-18 *will* have any DST applied. @@ -2891,7 +2891,7 @@ bool QDateTimePrivate::epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTi // DST status into a UTC epoch msecs. Optionally populate the returned // values from mktime for the adjusted local date and time. qint64 QDateTimePrivate::localMSecsToEpochMSecs(qint64 localMsecs, - QDateTimePrivate::DaylightStatus *daylightStatus, + DaylightStatus *daylightStatus, QDate *localDate, QTime *localTime, QString *abbreviation) { diff --git a/src/corelib/time/qdatetime_p.h b/src/corelib/time/qdatetime_p.h index f689a15cc8..1817d406bd 100644 --- a/src/corelib/time/qdatetime_p.h +++ b/src/corelib/time/qdatetime_p.h @@ -124,9 +124,9 @@ public: #endif // timezone static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTime, - QDateTimePrivate::DaylightStatus *daylightStatus = nullptr); + DaylightStatus *daylightStatus = nullptr); static qint64 localMSecsToEpochMSecs(qint64 localMsecs, - QDateTimePrivate::DaylightStatus *daylightStatus, + DaylightStatus *daylightStatus, QDate *localDate = nullptr, QTime *localTime = nullptr, QString *abbreviation = nullptr); |