From 9baa10c5f8b2c5dcda6d0bb435a051cc6c063a62 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 27 Jun 2018 01:18:40 +0200 Subject: [PATCH] Style --- src/blackcore/aircraftmatcher.cpp | 20 +++++++++---------- src/blackcore/airspacemonitor.h | 4 ++++ src/blackcore/simulatorcommon.h | 4 ++-- .../components/interpolationlogdisplay.cpp | 3 --- .../components/simulatorcomponent.cpp | 5 +++-- src/blackgui/views/namevariantpairview.cpp | 12 +++++------ src/blackmisc/simulation/interpolator.h | 2 +- .../simulation/remoteaircraftprovider.cpp | 1 - .../fsxcommon/simconnectsettingscomponent.cpp | 2 +- .../fsxcommon/simulatorfsxsimconnectproc.cpp | 1 - 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 83db8689f..63ff93224 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -497,13 +497,13 @@ namespace BlackCore const int r2 = modelsCleaned.removeIfExcluded(); if ((r1 + r2) > 0) { - CLogMessage(this).warning("Removed models for matcher, without string '%1', excluded '%2'") << r1 << r2; + CLogMessage(this).warning("Removed models for matcher, without string #: %1, excluded #: %2") << r1 << r2; if (r1 > 0) { CLogMessage(this).warning("Without string: %1") << models.findEmptyModelStrings().getModelStringList().join(", "); } if (r2 > 0) { CLogMessage(this).warning("Excluded: %1") << models.findByModelMode(CAircraftModel::Exclude).getModelStringList().join(", "); } } if (modelsCleaned.isEmpty()) { - CLogMessage(this).error("No models for matching, swift without a model set will not work"); + CLogMessage(this).error("No models for matching, swift without a model set will not work!"); } else { @@ -921,25 +921,25 @@ namespace BlackCore reduced = false; if (inList.isEmpty()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } return inList; } const QString m = remoteAircraft.getAircraftIcaoCode().getManufacturer(); if (m.isEmpty()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " No manufacturer, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " No manufacturer, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } return inList; } const CAircraftModelList outList(inList.findByManufacturer(m)); if (outList.isEmpty()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " Not found " + m + ", cannot reduce", getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Not found " + m + ", cannot reduce", getLogCategories()); } return inList; } - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " Reduced by " + m + " results: " + QString::number(outList.size()), getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Reduced by " + m + " results: " + QString::number(outList.size()), getLogCategories()); } reduced = true; return outList; } @@ -977,24 +977,24 @@ namespace BlackCore reduced = false; if (inList.isEmpty()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "Empty input list, cannot reduce", getLogCategories()); } return inList; } if (!remoteAircraft.hasAirlineDesignator()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " " + "No airline, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " " + "No airline, cannot reduce " + QString::number(inList.size()) + " entries", getLogCategories()); } return inList; } const CAircraftModelList outList(inList.findByIcaoDesignators(CAircraftIcaoCode(), remoteAircraft.getAirlineIcaoCode())); if (outList.isEmpty()) { - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " Cannot reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " results: " + QString::number(outList.size()), getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Cannot reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " results: " + QString::number(outList.size()), getLogCategories()); } return inList; } - if (log) { CMatchingUtils::addLogDetailsToList(log , remoteAircraft, info + " Reduced reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " to " + QString::number(outList.size()), getLogCategories()); } + if (log) { CMatchingUtils::addLogDetailsToList(log, remoteAircraft, info + " Reduced reduce by " + remoteAircraft.getAirlineIcaoCodeDesignator() + " to " + QString::number(outList.size()), getLogCategories()); } reduced = true; return outList; } diff --git a/src/blackcore/airspacemonitor.h b/src/blackcore/airspacemonitor.h index 0926a3d7e..8377fbd30 100644 --- a/src/blackcore/airspacemonitor.h +++ b/src/blackcore/airspacemonitor.h @@ -125,9 +125,11 @@ namespace BlackCore void gracefulShutdown(); //! Create dummy entries for performance tests + //! \private for testing purposes void testCreateDummyOnlineAtcStations(int number); //! Test injected aircraft parts + //! \private for testing purposes void testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts, bool incremental); signals: @@ -141,6 +143,8 @@ namespace BlackCore void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool isConnected); //! Raw data as received from network + //! \remark used for statistics + //! \private void requestedNewAircraft(const BlackMisc::Aviation::CCallsign &callsign, const QString &aircraftDesignator, const QString &airlineDesignator, const QString &livery); //! Ready for model matching diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index f444a143c..91f0a44a6 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -276,7 +276,7 @@ namespace BlackCore qint64 m_statsCurrentUpdateTimeMs = 0; //!< statistics current update time qint64 m_statsMaxUpdateTimeMs = 0; //!< statistics max.update time qint64 m_statsLastUpdateAircraftRequestedMs = 0; //!< when was the last aircraft update requested - qint64 m_statsUpdateAircraftRequestedDeltaMs = 0; //!< delta time between 2 aircrat updates + qint64 m_statsUpdateAircraftRequestedDeltaMs = 0; //!< delta time between 2 aircraft updates BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object BlackMisc::Simulation::CInterpolationLogger m_interpolationLogger; //!< log.interpolation @@ -297,7 +297,7 @@ namespace BlackCore //! Limited as CSimulatorCommon::isUpdateAircraftLimited plus updating statistics bool isUpdateAircraftLimitedWithStats(qint64 startTime = -1); - //! Limit to updates per seconds + //! Limit to updates per second bool limitToUpdatesPerSecond(int numberPerSecond); // weather diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index b2c2bea5f..173ffdc4f 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -59,9 +59,6 @@ namespace BlackGui connect(ui->pb_ShowInSimulator, &QPushButton::released, this, &CInterpolationLogDisplay::showLogInSimulator); connect(ui->pb_GetLastInterpolation, &QPushButton::released, this, &CInterpolationLogDisplay::displayLastInterpolation); connect(sGui, &CGuiApplication::aboutToShutdown, this, &CInterpolationLogDisplay::onAboutToShutdown); - - // ui->le_Foo->setVisible(false); - // ui->lbl_Foo->setVisible(false); } CInterpolationLogDisplay::~CInterpolationLogDisplay() diff --git a/src/blackgui/components/simulatorcomponent.cpp b/src/blackgui/components/simulatorcomponent.cpp index e37d323e2..b5d1d00fc 100644 --- a/src/blackgui/components/simulatorcomponent.cpp +++ b/src/blackgui/components/simulatorcomponent.cpp @@ -54,9 +54,10 @@ namespace BlackGui this->setCurrentIndex(0); ui->comp_StatusMessages->showFilterDialog(); - // live data + // live data and internals ui->tvp_LiveData->setIconMode(true); ui->tvp_LiveData->setAutoResizeFrequency(10); // only resize every n-th time + ui->tvp_Internals->setIconMode(false); this->addOrUpdateLiveDataByName("info", "no data yet", CIcons::StandardIconWarning16); // connects @@ -183,7 +184,7 @@ namespace BlackGui void CSimulatorComponent::refreshInternals() { - if (!sGui->getIContextSimulator()) { return; } + if (!sGui || sGui->isShuttingDown() || !sGui->getIContextSimulator()) { return; } const CSimulatorInternals internals = sGui->getIContextSimulator()->getSimulatorInternals(); const QStringList names(internals.getSortedNames()); if (names.isEmpty()) diff --git a/src/blackgui/views/namevariantpairview.cpp b/src/blackgui/views/namevariantpairview.cpp index 302c2eaed..93e1bac69 100644 --- a/src/blackgui/views/namevariantpairview.cpp +++ b/src/blackgui/views/namevariantpairview.cpp @@ -27,27 +27,27 @@ namespace BlackGui void CNameVariantPairView::setIconMode(bool withIcon) { - Q_ASSERT(this->m_model); - this->m_model->setIconMode(withIcon); + Q_ASSERT(m_model); + m_model->setIconMode(withIcon); } bool CNameVariantPairView::addOrUpdateByName(const QString &name, const BlackMisc::CVariant &value, const CIcon &icon, bool resize, bool skipEqualValues) { - Q_ASSERT(this->m_model); - bool changed = this->m_model->addOrUpdateByName(name, value, icon, skipEqualValues); + Q_ASSERT(m_model); + bool changed = m_model->addOrUpdateByName(name, value, icon, skipEqualValues); if (resize && changed) { this->resizeToContents(); } return changed; } void CNameVariantPairView::removeByName(const QString &name, bool resize) { - this->m_model->removeByName(name); + m_model->removeByName(name); if (resize) { this->resizeToContents(); } } bool CNameVariantPairView::containsName(const QString &name) { - return this->m_model->containsName(name); + return m_model->containsName(name); } } } // namespace diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 9a54d11c9..385df650b 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -268,7 +268,7 @@ namespace BlackMisc // values for current interpolation step qint64 m_currentTimeMsSinceEpoch = -1; //!< current time - Aviation::CAircraftSituationList m_currentSituations; //!< current situations + Aviation::CAircraftSituationList m_currentSituations; //!< current situations obtained by remoteAircraftSituationsAndChange Aviation::CAircraftSituationChange m_pastSituationsChange; //!< situations change of provider (i.e. network) situations CInterpolationAndRenderingSetupPerCallsign m_currentSetup; //!< used setup CInterpolationStatus m_currentInterpolationStatus; //!< this step's situation status diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 05778e69d..dd71019a7 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -35,7 +35,6 @@ namespace BlackMisc CSimulatedAircraftList CRemoteAircraftProvider::getAircraftInRange() const { - QReadLocker l(&m_lockAircraft); const QList aircraft = m_aircraftInRange.values(); l.unlock(); diff --git a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp index 4474335f2..725c57a32 100644 --- a/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp @@ -132,7 +132,7 @@ namespace BlackSimPlugin return; } - QMessageBox::information(qApp->activeWindow(), tr("Connection successful"), tr("Connected to %1:%2.").arg(address, port)); + QMessageBox::information(qApp->activeWindow(), tr("Connection successful"), tr("Connected to '%1:%2'.").arg(address, port)); } void CSimConnectSettingsComponent::saveSimConnectCfgFile() diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp index 2d2071a25..e3891f7a5 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp @@ -258,7 +258,6 @@ namespace BlackSimPlugin default: { const DWORD objectId = pObjData->dwObjectID; - if (CSimulatorFsxCommon::isRequestForSimObjAircraft(requestId)) { const CSimConnectObject simObject = simulatorFsxP3D->getSimObjectForObjectId(objectId);