Drop some over-rides that duplicated the base-class's implementation

QAndroidTimeZonePrivate overrode the transition-related methods of its
base, but there was no point in doing so, since our Android backend
has no access to transition data, just the same as the base
implementation.

Change-Id: Ie4ff375381b463078b412f50e8ddc925ab1587a3
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Edward Welbourne 2021-02-16 13:35:57 +01:00
parent 60fd2808f6
commit 1b34d68623
2 changed files with 2 additions and 23 deletions

View File

@ -229,25 +229,8 @@ QTimeZonePrivate::Data QAndroidTimeZonePrivate::data(qint64 forMSecsSinceEpoch)
}
}
bool QAndroidTimeZonePrivate::hasTransitions() const
{
// java.util.TimeZone does not directly provide transitions
return false;
}
QTimeZonePrivate::Data QAndroidTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const
{
// transitions not available on Android, so return an invalid data object
Q_UNUSED( afterMSecsSinceEpoch );
return invalidData();
}
QTimeZonePrivate::Data QAndroidTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const
{
// transitions not available on Android, so return an invalid data object
Q_UNUSED( beforeMSecsSinceEpoch );
return invalidData();
}
// java.util.TimeZone does not directly provide transitions,
// so don't over-ride QTZP's base implementation of transition methods.
QByteArray QAndroidTimeZonePrivate::systemTimeZoneId() const
{

View File

@ -485,10 +485,6 @@ public:
Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const override;