diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-31 13:27:20 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-01 07:18:17 +0000 |
commit | e85b6a3ff1b8b3f21a75209c2bff1bf02c7fdb1b (patch) | |
tree | 38f0e3b832be56c877cb04dd43c3795303d95bb9 /src/designer/src/components/formeditor | |
parent | 8b581f58effd2679c7cd9522a6d9e3a4c33cb423 (diff) |
Qt Designer: Fix clang-tidy warnings about loops
- Replace index-based loops by range-based for
Change-Id: I074a52631cbf5233e1c762cee99064b8897abc30
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/components/formeditor')
3 files changed, 12 insertions, 17 deletions
diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp index 13927dfca..20e8f02fc 100644 --- a/src/designer/src/components/formeditor/dpi_chooser.cpp +++ b/src/designer/src/components/formeditor/dpi_chooser.cpp @@ -87,11 +87,10 @@ DPI_Chooser::DPI_Chooser(QWidget *parent) : //: System resolution m_predefinedCombo->addItem(tr("System (%1 x %2)").arg(m_systemEntry->dpiX).arg(m_systemEntry->dpiY), QVariant::fromValue(systemEntry)); // Devices. Exclude the system values as not to duplicate the entries - const int predefinedCount = sizeof(dpiEntries)/sizeof(DPI_Entry); - const struct DPI_Entry *ecend = dpiEntries + predefinedCount; - for (const struct DPI_Entry *it = dpiEntries; it < ecend; ++it) - if (it->dpiX != m_systemEntry->dpiX || it->dpiY != m_systemEntry->dpiY) - m_predefinedCombo->addItem(tr(it->description), QVariant::fromValue(it)); + for (const DPI_Entry &e : dpiEntries) { + if (e.dpiX != m_systemEntry->dpiX || e.dpiY != m_systemEntry->dpiY) + m_predefinedCombo->addItem(tr(e.description), QVariant::fromValue(&e)); + } m_predefinedCombo->addItem(tr("User defined")); setFocusProxy(m_predefinedCombo); diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index f680cc008..52a0e3b13 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -2554,17 +2554,16 @@ void FormWindow::highlightWidget(QWidget *widget, const QPoint &pos, HighlightMo QWidgetList FormWindow::widgets(QWidget *widget) const { - const QObjectList children = widget->children(); - if (children.empty()) + if (widget->children().isEmpty()) return QWidgetList(); QWidgetList rc; - const QObjectList::const_iterator cend = children.constEnd(); - for (QObjectList::const_iterator it = children.constBegin(); it != cend; ++it) - if ((*it)->isWidgetType()) { - QWidget *w = qobject_cast<QWidget*>(*it); + for (QObject *o : widget->children()) { + if (o->isWidgetType()) { + QWidget *w = qobject_cast<QWidget*>(o); if (isManaged(w)) rc.push_back(w); } + } return rc; } diff --git a/src/designer/src/components/formeditor/widgetselection.cpp b/src/designer/src/components/formeditor/widgetselection.cpp index 4c343b6cd..40c0cfb6b 100644 --- a/src/designer/src/components/formeditor/widgetselection.cpp +++ b/src/designer/src/components/formeditor/widgetselection.cpp @@ -681,8 +681,7 @@ void WidgetSelection::updateGeometry() void WidgetSelection::hide() { - for (int i = WidgetHandle::LeftTop; i < WidgetHandle::TypeCount; ++i) { - WidgetHandle *h = m_handles[ i ]; + for (WidgetHandle *h : m_handles) { if (h) h->hide(); } @@ -690,8 +689,7 @@ void WidgetSelection::hide() void WidgetSelection::show() { - for (int i = WidgetHandle::LeftTop; i < WidgetHandle::TypeCount; ++i) { - WidgetHandle *h = m_handles[ i ]; + for (WidgetHandle *h : m_handles) { if (h) { h->show(); h->raise(); @@ -701,8 +699,7 @@ void WidgetSelection::show() void WidgetSelection::update() { - for (int i = WidgetHandle::LeftTop; i < WidgetHandle::TypeCount; ++i) { - WidgetHandle *h = m_handles[ i ]; + for (WidgetHandle *h : m_handles) { if (h) h->update(); } |