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

Remove some redundant class-name prefixes

Browse Source 
The the body of QTimeZone's own class declaration, QTimeZone::
prefixes are redundant. Likewise in the argument list of
QTimeZone::Data's copy-assignment. Similarly, in classes derived from
QTimeZonePrivate, its name is not needed as a prefix.

Change-Id: Iff94bae237e9869296b9a415d40ff423456eedd6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2024-08-15 13:51:35 +02:00
parent f29b82f478
commit e925f10679
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/time/qtimezone.cpp
View File

@ -395,7 +395,7 @@ QTimeZone::Data::~Data()
#endif
}
QTimeZone::Data &QTimeZone::Data::operator=(const QTimeZone::Data &other) noexcept
QTimeZone::Data &QTimeZone::Data::operator=(const Data &other) noexcept
{
#if QT_CONFIG(timezone)
if (!other.isShort())

6
src/corelib/time/qtimezone.h
View File

@ -175,11 +175,9 @@ public:
# endif
QString comment() const;
QString displayName(const QDateTime &atDateTime,
QTimeZone::NameType nameType = QTimeZone::DefaultName,
QString displayName(const QDateTime &atDateTime, NameType nameType = DefaultName,
const QLocale &locale = QLocale()) const;
QString displayName(QTimeZone::TimeType timeType,
QTimeZone::NameType nameType = QTimeZone::DefaultName,
QString displayName(TimeType timeType, NameType nameType = DefaultName,
const QLocale &locale = QLocale()) const;
QString abbreviation(const QDateTime &atDateTime) const;

6
src/corelib/time/qtimezoneprivate.cpp
View File

@ -253,14 +253,14 @@ bool QTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const
QTimeZonePrivate::Data QTimeZonePrivate::data(QTimeZone::TimeType timeType) const
{
// True if tran is valid and has the DST-ness to match timeType:
const auto validMatch = [timeType](const QTimeZonePrivate::Data &tran) {
const auto validMatch = [timeType](const Data &tran) {
return tran.atMSecsSinceEpoch != invalidMSecs()
&& ((timeType == QTimeZone::DaylightTime) != (tran.daylightTimeOffset == 0));
};
// Get current tran, use if suitable:
const qint64 currentMSecs = QDateTime::currentMSecsSinceEpoch();
QTimeZonePrivate::Data tran = data(currentMSecs);
Data tran = data(currentMSecs);
if (validMatch(tran))
return tran;
@ -310,7 +310,7 @@ QTimeZonePrivate::Data QTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
QDateTimePrivate::ZoneState QTimeZonePrivate::stateAtZoneTime(
qint64 forLocalMSecs, QDateTimePrivate::TransitionOptions resolve) const
{
auto dataToState = [](const QTimeZonePrivate::Data &d) {
auto dataToState = [](const Data &d) {
return QDateTimePrivate::ZoneState(d.atMSecsSinceEpoch + d.offsetFromUtc * 1000,
d.offsetFromUtc,
d.daylightTimeOffset ? QDateTimePrivate::DaylightTime

2
src/corelib/time/qtimezoneprivate_icu.cpp
View File

@ -325,7 +325,7 @@ bool QIcuTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const
QTimeZonePrivate::Data QIcuTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
{
// Available in ICU C++ api, and draft C api in v50
QTimeZonePrivate::Data data;
Data data;
#if U_ICU_VERSION_MAJOR_NUM >= 50
data = ucalTimeZoneTransition(m_ucal, UCAL_TZ_TRANSITION_PREVIOUS_INCLUSIVE,
forMSecsSinceEpoch);

2
src/corelib/time/qtimezoneprivate_mac.mm
View File

@ -183,7 +183,7 @@ bool QMacTimeZonePrivate::hasTransitions() const
QTimeZonePrivate::Data QMacTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const
{
QTimeZonePrivate::Data tran;
Data tran;
const NSTimeInterval seconds = afterMSecsSinceEpoch / 1000.0;
NSDate *nextDate = [NSDate dateWithTimeIntervalSince1970:seconds];
nextDate = [m_nstz nextDaylightSavingTimeTransitionAfterDate:nextDate];

22
src/corelib/time/qtimezoneprivate_tz.cpp
View File

@ -1024,7 +1024,7 @@ QString QTzTimeZonePrivate::displayName(QTimeZone::TimeType timeType,
{
// TZ only provides C-locale abbreviations and offset:
if (nameType != QTimeZone::LongName && isDataLocale(locale)) {
QTimeZonePrivate::Data tran = data(timeType);
Data tran = data(timeType);
if (tran.atMSecsSinceEpoch != invalidMSecs()) {
if (nameType == QTimeZone::ShortName)
return tran.abbreviation;
@ -1044,7 +1044,7 @@ QString QTzTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const
int QTzTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const
{
const QTimeZonePrivate::Data tran = data(atMSecsSinceEpoch);
const Data tran = data(atMSecsSinceEpoch);
return tran.offsetFromUtc; // == tran.standardTimeOffset + tran.daylightTimeOffset
}
@ -1094,14 +1094,14 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
// and we have a POSIX rule, then use it:
if (!cached_data.m_posixRule.isEmpty()
&& (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < forMSecsSinceEpoch)) {
QList<QTimeZonePrivate::Data> posixTrans = getPosixTransitions(forMSecsSinceEpoch);
QList<Data> posixTrans = getPosixTransitions(forMSecsSinceEpoch);
auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(),
[forMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) {
[forMSecsSinceEpoch] (const Data &at) {
return at.atMSecsSinceEpoch <= forMSecsSinceEpoch;
});
// Use most recent, if any in the past; or the first if we have no other rules:
if (it > posixTrans.cbegin() || (tranCache().isEmpty() && it < posixTrans.cend())) {
QTimeZonePrivate::Data data = *(it > posixTrans.cbegin() ? it - 1 : it);
Data data = *(it > posixTrans.cbegin() ? it - 1 : it);
data.atMSecsSinceEpoch = forMSecsSinceEpoch;
return data;
}
@ -1129,14 +1129,14 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const
QTimeZonePrivate::Data QTzTimeZonePrivate::data(QTimeZone::TimeType timeType) const
{
// True if tran is valid and has the DST-ness to match timeType:
const auto validMatch = [timeType](const QTimeZonePrivate::Data &tran) {
const auto validMatch = [timeType](const Data &tran) {
return tran.atMSecsSinceEpoch != invalidMSecs()
&& ((timeType == QTimeZone::DaylightTime) != (tran.daylightTimeOffset == 0));
};
// Get current tran, use if suitable:
const qint64 currentMSecs = QDateTime::currentMSecsSinceEpoch();
QTimeZonePrivate::Data tran = data(currentMSecs);
Data tran = data(currentMSecs);
if (validMatch(tran))
return tran;
@ -1190,9 +1190,9 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::nextTransition(qint64 afterMSecsSince
// and we have a POSIX rule, then use it:
if (!cached_data.m_posixRule.isEmpty()
&& (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < afterMSecsSinceEpoch)) {
QList<QTimeZonePrivate::Data> posixTrans = getPosixTransitions(afterMSecsSinceEpoch);
QList<Data> posixTrans = getPosixTransitions(afterMSecsSinceEpoch);
auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(),
[afterMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) {
[afterMSecsSinceEpoch] (const Data &at) {
return at.atMSecsSinceEpoch <= afterMSecsSinceEpoch;
});
@ -1213,9 +1213,9 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
// and we have a POSIX rule, then use it:
if (!cached_data.m_posixRule.isEmpty()
&& (tranCache().isEmpty() || tranCache().last().atMSecsSinceEpoch < beforeMSecsSinceEpoch)) {
QList<QTimeZonePrivate::Data> posixTrans = getPosixTransitions(beforeMSecsSinceEpoch);
QList<Data> posixTrans = getPosixTransitions(beforeMSecsSinceEpoch);
auto it = std::partition_point(posixTrans.cbegin(), posixTrans.cend(),
[beforeMSecsSinceEpoch] (const QTimeZonePrivate::Data &at) {
[beforeMSecsSinceEpoch] (const Data &at) {
return at.atMSecsSinceEpoch < beforeMSecsSinceEpoch;
});
if (it > posixTrans.cbegin())