summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2016-01-25 14:14:08 +0100
committerMarc Mutz <marc.mutz@kdab.com>2016-02-08 01:22:03 +0000
commit3d9ccce7d52a2f0bdbe73e8f6f25dae045bd09ec (patch)
tree29135ec3460ab336c6865d38151d10eab0960b85 /src/tools
parentbc9645064ac31cbb9093d041cca1591c9a3e6b75 (diff)
uic: eradicate all Q_FOREACH loops [non-generated code]
... by replacing them with C++11 range-for loops, or, in one case, qDeleteAll(). Change-Id: If6980f6c12ac1d359a1f0e062dcc2a86e9685d1e Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp14
-rw-r--r--src/tools/uic/uic.cpp6
2 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 29a377984c..cb480a4b46 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -2221,8 +2221,8 @@ QList<WriteInitialization::Item *> WriteInitialization::initializeTreeWidgetItem
// AbstractFromBuilder saves flags last, so they always end up in the last column's map.
addQtFlagsInitializer(item, map, QLatin1String("flags"));
- QList<Item *> subItems = initializeTreeWidgetItems(domItem->elementItem());
- foreach (Item *subItem, subItems)
+ const QList<Item *> subItems = initializeTreeWidgetItems(domItem->elementItem());
+ for (Item *subItem : subItems)
item->addChild(subItem);
}
return items;
@@ -2465,7 +2465,7 @@ void WriteInitialization::acceptWidgetScripts(const DomScripts &widgetScripts, D
// concatenate script snippets
QString script;
- foreach (const DomScript *domScript, scripts) {
+ for (const DomScript *domScript : qAsConst(scripts)) {
const QString snippet = domScript->text();
if (!snippet.isEmpty()) {
script += snippet.trimmed();
@@ -2479,9 +2479,8 @@ void WriteInitialization::acceptWidgetScripts(const DomScripts &widgetScripts, D
m_output << m_indent << "childWidgets.clear();\n";
if (!childWidgets.empty()) {
m_output << m_indent << "childWidgets";
- foreach (DomWidget *child, childWidgets) {
+ for (DomWidget *child : childWidgets)
m_output << " << " << m_driver->findOrInsertWidget(child);
- }
m_output << ";\n";
}
m_output << m_indent << "scriptContext.run("
@@ -2529,8 +2528,7 @@ WriteInitialization::Item::Item(const QString &itemClassName, const QString &ind
WriteInitialization::Item::~Item()
{
- foreach (Item *child, m_children)
- delete child;
+ qDeleteAll(m_children);
}
QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::EmptyItemPolicy emptyItemPolicy)
@@ -2567,7 +2565,7 @@ QString WriteInitialization::Item::writeSetupUi(const QString &parent, Item::Emp
closeIfndef(m_setupUiStream, it.key());
++it;
}
- foreach (Item *child, m_children)
+ for (Item *child : qAsConst(m_children))
child->writeSetupUi(uniqueName);
return uniqueName;
}
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index 97a63d49c6..389214cbb2 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -85,7 +85,8 @@ bool Uic::printDependencies()
}
if (DomIncludes *includes = ui->elementIncludes()) {
- foreach (DomInclude *incl, includes->elementInclude()) {
+ const auto incls = includes->elementInclude();
+ for (DomInclude *incl : incls) {
QString file = incl->text();
if (file.isEmpty())
continue;
@@ -95,7 +96,8 @@ bool Uic::printDependencies()
}
if (DomCustomWidgets *customWidgets = ui->elementCustomWidgets()) {
- foreach (DomCustomWidget *customWidget, customWidgets->elementCustomWidget()) {
+ const auto elementCustomWidget = customWidgets->elementCustomWidget();
+ for (DomCustomWidget *customWidget : elementCustomWidget) {
if (DomHeader *header = customWidget->elementHeader()) {
QString file = header->text();
if (file.isEmpty())