diff --git a/src/core/vatsim/vatsimdatafilereader.cpp b/src/core/vatsim/vatsimdatafilereader.cpp index 0c5bb9d3d..8f341779a 100644 --- a/src/core/vatsim/vatsimdatafilereader.cpp +++ b/src/core/vatsim/vatsimdatafilereader.cpp @@ -151,15 +151,6 @@ namespace swift::core::vatsim return users; } - void CVatsimDataFileReader::readInBackgroundThread() - { - QPointer myself(this); - QTimer::singleShot(0, this, [=] { - if (!myself) { return; } - myself->read(); - }); - } - void CVatsimDataFileReader::doWorkImpl() { this->read(); } void CVatsimDataFileReader::read() diff --git a/src/core/vatsim/vatsimdatafilereader.h b/src/core/vatsim/vatsimdatafilereader.h index cea689814..c892808d8 100644 --- a/src/core/vatsim/vatsimdatafilereader.h +++ b/src/core/vatsim/vatsimdatafilereader.h @@ -112,9 +112,6 @@ namespace swift::core::vatsim //! \threadsafe void updateWithVatsimDataFileData(swift::misc::simulation::CSimulatedAircraft &aircraftToBeUdpated) const; - //! Start reading in own thread - void readInBackgroundThread(); - signals: //! Data have been read void dataFileRead(int kB); diff --git a/src/core/vatsim/vatsimmetarreader.cpp b/src/core/vatsim/vatsimmetarreader.cpp index 5aec22a56..28e42244b 100644 --- a/src/core/vatsim/vatsimmetarreader.cpp +++ b/src/core/vatsim/vatsimmetarreader.cpp @@ -35,15 +35,6 @@ namespace swift::core::vatsim this->reloadSettings(); } - void CVatsimMetarReader::readInBackgroundThread() - { - QPointer myself(this); - QTimer::singleShot(0, this, [=] { - if (!myself) { return; } - myself->read(); - }); - } - CMetarList CVatsimMetarReader::getMetars() const { QReadLocker l(&m_lock); diff --git a/src/core/vatsim/vatsimmetarreader.h b/src/core/vatsim/vatsimmetarreader.h index 8024d6c0c..50b6b0c7a 100644 --- a/src/core/vatsim/vatsimmetarreader.h +++ b/src/core/vatsim/vatsimmetarreader.h @@ -29,9 +29,6 @@ namespace swift::core::vatsim //! Constructor explicit CVatsimMetarReader(QObject *owner); - //! Read / re-read metars - void readInBackgroundThread(); - //! Get METARs //! \threadsafe virtual swift::misc::weather::CMetarList getMetars() const; diff --git a/src/core/webdataservices.cpp b/src/core/webdataservices.cpp index 393c50a4d..026870bb6 100644 --- a/src/core/webdataservices.cpp +++ b/src/core/webdataservices.cpp @@ -217,24 +217,12 @@ namespace swift::core Q_ASSERT_X(!whatToRead.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Info object must be read upfront"); - CEntityFlags::Entity triggeredRead = CEntityFlags::NoEntity; - if (m_vatsimDataFileReader) - { - if (whatToRead.testFlag(CEntityFlags::VatsimDataFile)) - { - m_vatsimDataFileReader->readInBackgroundThread(); - triggeredRead |= CEntityFlags::VatsimDataFile; - } - } + Q_ASSERT_X(!whatToRead.testFlag(CEntityFlags::VatsimDataFile), Q_FUNC_INFO, + "Datafile is read periodically and should not be triggered manually!"); + Q_ASSERT_X(!whatToRead.testFlag(CEntityFlags::MetarEntity), Q_FUNC_INFO, + "METAR file is read periodically and should not be triggered manually!"); - if (m_vatsimMetarReader) - { - if (whatToRead.testFlag(CEntityFlags::MetarEntity)) - { - m_vatsimMetarReader->readInBackgroundThread(); - triggeredRead |= CEntityFlags::MetarEntity; - } - } + CEntityFlags::Entity triggeredRead = CEntityFlags::NoEntity; if (m_airportDataReader) {