From d64bfcabce06f623b6cff4cd21b5d2effa32738f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 16 Jul 2017 03:42:26 +0200 Subject: [PATCH] Formatting, minor tweaks --- src/blackcore/db/backgrounddataupdater.h | 4 ++-- src/blackgui/infoarea.cpp | 2 +- src/blackgui/views/aircraftmodelview.cpp | 22 +++++++++++----------- src/swiftdata/swiftdata.cpp | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/blackcore/db/backgrounddataupdater.h b/src/blackcore/db/backgrounddataupdater.h index 762edfb1d..df749c959 100644 --- a/src/blackcore/db/backgrounddataupdater.h +++ b/src/blackcore/db/backgrounddataupdater.h @@ -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 diff --git a/src/blackgui/infoarea.cpp b/src/blackgui/infoarea.cpp index 053060c97..fb7ec0395 100644 --- a/src/blackgui/infoarea.cpp +++ b/src/blackgui/infoarea.cpp @@ -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() diff --git a/src/blackgui/views/aircraftmodelview.cpp b/src/blackgui/views/aircraftmodelview.cpp index 51629fced..ad9b55eed 100644 --- a/src/blackgui/views/aircraftmodelview.cpp +++ b/src/blackgui/views/aircraftmodelview.cpp @@ -228,43 +228,43 @@ namespace BlackGui if (!this->hasSelection()) { return; } if (valueVariant.canConvert()) { - CAircraftIcaoCode icao = valueVariant.value(); + const CAircraftIcaoCode icao = valueVariant.value(); if (icao.validate().hasErrorMessages()) { return; } this->applyToSelected(icao); } else if (valueVariant.canConvert()) { - CAircraftIcaoCodeList icaos(valueVariant.value()); + const CAircraftIcaoCodeList icaos(valueVariant.value()); 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 livery = valueVariant.value(); + const CLivery livery = valueVariant.value(); if (livery.validate().hasErrorMessages()) { return; } this->applyToSelected(livery); } else if (valueVariant.canConvert()) { - CLiveryList liveries(valueVariant.value()); + const CLiveryList liveries(valueVariant.value()); 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 distributor = valueVariant.value(); + const CDistributor distributor = valueVariant.value(); if (distributor.validate().hasErrorMessages()) { return; } this->applyToSelected(distributor); } else if (valueVariant.canConvert()) { - CDistributorList distributors(valueVariant.value()); + const CDistributorList distributors(valueVariant.value()); 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 airlines(valueVariant.value()); + const CAirlineIcaoCodeList airlines(valueVariant.value()); 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 } diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp index 0096aa55c..3d73d7f2a 100644 --- a/src/swiftdata/swiftdata.cpp +++ b/src/swiftdata/swiftdata.cpp @@ -149,7 +149,7 @@ void CSwiftData::performGracefulShutdown() { if (this->m_updater) { - this->m_updater->abandonAndWait(); + m_updater->abandonAndWait(); } }