Formatting, minor tweaks

This commit is contained in:
Klaus Basan
2017-07-16 03:42:26 +02:00
committed by Mathew Sutcliffe
parent 3b6edcd575
commit d64bfcabce
4 changed files with 15 additions and 15 deletions

View File

@@ -36,8 +36,8 @@ namespace BlackCore
CBackgroundDataUpdater(QObject *owner);
private:
int m_cycle = 0; //!< cycle
bool m_inWork = false; //!< indicates a running update
int m_cycle = 0; //!< cycle
bool m_inWork = false; //!< indicates a running update
BlackMisc::Simulation::Data::CModelCaches m_modelCaches { false, this }; //!< caches
BlackMisc::Simulation::Data::CModelSetCaches m_modelSetCaches { false, this }; //!< caches

View File

@@ -802,7 +802,7 @@ namespace BlackGui
// when toplevel is changed, I need a round in the event loop until
// current tab bar widget is visible
QTimer::singleShot(250, this, SLOT(ps_emitInfoAreaStatus()));
QTimer::singleShot(250, this, &CInfoArea::ps_emitInfoAreaStatus);
}
void CInfoArea::ps_onStyleSheetChanged()

View File

@@ -228,43 +228,43 @@ namespace BlackGui
if (!this->hasSelection()) { return; }
if (valueVariant.canConvert<CAircraftIcaoCode>())
{
CAircraftIcaoCode icao = valueVariant.value<CAircraftIcaoCode>();
const CAircraftIcaoCode icao = valueVariant.value<CAircraftIcaoCode>();
if (icao.validate().hasErrorMessages()) { return; }
this->applyToSelected(icao);
}
else if (valueVariant.canConvert<CAircraftIcaoCodeList>())
{
CAircraftIcaoCodeList icaos(valueVariant.value<CAircraftIcaoCodeList>());
const CAircraftIcaoCodeList icaos(valueVariant.value<CAircraftIcaoCodeList>());
if (icaos.size() != 1) { return; }
CAircraftIcaoCode icao = icaos.front();
const CAircraftIcaoCode icao = icaos.front();
if (icao.validate().hasErrorMessages()) { return; }
this->applyToSelected(icao);
}
else if (valueVariant.canConvert<CLivery>())
{
CLivery livery = valueVariant.value<CLivery>();
const CLivery livery = valueVariant.value<CLivery>();
if (livery.validate().hasErrorMessages()) { return; }
this->applyToSelected(livery);
}
else if (valueVariant.canConvert<CLiveryList>())
{
CLiveryList liveries(valueVariant.value<CLiveryList>());
const CLiveryList liveries(valueVariant.value<CLiveryList>());
if (liveries.size() != 1) { return; }
CLivery livery = liveries.front();
const CLivery livery = liveries.front();
if (livery.validate().hasErrorMessages()) { return; }
this->applyToSelected(livery);
}
else if (valueVariant.canConvert<CDistributor>())
{
CDistributor distributor = valueVariant.value<CDistributor>();
const CDistributor distributor = valueVariant.value<CDistributor>();
if (distributor.validate().hasErrorMessages()) { return; }
this->applyToSelected(distributor);
}
else if (valueVariant.canConvert<CDistributorList>())
{
CDistributorList distributors(valueVariant.value<CDistributorList>());
const CDistributorList distributors(valueVariant.value<CDistributorList>());
if (distributors.size() != 1) { return; }
CDistributor distributor = distributors.front();
const CDistributor distributor = distributors.front();
if (distributor.validate().hasErrorMessages()) { return; }
this->applyToSelected(distributor);
}
@@ -276,9 +276,9 @@ namespace BlackGui
}
else if (valueVariant.canConvert<CAirlineIcaoCodeList>())
{
CAirlineIcaoCodeList airlines(valueVariant.value<CAirlineIcaoCodeList>());
const CAirlineIcaoCodeList airlines(valueVariant.value<CAirlineIcaoCodeList>());
if (airlines.size() != 1) { return; }
CAirlineIcaoCode airline = airlines.front();
const CAirlineIcaoCode airline = airlines.front();
if (airline.validate().hasErrorMessages()) { return; }
emit requestHandlingOfStashDrop(airline); // I need to convert to stanard livery, which I can`t do here
}

View File

@@ -149,7 +149,7 @@ void CSwiftData::performGracefulShutdown()
{
if (this->m_updater)
{
this->m_updater->abandonAndWait();
m_updater->abandonAndWait();
}
}