mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-01 05:26:45 +08:00
Remove workarounds for fixed bugs
This commit is contained in:
@@ -1665,11 +1665,10 @@ namespace BlackCore
|
||||
this->insertLatestOffsetTime(callsign, diff);
|
||||
|
||||
int count = 0;
|
||||
static const qint64 minOffsetTime = CFsdSetup::c_interimPositionTimeOffsetMsec; // no longer needed with C++17
|
||||
const qint64 avgTimeMs = this->averageOffsetTimeMs(callsign, count, 3); // latest average
|
||||
qint64 offsetTime = CFsdSetup::c_positionTimeOffsetMsec;
|
||||
|
||||
if (avgTimeMs < minOffsetTime && count >= 3)
|
||||
if (avgTimeMs < CFsdSetup::c_interimPositionTimeOffsetMsec && count >= 3)
|
||||
{
|
||||
offsetTime = CFsdSetup::c_interimPositionTimeOffsetMsec;
|
||||
}
|
||||
|
||||
@@ -49,8 +49,7 @@ namespace BlackCore
|
||||
QString iid = json["IID"].toString();
|
||||
if (iid == QStringLiteral("org.swift-project.blackcore.weatherdata"))
|
||||
{
|
||||
// PluginExtended() instead of {} to silence wrong warning for gcc < 5.X
|
||||
auto it = m_plugins.insert(pluginIdentifier(json), PluginExtended());
|
||||
auto it = m_plugins.insert(pluginIdentifier(json), {});
|
||||
it->info.convertFromJson(json);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user