Remove workarounds for fixed bugs

This commit is contained in:
Mat Sutcliffe
2021-04-16 22:32:01 +01:00
parent 093138972a
commit 7955d0a06e
15 changed files with 16 additions and 110 deletions

View File

@@ -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;
}

View File

@@ -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);
}
}