From dd3fc42c9441b9d3f5b7e6066d90f414e1104e31 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Mon, 9 Aug 2021 19:32:39 +0100 Subject: [PATCH] Remove unused code --- src/blackgui/components/dbstashcomponent.h | 3 --- .../components/loginoverviewcomponent.cpp | 25 ------------------- .../components/loginoverviewcomponent.h | 12 --------- src/blackgui/components/mappingcomponent.h | 3 --- src/blackmisc/simulation/autopublishdata.cpp | 11 -------- 5 files changed, 54 deletions(-) diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h index 31746eca3..d23905840 100644 --- a/src/blackgui/components/dbstashcomponent.h +++ b/src/blackgui/components/dbstashcomponent.h @@ -134,9 +134,6 @@ namespace BlackGui void replaceModelsUnvalidated(const BlackMisc::Simulation::CAircraftModelList &models); signals: - //! Unstash - void unstashed(BlackMisc::Simulation::CAircraftModel &model); - //! Stashed models have been changed void stashedModelsChanged(); diff --git a/src/blackgui/components/loginoverviewcomponent.cpp b/src/blackgui/components/loginoverviewcomponent.cpp index e5e9a6eee..23af1c481 100644 --- a/src/blackgui/components/loginoverviewcomponent.cpp +++ b/src/blackgui/components/loginoverviewcomponent.cpp @@ -163,20 +163,6 @@ namespace BlackGui ui->comp_NetworkAircraft->showValues(); } - void CLoginOverviewComponent::onSimulatorStatusChanged(int status) - { - ISimulator::SimulatorStatus s = static_cast(status); - if (!this->hasValidContexts()) { return; } - if (sGui->getIContextNetwork()->isConnected()) - { - if (!s.testFlag(ISimulator::Connected)) - { - // sim NOT connected but network connected - this->autoLogoffDetection(); - } - } - } - bool CLoginOverviewComponent::hasValidContexts() const { if (!sGui || !sGui->supportsContexts()) { return false; } @@ -187,16 +173,5 @@ namespace BlackGui return true; } - void CLoginOverviewComponent::autoLogoffDetection() - { - if (!ui->cb_AutoLogoff->isChecked()) { return; } - if (!this->hasValidContexts()) { return; } - if (!sGui->getIContextNetwork()->isConnected()) { return; } // nothing to logoff - - const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Auto logoff in progress (could be simulator shutdown, crash, closing simulator)"); - const int delaySecs = 30; - this->showOverlayHTMLMessage(m, qRound(1000 * delaySecs * 0.8)); - } - } // namespace } // namespace diff --git a/src/blackgui/components/loginoverviewcomponent.h b/src/blackgui/components/loginoverviewcomponent.h index 6c6ae43cd..d264af0c5 100644 --- a/src/blackgui/components/loginoverviewcomponent.h +++ b/src/blackgui/components/loginoverviewcomponent.h @@ -84,18 +84,6 @@ namespace BlackGui //! Login cancelled void cancel(); - //! Auto-logoff detection - void autoLogoffDetection(); - - //! Pause/Continue timeout - void toggleTimeout(); - - //! Set OK button string - void setOkButtonString(bool connected); - - //! Simulator status changed - void onSimulatorStatusChanged(int status); - //! Has contexts? bool hasValidContexts() const; diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h index cb1599848..f7b68059d 100644 --- a/src/blackgui/components/mappingcomponent.h +++ b/src/blackgui/components/mappingcomponent.h @@ -87,9 +87,6 @@ namespace BlackGui BlackMisc::Simulation::CAircraftModelList findModelsStartingWith(const QString &modelName, Qt::CaseSensitivity cs); signals: - //! Request a text message - void requestTextMessageWidget(const BlackMisc::Aviation::CCallsign &callsign); - //! Request the validation dialog void requestValidationDialog(); diff --git a/src/blackmisc/simulation/autopublishdata.cpp b/src/blackmisc/simulation/autopublishdata.cpp index 5a9ec8d57..92b3cbf46 100644 --- a/src/blackmisc/simulation/autopublishdata.cpp +++ b/src/blackmisc/simulation/autopublishdata.cpp @@ -148,9 +148,7 @@ namespace BlackMisc CStatusMessageList msgs; msgs.push_back(CStatusMessage(cats).validationInfo(u"DB models: %1") << dbModels.size()); - QSet newModelStrings; // not in DB yet QSet unchangedCG; - for (const QString &modelString : m_modelStringVsCG.keys()) { const CAircraftModel dbModel = dbModels.findFirstByModelStringOrDefault(modelString); @@ -161,11 +159,6 @@ namespace BlackMisc unchangedCG.insert(modelString); } } - else - { - // not in DB - newModelStrings << modelString; - } } QSet unchangedSim; @@ -179,10 +172,6 @@ namespace BlackMisc unchangedSim.insert(modelString); } } - else - { - newModelStrings << modelString; - } } // remove