diff options
| author |  Rolf Eike Beer <eike@sf-mail.de> | 2019-04-01 22:15:19 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 12:59:17 +0300 |
| commit | c4c8094e32ad78dee558a80584470172f48c45b1 (patch) | |
| tree | 4fede2acf0f1a3cee2182d96b1b3efa33e4fd8ff /desktop-widgets/templatelayout.cpp | |
| parent | 2b9ca488fd18dc9d65d42dc5900e120a07e5b3f6 (diff) | |
| download | subsurface-c4c8094e32ad78dee558a80584470172f48c45b1.tar.gz | |
get rid of some foreach and Q_FOREACH constructs
See https://www.kdab.com/goodbye-q_foreach/
This is reduced to the places where the container is const or can be made const
without the need to always introduce an extra variable. Sadly qAsConst (Qt 5.7)
and std::as_const (C++17) are not available in all supported setups.
Also do some minor cleanups along the way.
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'desktop-widgets/templatelayout.cpp')
| -rw-r--r-- | desktop-widgets/templatelayout.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp index f451250d6..b28c78741 100644 --- a/desktop-widgets/templatelayout.cpp +++ b/desktop-widgets/templatelayout.cpp @@ -19,20 +19,20 @@ int getTotalWork(print_options *printOptions) void find_all_templates() { - const QString ext(".html"); + const QLatin1String ext(".html"); grantlee_templates.clear(); grantlee_statistics_templates.clear(); QDir dir(getPrintingTemplatePathUser()); - QStringList list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); - foreach (const QString& filename, list) { + const QStringList list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); + for (const QString &filename: list) { if (filename.at(filename.size() - 1) != '~' && filename.endsWith(ext)) grantlee_templates.append(filename); } // find statistics templates dir.setPath(getPrintingTemplatePathUser() + QDir::separator() + "statistics"); - list = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); - foreach (const QString& filename, list) { + const QStringList stat = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); + for (const QString &filename: stat) { if (filename.at(filename.size() - 1) != '~' && filename.endsWith(ext)) grantlee_statistics_templates.append(filename); } @@ -66,12 +66,14 @@ void copy_bundled_templates(QString src, QString dst, QStringList *templateBacku QDir dir(src); if (!dir.exists()) return; - foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { + const auto dirs = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); + for (const QString &d: dirs) { QString dst_path = dst + QDir::separator() + d; dir.mkpath(dst_path); copy_bundled_templates(src + QDir::separator() + d, dst_path, templateBackupList); } - foreach (QString f, dir.entryList(QDir::Files)) { + const auto files = dir.entryList(QDir::Files); + for (const QString &f: files) { QFile fileSrc(src + QDir::separator() + f); QFile fileDest(dst + QDir::separator() + f); if (fileDest.exists()) { |