From e9cf8a4e3e4a95c738486b7e90a219c3fa9afc8f Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Tue, 23 Apr 2019 18:32:56 +0200 Subject: [PATCH] Remove a couple of "setAutoRaise(true)" for toolbar buttons Most of the QToolButtons in the toolbars don't set autoRaise, and they are fine. I assume that those who do set it, just do it for because that line was copy/pasted so often. Change-Id: I71341ddbd26a586d34713661ec538b37033685e5 Reviewed-by: Eike Ziller --- src/plugins/autotest/testnavigationwidget.cpp | 1 - src/plugins/autotest/testresultspane.cpp | 1 - src/plugins/coreplugin/editortoolbar.cpp | 3 --- src/plugins/coreplugin/find/searchresultwindow.cpp | 1 - src/plugins/debugger/console/console.cpp | 3 --- src/plugins/projectexplorer/appoutputpane.cpp | 4 ---- src/plugins/projectexplorer/taskwindow.cpp | 2 -- src/plugins/serialterminal/serialoutputpane.cpp | 4 ---- 8 files changed, 19 deletions(-) diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp index bb701ee4c59..9899fcc32a5 100644 --- a/src/plugins/autotest/testnavigationwidget.cpp +++ b/src/plugins/autotest/testnavigationwidget.cpp @@ -197,7 +197,6 @@ QList TestNavigationWidget::createToolButtons() m_filterButton->setIcon(Utils::Icons::FILTER.icon()); m_filterButton->setToolTip(tr("Filter Test Tree")); m_filterButton->setProperty("noArrow", true); - m_filterButton->setAutoRaise(true); m_filterButton->setPopupMode(QToolButton::InstantPopup); m_filterMenu = new QMenu(m_filterButton); initializeFilterMenu(); diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp index eca28cbfdac..3b4c9e5d21e 100644 --- a/src/plugins/autotest/testresultspane.cpp +++ b/src/plugins/autotest/testresultspane.cpp @@ -194,7 +194,6 @@ void TestResultsPane::createToolButtons() m_filterButton->setIcon(Utils::Icons::FILTER.icon()); m_filterButton->setToolTip(tr("Filter Test Results")); m_filterButton->setProperty("noArrow", true); - m_filterButton->setAutoRaise(true); m_filterButton->setPopupMode(QToolButton::InstantPopup); m_filterMenu = new QMenu(m_filterButton); initializeFilterMenu(); diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index b96e4e86e0e..9f28c33f6d5 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -128,7 +128,6 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_defaultToolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); d->m_activeToolBar = d->m_defaultToolBar; - d->m_lockButton->setAutoRaise(true); d->m_lockButton->setEnabled(false); d->m_dragHandle->setProperty("noArrow", true); @@ -149,7 +148,6 @@ EditorToolBar::EditorToolBar(QWidget *parent) : d->m_editorList->setMaxVisibleItems(40); d->m_editorList->setContextMenuPolicy(Qt::CustomContextMenu); - d->m_closeEditorButton->setAutoRaise(true); d->m_closeEditorButton->setIcon(Utils::Icons::CLOSE_TOOLBAR.icon()); d->m_closeEditorButton->setEnabled(false); d->m_closeEditorButton->setProperty("showborder", true); @@ -170,7 +168,6 @@ EditorToolBar::EditorToolBar(QWidget *parent) : splitMenu->addAction(d->m_splitNewWindowAction); d->m_splitButton->setMenu(splitMenu); - d->m_closeSplitButton->setAutoRaise(true); d->m_closeSplitButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); auto toplayout = new QHBoxLayout(this); diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 577bd946e60..ec723c89285 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -135,7 +135,6 @@ namespace Internal { m_widget->addWidget(newSearchArea); m_expandCollapseButton = new QToolButton(m_widget); - m_expandCollapseButton->setAutoRaise(true); m_expandCollapseAction->setCheckable(true); m_expandCollapseAction->setIcon(Utils::Icons::EXPAND_ALL_TOOLBAR.icon()); diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index 1ff13a25458..c7fe001c746 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -100,7 +100,6 @@ Console::Console() vbox->addWidget(new Core::FindToolBarPlaceHolder(m_consoleWidget)); m_showDebugButton = new QToolButton(m_consoleWidget); - m_showDebugButton->setAutoRaise(true); m_showDebugButtonAction = new Utils::SavedAction(this); m_showDebugButtonAction->setDefaultValue(true); @@ -114,7 +113,6 @@ Console::Console() m_showDebugButton->setDefaultAction(m_showDebugButtonAction); m_showWarningButton = new QToolButton(m_consoleWidget); - m_showWarningButton->setAutoRaise(true); m_showWarningButtonAction = new Utils::SavedAction(this); m_showWarningButtonAction->setDefaultValue(true); @@ -128,7 +126,6 @@ Console::Console() m_showWarningButton->setDefaultAction(m_showWarningButtonAction); m_showErrorButton = new QToolButton(m_consoleWidget); - m_showErrorButton->setAutoRaise(true); m_showErrorButtonAction = new Utils::SavedAction(this); m_showErrorButtonAction->setDefaultValue(true); diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index f622f17e418..e96faba9d1a 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -194,7 +194,6 @@ AppOutputPane::AppOutputPane() : // Rerun m_reRunButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); m_reRunButton->setToolTip(tr("Re-run this run-configuration")); - m_reRunButton->setAutoRaise(true); m_reRunButton->setEnabled(false); connect(m_reRunButton, &QToolButton::clicked, this, &AppOutputPane::reRunRunControl); @@ -208,7 +207,6 @@ AppOutputPane::AppOutputPane() : cmd->setDescription(m_stopAction->toolTip()); m_stopButton->setDefaultAction(cmd->action()); - m_stopButton->setAutoRaise(true); connect(m_stopAction, &QAction::triggered, this, &AppOutputPane::stopRunControl); @@ -217,7 +215,6 @@ AppOutputPane::AppOutputPane() : m_attachButton->setToolTip(msgAttachDebuggerTooltip()); m_attachButton->setEnabled(false); m_attachButton->setIcon(Icons::DEBUG_START_SMALL_TOOLBAR.icon()); - m_attachButton->setAutoRaise(true); connect(m_attachButton, &QToolButton::clicked, this, &AppOutputPane::attachToRunControl); @@ -227,7 +224,6 @@ AppOutputPane::AppOutputPane() : m_settingsButton->setToolTip(tr("Open Settings Page")); m_settingsButton->setIcon(Utils::Icons::SETTINGS_TOOLBAR.icon()); - m_settingsButton->setAutoRaise(true); connect(m_settingsButton, &QToolButton::clicked, this, [] { Core::ICore::showOptionsDialog(OPTIONS_PAGE_ID); }); diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp index 4fd0cb79a9e..86bae329062 100644 --- a/src/plugins/projectexplorer/taskwindow.cpp +++ b/src/plugins/projectexplorer/taskwindow.cpp @@ -237,7 +237,6 @@ static QToolButton *createFilterButton(const QIcon &icon, const QString &toolTip button->setToolTip(toolTip); button->setCheckable(true); button->setChecked(true); - button->setAutoRaise(true); button->setEnabled(true); QObject::connect(button, &QToolButton::toggled, receiver, lambda); return button; @@ -283,7 +282,6 @@ TaskWindow::TaskWindow() : d(std::make_unique()) d->m_categoriesButton->setIcon(Utils::Icons::FILTER.icon()); d->m_categoriesButton->setToolTip(tr("Filter by categories")); d->m_categoriesButton->setProperty("noArrow", true); - d->m_categoriesButton->setAutoRaise(true); d->m_categoriesButton->setPopupMode(QToolButton::InstantPopup); d->m_categoriesMenu = new QMenu(d->m_categoriesButton); diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp index 34657313f18..e1eca5aec13 100644 --- a/src/plugins/serialterminal/serialoutputpane.cpp +++ b/src/plugins/serialterminal/serialoutputpane.cpp @@ -352,7 +352,6 @@ void SerialOutputPane::createToolButtons() m_connectButton = new QToolButton; m_connectButton->setIcon(Utils::Icons::RUN_SMALL_TOOLBAR.icon()); m_connectButton->setToolTip(tr("Connect")); - m_connectButton->setAutoRaise(true); m_connectButton->setEnabled(false); connect(m_connectButton, &QToolButton::clicked, this, &SerialOutputPane::connectControl); @@ -361,7 +360,6 @@ void SerialOutputPane::createToolButtons() m_disconnectButton = new QToolButton; m_disconnectButton->setIcon(Utils::Icons::STOP_SMALL_TOOLBAR.icon()); m_disconnectButton->setToolTip(tr("Disconnect")); - m_disconnectButton->setAutoRaise(true); m_disconnectButton->setEnabled(false); connect(m_disconnectButton, &QToolButton::clicked, @@ -371,7 +369,6 @@ void SerialOutputPane::createToolButtons() m_resetButton = new QToolButton; m_resetButton->setIcon(Utils::Icons::RELOAD.icon()); m_resetButton->setToolTip(tr("Reset Board")); - m_resetButton->setAutoRaise(true); m_resetButton->setEnabled(false); connect(m_resetButton, &QToolButton::clicked, @@ -381,7 +378,6 @@ void SerialOutputPane::createToolButtons() m_newButton = new QToolButton; m_newButton->setIcon(Utils::Icons::PLUS_TOOLBAR.icon()); m_newButton->setToolTip(tr("Add New Terminal")); - m_newButton->setAutoRaise(true); m_newButton->setEnabled(true); connect(m_newButton, &QToolButton::clicked,