From e2ac3a4b18573e8999138000e8af9e7b16192ea0 Mon Sep 17 00:00:00 2001 From: Arno Date: Wed, 27 Dec 2017 06:09:39 +0100 Subject: Modernize mappingtablemodel.cpp * use std::sort instead of deprecated qSort * use c++ style for-loop instead of Q_FOREACH --- mappingtablemodel.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mappingtablemodel.cpp') diff --git a/mappingtablemodel.cpp b/mappingtablemodel.cpp index 8d3752f..5ef0e0a 100644 --- a/mappingtablemodel.cpp +++ b/mappingtablemodel.cpp @@ -109,7 +109,7 @@ void MappingTableModel::setMappings(const QStringList &itemNames, int seriesPart if(seriesPartId == -1){ return; } - foreach(const QString name, itemNames){ + for(const QString &name : itemNames){ QModelIndex itemIdx = find(name); if(!itemIdx.isValid()){ addItem(name); @@ -125,13 +125,13 @@ QStringList MappingTableModel::findPartialName(const QString &value) const{ if(value.isEmpty()){ retval = mItemNames; }else{ - foreach(const QString cur, mItemNames){ + for(const QString &cur : mItemNames){ if(cur.contains(value)){ retval << cur; } } } - qSort(retval); + std::sort(retval.begin(), retval.end()); return retval; } @@ -217,7 +217,7 @@ QHash MappingTableModel::zeroUsers(){ QHash retval; if(!items.isEmpty()){ QList ids = items.keys(); - foreach(int id, ids){ + for(int id : ids){ mItemCountQuery->bindValue(":id", id); if(mItemCountQuery->exec()){ mItemCountQuery->first(); @@ -236,7 +236,7 @@ void MappingTableModel::deleteItems(const QList &ids){ if(ids.isEmpty()){ return; } - foreach(int id, ids){ + for(int id : ids){ mDeleteItemQuery->bindValue(":id", id); mDeleteItemQuery->exec(); } -- cgit v1.2.3-70-g09d2