flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 04:25:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed most Qt 5.14 deprecation warnings

Browse Source
This commit is contained in:
Mat Sutcliffe
2019-12-31 00:38:59 +00:00
parent 010aaf58b5
commit 4a0d8e9864
40 changed files with 110 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/afv/clients/afvclient.cpp
View File

@@ -746,7 +746,7 @@ namespace BlackCore
dto.sequenceCounter = args.sequenceCounter;
dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
dto.lastPacket = false;
dto.transceivers = transmittingTransceivers.toStdVector();
dto.transceivers = std::vector<TxTransceiverDto>(transmittingTransceivers.begin(), transmittingTransceivers.end());
QMutexLocker lock(&m_mutexConnection);
m_connection->sendToVoiceServer(dto);
}
@@ -758,7 +758,7 @@ namespace BlackCore
dto.sequenceCounter = args.sequenceCounter;
dto.audio = std::vector<char>(args.audio.begin(), args.audio.end());
dto.lastPacket = true;
dto.transceivers = transmittingTransceivers.toStdVector();
dto.transceivers = std::vector<TxTransceiverDto>(transmittingTransceivers.begin(), transmittingTransceivers.end());
QMutexLocker lock(&m_mutexConnection);
m_connection->sendToVoiceServer(dto);
}
@@ -775,7 +775,7 @@ namespace BlackCore
audioData.sequenceCounter = dto.sequenceCounter;
QMutexLocker lock(&m_mutex);
m_soundcardSampleProvider->addOpusSamples(audioData, QVector<RxTransceiverDto>::fromStdVector(dto.transceivers));
m_soundcardSampleProvider->addOpusSamples(audioData, QVector<RxTransceiverDto>(dto.transceivers.begin(), dto.transceivers.end()));
}
void CAfvClient::inputVolumeStream(const InputVolumeStreamArgs &args)

2
src/blackcore/aircraftmatcher.cpp
View File

@@ -1203,7 +1203,7 @@ namespace BlackCore
}
const QSet<QString> allIcaos = aircraft.allDesignators();
const QString allIcaosStr = allIcaos.toList().join(", ");
const QString allIcaosStr = allIcaos.values().join(", ");
CLogUtilities::addLogDetailsToList(log, callsign, QStringLiteral("Aircraft '%1' known for airline '%2'").arg(allIcaosStr, airline.getDesignator()));
const CAircraftIcaoCode code = aircraft.findBestFuzzyMatchOrDefault(candidateString);

6
src/blackcore/corefacade.cpp
View File

@@ -39,7 +39,7 @@
#include <QObject>
#include <QStringBuilder>
#include <QString>
#include <QTime>
#include <QElapsedTimer>
#include <QtGlobal>
using namespace BlackMisc;
@@ -82,7 +82,7 @@ namespace BlackCore
if (m_initalized || m_shuttingDown) { return; }
QMap<QString, int> times;
QTime time;
QElapsedTimer time;
CCoreFacade::registerMetadata();
// either use explicit setting or last value
@@ -178,7 +178,7 @@ namespace BlackCore
{
bool c = false;
Q_UNUSED(c) // for release version
QTime time;
QElapsedTimer time;
time.start();
times.insert("Post setup, connects first", time.restart());

5
src/blackcore/db/airportdatareader.cpp
View File

@@ -14,6 +14,7 @@
#include <QStringBuilder>
#include <QNetworkReply>
#include <QElapsedTimer>
#include <QFileInfo>
#include <QPointer>
@@ -106,7 +107,7 @@ namespace BlackCore
{
const CAirportList airports = CAirportList::fromMultipleJsonFormats(airportsJson);
c = airports.size();
msgs.push_back(m_airportCache.set(airports, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_airportCache.set(airports, fi.birthTime().toUTC().toMSecsSinceEpoch()));
emit dataRead(CEntityFlags::AirportEntity, CEntityFlags::ReadFinished, c);
reallyRead |= CEntityFlags::AirportEntity;
@@ -211,7 +212,7 @@ namespace BlackCore
}
else
{
QTime time;
QElapsedTimer time;
time.start();
airports = CAirportList::fromDatabaseJson(res, &inconsistent);
this->logParseMessage("airports", airports.size(), time.elapsed(), res);

4
src/blackcore/db/backgrounddataupdater.cpp
View File

@@ -15,7 +15,7 @@
#include "blackmisc/threadutils.h"
#include "blackmisc/eventloop.h"
#include "blackmisc/logmessage.h"
#include <QTime>
#include <QElapsedTimer>
using namespace BlackMisc;
using namespace BlackMisc::Network;
@@ -125,7 +125,7 @@ namespace BlackCore
dbModelsConsidered;
if (dbModels.isEmpty()) { return; }
const QSet<CSimulatorInfo> simulatorsSet = simulators.asSingleSimulatorSet();
QTime time;
QElapsedTimer time;
for (const CSimulatorInfo &singleSimulator : simulatorsSet)
{
if (!this->doWorkCheck()) { return; }

4
src/blackcore/db/databasereader.cpp
View File

@@ -650,10 +650,10 @@ namespace BlackCore
bool CDatabaseReader::overrideCacheFromFile(bool overrideNewerOnly, const QFileInfo &fileInfo, CEntityFlags::Entity entity, CStatusMessageList &msgs) const
{
if (!fileInfo.created().isValid()) { return false; }
if (!fileInfo.birthTime().isValid()) { return false; }
if (!overrideNewerOnly) { return true; }
const qint64 fileTs = fileInfo.created().toUTC().toMSecsSinceEpoch();
const qint64 fileTs = fileInfo.birthTime().toUTC().toMSecsSinceEpoch();
const QDateTime cacheDateTime(this->getCacheTimestamp(entity));
if (!cacheDateTime.isValid()) { return true; } // no cache
const qint64 cacheTs = cacheDateTime.toUTC().toMSecsSinceEpoch();

9
src/blackcore/db/databaseutils.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/logmessage.h"
#include "blackmisc/fileutils.h"
#include "blackmisc/compressutils.h"
#include <QElapsedTimer>
using namespace BlackMisc;
using namespace BlackMisc::Json;
@@ -162,7 +163,7 @@ namespace BlackCore
{
if (models.isEmpty() || simulatorModels.isEmpty()) { return models; }
QTime timer;
QElapsedTimer timer;
timer.start();
const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet();
CAircraftModelList consolidatedModels;
@@ -204,7 +205,7 @@ namespace BlackCore
{
if (models.isEmpty() || simulatorModels.isEmpty()) { return models; }
QTime timer;
QElapsedTimer timer;
timer.start();
const QSet<QString> allOwnModelsModelStrings = simulatorModels.getModelStringSet();
CAircraftModelList consolidatedModels;
@@ -252,7 +253,7 @@ namespace BlackCore
int CDatabaseUtils::consolidateModelsWithDbDataAllowsGuiRefresh(CAircraftModelList &models, bool force, bool processEvents)
{
QTime timer;
QElapsedTimer timer;
timer.start();
int c = 0;
if (models.isEmpty()) { return c; }
@@ -275,7 +276,7 @@ namespace BlackCore
{
if (dbModels.isEmpty() || simulatorModels.isEmpty()) { return 0; }
QTime timer;
QElapsedTimer timer;
timer.start();
const QSet<QString> dbModelsModelStrings = dbModels.getModelStringSet();

17
src/blackcore/db/icaodatareader.cpp
View File

@@ -17,6 +17,7 @@
#include "blackmisc/statusmessage.h"
#include <QStringBuilder>
#include <QElapsedTimer>
#include <QDateTime>
#include <QDir>
#include <QFlags>
@@ -316,7 +317,7 @@ namespace BlackCore
else
{
// normally read from special DB view which already filters incomplete
QTime time;
QElapsedTimer time;
time.start();
codes = CAircraftIcaoCodeList::fromDatabaseJson(res, categories, true, &inconsistent);
this->logParseMessage("aircraft ICAO", codes.size(), time.elapsed(), res);
@@ -371,7 +372,7 @@ namespace BlackCore
else
{
// normally read from special DB view which already filters incomplete
QTime time;
QElapsedTimer time;
time.start();
codes = CAirlineIcaoCodeList::fromDatabaseJson(res, true, &inconsistent);
this->logParseMessage("airline ICAO", codes.size(), time.elapsed(), res);
@@ -423,7 +424,7 @@ namespace BlackCore
else
{
// normally read from special DB view which already filters incomplete
QTime time;
QElapsedTimer time;
time.start();
countries = CCountryList::fromDatabaseJson(res);
this->logParseMessage("countries", countries.size(), time.elapsed(), res);
@@ -468,7 +469,7 @@ namespace BlackCore
else
{
// normally read from special DB view which already filters incomplete
QTime time;
QElapsedTimer time;
time.start();
categories = CAircraftCategoryList::fromDatabaseJson(res);
this->logParseMessage("categories", categories.size(), time.elapsed(), res);
@@ -526,7 +527,7 @@ namespace BlackCore
{
const CCountryList countries = CCountryList::fromMultipleJsonFormats(countriesJson);
const int c = countries.size();
msgs.push_back(m_countryCache.set(countries, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_countryCache.set(countries, fi.birthTime().toUTC().toMSecsSinceEpoch()));
reallyRead |= CEntityFlags::CountryEntity;
emit this->dataRead(CEntityFlags::CountryEntity, CEntityFlags::ReadFinished, c);
}
@@ -564,7 +565,7 @@ namespace BlackCore
{
const CAircraftIcaoCodeList aircraftIcaos = CAircraftIcaoCodeList::fromMultipleJsonFormats(aircraftJson);
const int c = aircraftIcaos.size();
msgs.push_back(m_aircraftIcaoCache.set(aircraftIcaos, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_aircraftIcaoCache.set(aircraftIcaos, fi.birthTime().toUTC().toMSecsSinceEpoch()));
reallyRead |= CEntityFlags::AircraftIcaoEntity;
emit this->dataRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, c);
}
@@ -602,7 +603,7 @@ namespace BlackCore
{
const CAirlineIcaoCodeList airlineIcaos = CAirlineIcaoCodeList::fromMultipleJsonFormats(airlineJson);
const int c = airlineIcaos.size();
msgs.push_back(m_airlineIcaoCache.set(airlineIcaos, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_airlineIcaoCache.set(airlineIcaos, fi.birthTime().toUTC().toMSecsSinceEpoch()));
reallyRead |= CEntityFlags::AirlineIcaoEntity;
emit this->dataRead(CEntityFlags::AirlineIcaoEntity, CEntityFlags::ReadFinished, c);
}
@@ -640,7 +641,7 @@ namespace BlackCore
{
const CAircraftCategoryList aircraftCategories = CAircraftCategoryList::fromMultipleJsonFormats(aircraftCategory);
const int c = aircraftCategories.size();
msgs.push_back(m_categoryCache.set(aircraftCategories, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_categoryCache.set(aircraftCategories, fi.birthTime().toUTC().toMSecsSinceEpoch()));
reallyRead |= CEntityFlags::AircraftCategoryEntity;
emit this->dataRead(CEntityFlags::AircraftCategoryEntity, CEntityFlags::ReadFinished, c);
}

14
src/blackcore/db/modeldatareader.cpp
View File

@@ -24,7 +24,7 @@
#include <QScopedPointer>
#include <QScopedPointerDeleteLater>
#include <QTimer>
#include <QTime>
#include <QElapsedTimer>
#include <QPointer>
#include <QUrl>
#include <QWriteLocker>
@@ -318,7 +318,7 @@ namespace BlackCore
}
else
{
QTime time;
QElapsedTimer time;
time.start();
liveries = CLiveryList::fromDatabaseJson(res);
this->logParseMessage("liveries", liveries.size(), time.elapsed(), res);
@@ -366,7 +366,7 @@ namespace BlackCore
}
else
{
QTime time;
QElapsedTimer time;
time.start();
distributors = CDistributorList::fromDatabaseJson(res);
this->logParseMessage("distributors", distributors.size(), time.elapsed(), res);
@@ -424,7 +424,7 @@ namespace BlackCore
}
else
{
QTime time;
QElapsedTimer time;
time.start();
models = CAircraftModelList::fromDatabaseJsonCaching(res, icaos, categories, liveries, distributors);
this->logParseMessage("models", models.size(), time.elapsed(), res);
@@ -483,7 +483,7 @@ namespace BlackCore
{
const CLiveryList liveries = CLiveryList::fromMultipleJsonFormats(liveriesJson);
const int c = liveries.size();
msgs.push_back(m_liveryCache.set(liveries, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_liveryCache.set(liveries, fi.birthTime().toUTC().toMSecsSinceEpoch()));
emit this->dataRead(CEntityFlags::LiveryEntity, CEntityFlags::ReadFinished, c);
reallyRead |= CEntityFlags::LiveryEntity;
}
@@ -521,7 +521,7 @@ namespace BlackCore
{
const CAircraftModelList models = CAircraftModelList::fromMultipleJsonFormats(modelsJson);
const int c = models.size();
msgs.push_back(m_modelCache.set(models, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_modelCache.set(models, fi.birthTime().toUTC().toMSecsSinceEpoch()));
emit this->dataRead(CEntityFlags::ModelEntity, CEntityFlags::ReadFinished, c);
reallyRead |= CEntityFlags::ModelEntity;
}
@@ -559,7 +559,7 @@ namespace BlackCore
{
const CDistributorList distributors = CDistributorList::fromMultipleJsonFormats(distributorsJson);
const int c = distributors.size();
msgs.push_back(m_distributorCache.set(distributors, fi.created().toUTC().toMSecsSinceEpoch()));
msgs.push_back(m_distributorCache.set(distributors, fi.birthTime().toUTC().toMSecsSinceEpoch()));
emit this->dataRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, c);
reallyRead |= CEntityFlags::DistributorEntity;
}