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

Remove usage of deprecated qSort

Browse Source
This commit is contained in:
Roland Rossgotterer
2019-02-25 09:57:18 +01:00
committed by Mat Sutcliffe
parent 7bc20d45cf
commit c82ff139fe
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/simplecommandparser.cpp
View File

@@ -15,6 +15,8 @@
#include <Qt>
#include <QtGlobal>
#include <algorithm>
using namespace BlackMisc::PhysicalQuantities;
namespace BlackMisc
@@ -162,7 +164,7 @@ namespace BlackMisc
QString rows;
QList<CommandHtmlHelp> cmds(s_commands);
qSort(cmds.begin(), cmds.end(), CommandHtmlHelp::less);
std::sort(cmds.begin(), cmds.end(), CommandHtmlHelp::less);
static const QString cmdCol(QString().fill('-', 20));
static const QString textCol(QString().fill('-', 40));

6
src/blackmisc/simulation/aircraftmodelutils.cpp
View File

@@ -12,6 +12,8 @@
#include "blackmisc/directoryutils.h"
#include "blackmisc/verify.h"
#include <algorithm>
namespace BlackMisc
{
namespace Simulation
@@ -69,11 +71,11 @@ namespace BlackMisc
// to HTML
QString html("<table>\n");
QStringList airlineIcaos = models.getAirlineVDesignators().toList();
qSort(airlineIcaos);
airlineIcaos.sort();
airlineIcaos.push_front(colorLiveryDesignator);
airlineIcaos.push_back(emptyDesignator);
QStringList aircraftIcaos = modelsByDesignator.keys();
qSort(aircraftIcaos);
aircraftIcaos.sort();
// header
html += "<thead><tr>\n";