diff options
Diffstat (limited to 'tools/testcon')
-rw-r--r-- | tools/testcon/ambientproperties.cpp | 16 | ||||
-rw-r--r-- | tools/testcon/main.cpp | 3 | ||||
-rw-r--r-- | tools/testcon/mainwindow.cpp | 9 |
3 files changed, 19 insertions, 9 deletions
diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp index e69b365..ec1311d 100644 --- a/tools/testcon/ambientproperties.cpp +++ b/tools/testcon/ambientproperties.cpp @@ -69,7 +69,8 @@ void AmbientProperties::on_buttonBackground_clicked() p.setColor(container->backgroundRole(), c); container->setPalette(p); - foreach (QWidget *widget, mdiAreaWidgets()) { + const QWidgetList widgets = mdiAreaWidgets(); + for (QWidget *widget : widgets) { p = widget->palette(); p.setColor(widget->backgroundRole(), c); widget->setPalette(p); @@ -88,7 +89,8 @@ void AmbientProperties::on_buttonForeground_clicked() p.setColor(container->foregroundRole(), c); container->setPalette(p); - foreach (QWidget *widget, mdiAreaWidgets()) { + const QWidgetList widgets = mdiAreaWidgets(); + for (QWidget *widget : widgets) { p = widget->palette(); p.setColor(widget->foregroundRole(), c); widget->setPalette(p); @@ -104,7 +106,8 @@ void AmbientProperties::on_buttonFont_clicked() fontSample->setFont( f ); container->setFont( f ); - foreach (QWidget *widget, mdiAreaWidgets()) + const QWidgetList widgets = mdiAreaWidgets(); + for (QWidget *widget : widgets) widget->setFont( f ); } @@ -117,9 +120,12 @@ void AmbientProperties::on_buttonEnabled_toggled(bool on) QWidgetList AmbientProperties::mdiAreaWidgets() const { QWidgetList result; - if (QMdiArea *mdiArea = qobject_cast<QMdiArea*>(container)) - foreach (QMdiSubWindow *subWindow, mdiArea->subWindowList()) + + if (QMdiArea *mdiArea = qobject_cast<QMdiArea*>(container)) { + const QList<QMdiSubWindow *> mdiSubWindows = mdiArea->subWindowList(); + for (const QMdiSubWindow *subWindow : mdiSubWindows) result.push_back(subWindow->widget()); + } return result; } diff --git a/tools/testcon/main.cpp b/tools/testcon/main.cpp index cce315c..2454084 100644 --- a/tools/testcon/main.cpp +++ b/tools/testcon/main.cpp @@ -95,7 +95,8 @@ int main( int argc, char **argv ) qInstallMessageHandler(redirectDebugOutput); MainWindow mw; - foreach (const QString &a, parser.positionalArguments()) { + const QStringList positionalArguments = parser.positionalArguments(); + for (const QString &a : positionalArguments) { if (a.startsWith(QLatin1Char('{')) && a.endsWith(QLatin1Char('}'))) mw.addControlFromClsid(a); else diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index bc69264..ca47cec 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -109,7 +109,8 @@ QAxWidget *MainWindow::activeAxWidget() const QList<QAxWidget *> MainWindow::axWidgets() const { QList<QAxWidget *> result; - foreach (const QMdiSubWindow *subWindow, m_mdiArea->subWindowList()) + const QList<QMdiSubWindow *> mdiSubWindows = m_mdiArea->subWindowList(); + for (const QMdiSubWindow *subWindow : mdiSubWindows) if (QAxWidget *axWidget = qobject_cast<QAxWidget *>(subWindow->widget())) result.push_back(axWidget); return result; @@ -395,7 +396,8 @@ bool MainWindow::loadScript(const QString &file) m_scripts->addObject(this); } - foreach (QAxWidget *axWidget, axWidgets()) { + const QList<QAxWidget *> axw = axWidgets(); + for (QAxWidget *axWidget : axw) { QAxBase *ax = axWidget; m_scripts->addObject(ax); } @@ -434,7 +436,8 @@ void MainWindow::updateGUI() if (m_dlgProperties) m_dlgProperties->setControl(hasControl ? container : 0); - foreach (QAxWidget *container, axWidgets()) { + const QList<QAxWidget *> axw = axWidgets(); + for (QAxWidget *container : axw) { container->disconnect(SIGNAL(signal(QString,int,void*))); if (actionLogSignals->isChecked()) connect(container, SIGNAL(signal(QString,int,void*)), this, SLOT(logSignal(QString,int,void*))); |