refactor: Fix Qt 5.15 deprecation warnings

This commit is contained in:
Lars Toenning
2024-03-16 12:41:12 +01:00
parent e1f52f3e88
commit 56bd6f0c42
22 changed files with 38 additions and 181 deletions

View File

@@ -1389,7 +1389,7 @@ namespace BlackMisc::Simulation
if (log) { log->push_back(subMsgs); }
CCallsign::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- End calculating #%1 ---").arg(c));
c++;
scoreMap.insertMulti(score, model);
scoreMap.insert(score, model);
}
CCallsign::addLogDetailsToList(log, remoteModel.getCallsign(), QStringLiteral("--- End scoring ---"));
return scoreMap;

View File

@@ -30,6 +30,7 @@
#include <Qt>
#include <QHash>
#include <QMap>
#include <QMultiMap>
#include <atomic>
BLACK_DECLARE_SEQUENCE_MIXINS(BlackMisc::Simulation, CAircraftModel, CAircraftModelList)
@@ -46,7 +47,7 @@ namespace BlackMisc
namespace Simulation
{
//! Individual (matching) score for each model
using ScoredModels = QMap<int, CAircraftModel>;
using ScoredModels = QMultiMap<int, CAircraftModel>;
//! Value object encapsulating a list of aircraft models
class BLACKMISC_EXPORT CAircraftModelList :

View File

@@ -391,7 +391,7 @@ namespace BlackMisc::Simulation
QMultiMap<int, CSimulatorInfo> counts;
for (int i = 0; i < m_counts.size(); i++)
{
counts.insertMulti(m_counts[i], simulator(i));
counts.insert(m_counts[i], simulator(i));
}
return counts;
}