diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index aadc73468..27f898169 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -583,7 +583,7 @@ namespace BlackCore for (CAtcStation &bookedStation : newBookedStations) { // exchange booking and online data, both sides are updated - this->m_atcStationsOnline.syncronizeWithBookedStation(bookedStation); + this->m_atcStationsOnline.synchronizeWithBookedStation(bookedStation); } this->m_atcStationsBooked = newBookedStations; } @@ -657,7 +657,7 @@ namespace BlackCore if (this->m_atcStationsBooked.containsCallsign(callsign)) { CAtcStation bookedStation(this->m_atcStationsBooked.findFirstByCallsign(callsign)); - station.syncronizeWithBookedStation(bookedStation); // both will be aligned + station.synchronizeWithBookedStation(bookedStation); // both will be aligned this->m_atcStationsBooked.replaceIf(&CAtcStation::getCallsign, callsign, bookedStation); } diff --git a/src/blackcore/application.h b/src/blackcore/application.h index 56098e9fd..df9f9a876 100644 --- a/src/blackcore/application.h +++ b/src/blackcore/application.h @@ -140,7 +140,7 @@ namespace BlackCore //! Delete all cookies from cookier manager void deleteAllCookies(); - //! Setup already syncronized + //! Setup already synchronized bool isSetupAvailable() const; //! Reload setup and version @@ -358,7 +358,7 @@ namespace BlackCore void webDataServicesStarted(bool success); protected slots: - //! Setup read/syncronized + //! Setup read/synchronized void ps_setupAvailable(bool available); //! Startup completed diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp index af1a1492e..17f2c6dbc 100644 --- a/src/blackcore/db/modeldatareader.cpp +++ b/src/blackcore/db/modeldatareader.cpp @@ -359,7 +359,7 @@ namespace BlackCore models = CAircraftModelList::fromDatabaseJson(res); } - // syncronized update + // synchronized update const int n = models.size(); qint64 latestTimestamp = models.latestTimestampMsecsSinceEpoch(); if (n > 0 && latestTimestamp < 0) diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp index 504634e5c..7a742d2e0 100644 --- a/src/blackcore/webdataservices.cpp +++ b/src/blackcore/webdataservices.cpp @@ -55,7 +55,7 @@ namespace BlackCore if (!sApp) { return; } // shutting down Q_ASSERT_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "missing SSL support"); - Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not syncronized"); + Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized"); this->setObjectName("CWebDataReader"); // check if I need info objects diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp index 4f4032493..00c074cf9 100644 --- a/src/blackgui/components/dbownmodelscomponent.cpp +++ b/src/blackgui/components/dbownmodelscomponent.cpp @@ -193,7 +193,7 @@ namespace BlackGui this->m_modelLoader->gracefulShutdown(); } - // create loader, also syncronizes the caches + // create loader, also synchronizes the caches this->m_modelLoader = IAircraftModelLoader::createModelLoader(simulator); // last selected simulator or explicit given if (!this->m_modelLoader || !this->m_modelLoader->supportsSimulator(simulator)) { diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index be9de4aca..ea0650512 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -190,7 +190,7 @@ namespace BlackMisc this->m_frequency.setUnit(CFrequencyUnit::MHz()); } - void CAtcStation::syncronizeControllerData(CAtcStation &otherStation) + void CAtcStation::synchronizeControllerData(CAtcStation &otherStation) { if (this->m_controller == otherStation.getController()) { return; } CUser otherController = otherStation.getController(); @@ -198,7 +198,7 @@ namespace BlackMisc otherStation.setController(otherController); } - void CAtcStation::syncronizeWithBookedStation(CAtcStation &bookedStation) + void CAtcStation::synchronizeWithBookedStation(CAtcStation &bookedStation) { if (bookedStation.getCallsign() != this->getCallsign()) { return; } @@ -261,7 +261,7 @@ namespace BlackMisc } // both ways - this->syncronizeControllerData(bookedStation); + this->synchronizeControllerData(bookedStation); if (this->hasValidRelativeDistance()) { bookedStation.setRelativeDistance(this->getRelativeDistance()); diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h index b1b489c09..8d5788004 100644 --- a/src/blackmisc/aviation/atcstation.h +++ b/src/blackmisc/aviation/atcstation.h @@ -143,14 +143,14 @@ namespace BlackMisc //! Set position void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; } - //! Syncronize controller data + //! Synchronize controller data //! Updates two stations (normally a booked and online ATC station) with complementary data - void syncronizeControllerData(CAtcStation &otherStation); + void synchronizeControllerData(CAtcStation &otherStation); - //! Syncronize station data + //! Synchronize station data //! Updates the two stations (a booked and online ATC station) with complementary data //! \pre this object is the online station, the passed station the booked station - void syncronizeWithBookedStation(CAtcStation &bookedStation); + void synchronizeWithBookedStation(CAtcStation &bookedStation); //! Get the radius of the controller's area of visibility. const BlackMisc::PhysicalQuantities::CLength &getRange() const { return m_range; } diff --git a/src/blackmisc/aviation/atcstationlist.cpp b/src/blackmisc/aviation/atcstationlist.cpp index 9690f0bff..8ac88ad0b 100644 --- a/src/blackmisc/aviation/atcstationlist.cpp +++ b/src/blackmisc/aviation/atcstationlist.cpp @@ -57,7 +57,7 @@ namespace BlackMisc return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController)); } - int CAtcStationList::syncronizeWithBookedStation(CAtcStation &bookedAtcStation) + int CAtcStationList::synchronizeWithBookedStation(CAtcStation &bookedAtcStation) { int c = 0; bookedAtcStation.setOnline(false); // reset @@ -66,7 +66,7 @@ namespace BlackMisc for (auto i = this->begin(); i != this->end(); ++i) { if (i->getCallsign() != bookedAtcStation.getCallsign()) { continue; } - i->syncronizeWithBookedStation(bookedAtcStation); + i->synchronizeWithBookedStation(bookedAtcStation); c++; } diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h index c0dcb85f8..2a6fdd208 100644 --- a/src/blackmisc/aviation/atcstationlist.h +++ b/src/blackmisc/aviation/atcstationlist.h @@ -59,10 +59,10 @@ namespace BlackMisc //! All controllers (with valid data) BlackMisc::Network::CUserList getControllers() const; - //! Syncronize with ATC station representing booking information. + //! Synchronize with ATC station representing booking information. //! Both sides (booking, online station) will be updated. //! \pre Can be used only if the stored data in this list are online ATC stations - int syncronizeWithBookedStation(CAtcStation &bookedAtcStation); + int synchronizeWithBookedStation(CAtcStation &bookedAtcStation); }; } //namespace diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h index 97a12c5b4..81387302c 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.h +++ b/src/blackmisc/simulation/aircraftmodelloader.h @@ -132,7 +132,7 @@ namespace BlackMisc virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { this->replaceOrAddCachedModels(models, simulator); } //! @} - //! Create a loader and syncronize caches + //! Create a loader and synchronize caches static std::unique_ptr createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simulator); public slots: diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h index a7a845fec..400b30cb8 100644 --- a/src/blackmisc/simulation/simulatedaircraft.h +++ b/src/blackmisc/simulation/simulatedaircraft.h @@ -429,7 +429,7 @@ namespace BlackMisc bool m_partsSynchronized = false; //!< synchronize parts bool m_fastPositionUpdates = false; //!< use fast position updates - //! Init, which syncronizes some denormalized values + //! Init, which synchronizes some denormalized values void init(); BLACK_METACLASS( diff --git a/src/blackmisc/simulation/simulatedaircraftlist.cpp b/src/blackmisc/simulation/simulatedaircraftlist.cpp index 8c2e5c925..a4edd6fb0 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.cpp +++ b/src/blackmisc/simulation/simulatedaircraftlist.cpp @@ -56,7 +56,7 @@ namespace BlackMisc return this->findBy(&CSimulatedAircraft::isVtol, vtol); } - CCallsignSet CSimulatedAircraftList::getCallsignsWithSyncronizedParts() const + CCallsignSet CSimulatedAircraftList::getCallsignsWithSynchronizedParts() const { CCallsignSet csl; for (const CSimulatedAircraft &aircraft : (*this)) diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index fbd31c448..09f287f0d 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -68,7 +68,7 @@ namespace BlackMisc CSimulatedAircraftList findByVtol(bool vtol) const; //! Callsigns of aircraft with synchronized parts - BlackMisc::Aviation::CCallsignSet getCallsignsWithSyncronizedParts() const; + BlackMisc::Aviation::CCallsignSet getCallsignsWithSynchronizedParts() const; //! Update aircraft with data from VATSIM data file //! \remarks The list used ("this") needs to contain the VATSIM data file objects