From 08dc992aef4ca5b8ff754646792033de8cb807f9 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 6 Jul 2016 17:00:20 +0200 Subject: [PATCH] Core: Use QList's initializer list contructor for output panes More concise code. Change-Id: I0c83a02de725648294e1b6b49669bdec0c47fafe Reviewed-by: Eike Ziller --- src/plugins/autotest/testresultspane.cpp | 3 +-- src/plugins/coreplugin/find/searchresultwindow.cpp | 4 ++-- src/plugins/projectexplorer/appoutputpane.cpp | 3 +-- src/plugins/projectexplorer/compileoutputwindow.cpp | 4 +--- src/plugins/projectexplorer/taskwindow.cpp | 2 +- src/plugins/todo/todooutputpane.cpp | 6 +----- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index d1737de3a71..3571e6c34af 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -231,8 +231,7 @@ QWidget *TestResultsPane::outputWidget(QWidget *parent) QList TestResultsPane::toolBarWidgets() const { - return QList() << m_expandCollapse << m_runAll << m_runSelected << m_stopTestRun - << m_filterButton; + return { m_expandCollapse, m_runAll, m_runSelected, m_stopTestRun, m_filterButton }; } QString TestResultsPane::displayName() const diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index a961bf4f25a..abf0f36da17 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -340,8 +340,8 @@ QWidget *SearchResultWindow::outputWidget(QWidget *) */ QList SearchResultWindow::toolBarWidgets() const { - return QList() << d->m_expandCollapseButton << d->m_spacer - << d->m_historyLabel << d->m_spacer2 << d->m_recentSearchesBox; + return { d->m_expandCollapseButton, d->m_spacer, + d->m_historyLabel, d->m_spacer2, d->m_recentSearchesBox }; } /*! diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 59c97c0efd5..955f2279634 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -321,8 +321,7 @@ QWidget *AppOutputPane::outputWidget(QWidget *) QList AppOutputPane::toolBarWidgets() const { - return QList() << m_reRunButton << m_stopButton << m_attachButton - << m_zoomInButton << m_zoomOutButton; + return { m_reRunButton, m_stopButton, m_attachButton, m_zoomInButton, m_zoomOutButton }; } QString AppOutputPane::displayName() const diff --git a/src/plugins/projectexplorer/compileoutputwindow.cpp b/src/plugins/projectexplorer/compileoutputwindow.cpp index ed406f17ba6..61917bfdaf2 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.cpp +++ b/src/plugins/projectexplorer/compileoutputwindow.cpp @@ -244,9 +244,7 @@ QWidget *CompileOutputWindow::outputWidget(QWidget *) QList CompileOutputWindow::toolBarWidgets() const { - return QList() << m_cancelBuildButton - << m_zoomInButton - << m_zoomOutButton; + return { m_cancelBuildButton, m_zoomInButton, m_zoomOutButton }; } void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputFormat format) diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 9225d4d182c..beb8b58bdce 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -348,7 +348,7 @@ void TaskWindow::delayedInitialization() QList TaskWindow::toolBarWidgets() const { - return QList() << d->m_filterWarningsButton << d->m_categoriesButton; + return { d->m_filterWarningsButton, d->m_categoriesButton }; } QWidget *TaskWindow::outputWidget(QWidget *) diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index 85ccce27bf3..e0099626ee0 100644 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -67,11 +67,7 @@ QWidget *TodoOutputPane::outputWidget(QWidget *parent) QList TodoOutputPane::toolBarWidgets() const { - return QList() - << m_spacer - << m_currentFileButton - << m_wholeProjectButton - << m_subProjectButton; + return { m_spacer, m_currentFileButton, m_wholeProjectButton, m_subProjectButton }; } QString TodoOutputPane::displayName() const