fly/flightgear
1
0
Fork 0
Code Activity

Qt deprecation fixes

Browse source
This commit is contained in:
James Turner 2021-05-23 20:14:19 +01:00
parent f7704a0339
commit f009c54773
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/AddonsModel.cxx
View file

@ -51,7 +51,7 @@ AddonsModel::~AddonsModel()
void AddonsModel::resetData(const QStringList& ndata) void AddonsModel::resetData(const QStringList& ndata)
{ {
beginResetModel(); beginResetModel();
QSet<QString> newSet = QSet<QString>::fromList(ndata); QSet<QString> newSet = QSet<QString>{ndata.begin(), ndata.end()};
for(const auto& path : m_addonsList) { for(const auto& path : m_addonsList) {
if (!newSet.contains(path)) { if (!newSet.contains(path)) {

2
src/GUI/AircraftItemModel.cxx
View file

@ -147,7 +147,7 @@ void PackageDelegate::catalogRefreshed(CatalogRef aCatalog, StatusCode aReason)
// silent about this // silent about this
} else if (aCatalog) { } else if (aCatalog) {
qWarning() << "failed refresh of" qWarning() << "failed refresh of"
<< QString::fromStdString(aCatalog->url()) << ":" << aReason << endl; << QString::fromStdString(aCatalog->url()) << ":" << aReason;
} }
} }

2
src/GUI/AircraftProxyModel.cxx
View file

@ -46,7 +46,7 @@ void AircraftProxyModel::setAircraftFilterString(QString s)
m_filterProps = new SGPropertyNode; m_filterProps = new SGPropertyNode;
int index = 0; int index = 0;
Q_FOREACH(QString term, s.split(QRegExp("\\W+"), QString::SkipEmptyParts)) { Q_FOREACH(QString term, s.split(QRegExp("\\W+"), Qt::SkipEmptyParts)) {
m_filterProps->getNode("all-of/text", index++, true)->setStringValue(term.toStdString()); m_filterProps->getNode("all-of/text", index++, true)->setStringValue(term.toStdString());
} }