diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMAddTests) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_FOREACH) find_package( Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED diff --git a/src/ExportManager.cpp b/src/ExportManager.cpp --- a/src/ExportManager.cpp +++ b/src/ExportManager.cpp @@ -472,7 +472,8 @@ SpectacleConfig *config = SpectacleConfig::instance(); // construct the supported mimetype list - Q_FOREACH (auto mimeType, QImageWriter::supportedMimeTypes()) { + const auto mimeTypes = QImageWriter::supportedMimeTypes(); + for (auto mimeType : mimeTypes) { supportedFilters.append(QString::fromUtf8(mimeType).trimmed()); } diff --git a/src/Gui/ExportMenu.cpp b/src/Gui/ExportMenu.cpp --- a/src/Gui/ExportMenu.cpp +++ b/src/Gui/ExportMenu.cpp @@ -80,7 +80,7 @@ const KService::List services = KMimeTypeTrader::self()->query(QStringLiteral("image/png")); - Q_FOREACH (auto service, services) { + for (auto service : services) { QString name = service->name().replace(QLatin1Char('&'), QLatin1String("&&")); QAction *action = new QAction(QIcon::fromTheme(service->icon()), name, this); @@ -132,7 +132,7 @@ KIPI::PluginLoader::PluginList pluginList = loader->pluginList(); - Q_FOREACH (const auto &pluginInfo, pluginList) { + for (const auto &pluginInfo : qAsConst(pluginList)) { if (!(pluginInfo->shouldLoad())) { continue; } @@ -145,19 +145,19 @@ plugin->setup(&mDummyWidget); - QList actions = plugin->actions(); + const QList actions = plugin->actions(); QSet exportActions; - Q_FOREACH (auto action, actions) { + for (auto action : actions) { KIPI::Category category = plugin->category(action); if (category == KIPI::ExportPlugin) { exportActions += action; } else if (category == KIPI::ImagesPlugin && pluginInfo->library().contains(QStringLiteral("kipiplugin_sendimages"))) { exportActions += action; } } - Q_FOREACH (auto action, exportActions) { + for (auto action : qAsConst(exportActions)) { mKipiMenu->addAction(action); } } diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.cpp b/src/Gui/SettingsDialog/SaveOptionsPage.cpp --- a/src/Gui/SettingsDialog/SaveOptionsPage.cpp +++ b/src/Gui/SettingsDialog/SaveOptionsPage.cpp @@ -96,7 +96,8 @@ connect(mSaveNameFormat, &QLineEdit::textEdited, this, &SaveOptionsPage::markDirty); connect(mSaveNameFormat, &QLineEdit::textEdited, this, [&](const QString &newText) { QString fmt; - Q_FOREACH(auto item, QImageWriter::supportedImageFormats()) { + const auto imageFormats = QImageWriter::supportedImageFormats(); + for (auto item : imageFormats) { fmt = QString::fromLocal8Bit(item); if (newText.endsWith(QLatin1Char('.') + fmt, Qt::CaseInsensitive)) { QString txtCopy = newText; @@ -113,7 +114,8 @@ mSaveImageFormat = new QComboBox; mSaveImageFormat->addItems([&](){ QStringList items; - Q_FOREACH(auto fmt, QImageWriter::supportedImageFormats()) { + const auto formats = QImageWriter::supportedImageFormats(); + for (auto fmt : formats) { items.append(QString::fromLocal8Bit(fmt).toUpper()); } return items; diff --git a/src/Gui/SettingsDialog/SettingsDialog.cpp b/src/Gui/SettingsDialog/SettingsDialog.cpp --- a/src/Gui/SettingsDialog/SettingsDialog.cpp +++ b/src/Gui/SettingsDialog/SettingsDialog.cpp @@ -66,7 +66,7 @@ void SettingsDialog::accept() { - Q_FOREACH(auto page, mPages) { + for (auto page : qAsConst(mPages)) { SettingsPage *pageWidget = dynamic_cast(page->widget()); if (pageWidget) { pageWidget->saveChanges(); diff --git a/src/KipiInterface/KSGKipiImageCollectionSelector.cpp b/src/KipiInterface/KSGKipiImageCollectionSelector.cpp --- a/src/KipiInterface/KSGKipiImageCollectionSelector.cpp +++ b/src/KipiInterface/KSGKipiImageCollectionSelector.cpp @@ -27,7 +27,8 @@ mInterface(interface), mListWidget(new QListWidget) { - Q_FOREACH (const auto &collection, interface->allAlbums()) { + const auto allAlbums = interface->allAlbums(); + for (const auto &collection : allAlbums) { QListWidgetItem *item = new QListWidgetItem(mListWidget); QString name = collection.name(); int imageCount = collection.images().size(); @@ -53,7 +54,8 @@ QList selectedList; if (item) { QString name = item->data(Qt::UserRole).toString(); - Q_FOREACH (const auto &collection, mInterface->allAlbums()) { + const auto allAlbums = mInterface->allAlbums(); + for (const auto &collection : allAlbums) { if (collection.name() == name) { selectedList.append(collection); break;