aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-26 09:35:47 +0200
committerhjk <hjk@qt.io>2018-09-26 07:53:14 +0000
commit1e8ae60dceae33c6611e04eefb2745b7aae0d741 (patch)
treec0b062ef662abe4559f13d59e4f38e72485d4681
parente28eb85e8ac91070cafdcc9a39a116608df35c11 (diff)
Utils: Return a const list for FancyMainWindow::dockWidgets
Makes s/foreach/for straight forward on the user code side. Change-Id: I78aa0d06f538ebda491cd238ce81cc155b8d0beb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/utils/fancymainwindow.cpp14
-rw-r--r--src/libs/utils/fancymainwindow.h2
-rw-r--r--src/plugins/debugger/debuggermainwindow.cpp2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index e3bec7be0b3..de73c6edaaa 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -366,7 +366,7 @@ FancyMainWindowPrivate::FancyMainWindowPrivate(FancyMainWindow *parent) :
m_autoHideTitleBars.setChecked(true);
QObject::connect(&m_autoHideTitleBars, &QAction::toggled, q, [this](bool) {
- foreach (QDockWidget *dock, q->dockWidgets()) {
+ for (QDockWidget *dock : q->dockWidgets()) {
if (auto titleBar = dynamic_cast<TitleBarWidget *>(dock->titleBarWidget()))
titleBar->updateChildren();
}
@@ -427,7 +427,7 @@ void FancyMainWindow::setTrackingEnabled(bool enabled)
{
if (enabled) {
d->m_handleDockVisibilityChanges = true;
- foreach (QDockWidget *dockWidget, dockWidgets())
+ for (QDockWidget *dockWidget : dockWidgets())
dockWidget->setProperty(dockWidgetActiveState, dockWidget->isVisible());
} else {
d->m_handleDockVisibilityChanges = false;
@@ -456,7 +456,7 @@ void FancyMainWindow::contextMenuEvent(QContextMenuEvent *event)
void FancyMainWindow::handleVisibilityChanged(bool visible)
{
d->m_handleDockVisibilityChanges = false;
- foreach (QDockWidget *dockWidget, dockWidgets()) {
+ for (QDockWidget *dockWidget : dockWidgets()) {
if (dockWidget->isFloating()) {
dockWidget->setVisible(visible
&& dockWidget->property(dockWidgetActiveState).toBool());
@@ -492,7 +492,7 @@ QHash<QString, QVariant> FancyMainWindow::saveSettings() const
settings.insert(QLatin1String(AutoHideTitleBarsKey),
d->m_autoHideTitleBars.isChecked());
settings.insert(ShowCentralWidgetKey, d->m_showCentralWidget.isChecked());
- foreach (QDockWidget *dockWidget, dockWidgets()) {
+ for (QDockWidget *dockWidget : dockWidgets()) {
settings.insert(dockWidget->objectName(),
dockWidget->property(dockWidgetActiveState));
}
@@ -507,13 +507,13 @@ void FancyMainWindow::restoreSettings(const QHash<QString, QVariant> &settings)
bool on = settings.value(QLatin1String(AutoHideTitleBarsKey), true).toBool();
d->m_autoHideTitleBars.setChecked(on);
d->m_showCentralWidget.setChecked(settings.value(ShowCentralWidgetKey, true).toBool());
- foreach (QDockWidget *widget, dockWidgets()) {
+ for (QDockWidget *widget : dockWidgets()) {
widget->setProperty(dockWidgetActiveState,
settings.value(widget->objectName(), false));
}
}
-QList<QDockWidget *> FancyMainWindow::dockWidgets() const
+const QList<QDockWidget *> FancyMainWindow::dockWidgets() const
{
return findChildren<QDockWidget *>();
}
@@ -577,7 +577,7 @@ QAction *FancyMainWindow::showCentralWidgetAction() const
void FancyMainWindow::setDockActionsVisible(bool v)
{
- foreach (const QDockWidget *dockWidget, dockWidgets())
+ for (const QDockWidget *dockWidget : dockWidgets())
dockWidget->toggleViewAction()->setVisible(v);
d->m_showCentralWidget.setVisible(v);
d->m_autoHideTitleBars.setVisible(v);
diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h
index be30e2c317c..623ef424086 100644
--- a/src/libs/utils/fancymainwindow.h
+++ b/src/libs/utils/fancymainwindow.h
@@ -48,7 +48,7 @@ public:
/* The widget passed in should have an objectname set
* which will then be used as key for QSettings. */
QDockWidget *addDockForWidget(QWidget *widget, bool immutable = false);
- QList<QDockWidget *> dockWidgets() const;
+ const QList<QDockWidget *> dockWidgets() const;
void setTrackingEnabled(bool enabled);
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index a22ea42d515..7c7e632388d 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -318,7 +318,7 @@ void DebuggerMainWindow::onModeChanged(Core::Id mode)
theMainWindow->setDockActionsVisible(false);
// Hide dock widgets manually in case they are floating.
- foreach (QDockWidget *dockWidget, theMainWindow->dockWidgets()) {
+ for (QDockWidget *dockWidget : theMainWindow->dockWidgets()) {
if (dockWidget->isFloating())
dockWidget->hide();
}