This commit is contained in:
Klaus Basan
2020-04-18 04:37:26 +02:00
committed by Mat Sutcliffe
parent 3be498a347
commit d5a81a349b
3 changed files with 6 additions and 6 deletions

View File

@@ -63,6 +63,7 @@ namespace BlackCore
void weatherGridReceived(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier); void weatherGridReceived(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier);
private: private:
//! Pending weather request
struct WeatherRequest struct WeatherRequest
{ {
QString filePath; QString filePath;
@@ -72,7 +73,6 @@ namespace BlackCore
}; };
bool loadWeatherDataPlugins(); bool loadWeatherDataPlugins();
void fetchNextWeatherData(); void fetchNextWeatherData();
void handleNextRequest(); void handleNextRequest();

View File

@@ -52,9 +52,9 @@ namespace BlackGui
CArtifact CUpdateInfoComponent::getLatestAvailablePilotClientArtifactForSelection() const CArtifact CUpdateInfoComponent::getLatestAvailablePilotClientArtifactForSelection() const
{ {
const CUpdateInfo info = m_updateInfo.get(); const CUpdateInfo info = m_updateInfo.get();
const CPlatform p = this->getSelectedOrDefaultPlatform(); const CPlatform p = this->getSelectedOrDefaultPlatform();
const CDistribution d = this->getSelectedOrDefaultDistribution(); const CDistribution d = this->getSelectedOrDefaultDistribution();
const CArtifact a = info.getArtifactsPilotClient().findByDistributionAndPlatform(d, p, true).getLatestArtifactOrDefault(); const CArtifact a = info.getArtifactsPilotClient().findByDistributionAndPlatform(d, p, true).getLatestArtifactOrDefault();
return a; return a;
} }

View File

@@ -757,7 +757,7 @@ namespace BlackMisc
// info // info
const QString simObjDirs = joinStringSet(simObjectDirs, ", "); const QString simObjDirs = joinStringSet(simObjectDirs, ", ");
msgs.push_back(CStatusMessage(getLogCategories()).validationInfo(u"Validating %1 models against %2 SimObject paths: '%3'") << models.size() << simObjectDirs.size() << simObjDirs); msgs.push_back(CStatusMessage(getLogCategories()).validationInfo(u"Validating %1 models against %2 SimObjects path(s): '%3'") << models.size() << simObjectDirs.size() << simObjDirs);
// validate // validate
int failed = 0; int failed = 0;
@@ -781,7 +781,7 @@ namespace BlackMisc
CAircraftModelList::addAsValidOrInvalidModel(model, ok, validModels, invalidModels); CAircraftModelList::addAsValidOrInvalidModel(model, ok, validModels, invalidModels);
if (!ok) if (!ok)
{ {
msgs.push_back(CStatusMessage(getLogCategories()).validationWarning(u"Model '%1' '%2' in none of the %3 paths") << model.getModelString() << model.getFileName() << simObjectDirs.size()); msgs.push_back(CStatusMessage(getLogCategories()).validationWarning(u"Model '%1' '%2' in none of the %3 SimObjects path(s)") << model.getModelString() << model.getFileName() << simObjectDirs.size());
failed++; failed++;
} }