From 0dae822ca3715e31b2bb95afe89703465020d6a8 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 19 Jul 2022 22:37:03 +0200 Subject: [PATCH] Drop Qt5: Core: Get rid of QOverload Change-Id: Ibaebd83304680156e13a9ebc473075ad2a4bfed4 Reviewed-by: Reviewed-by: Alessandro Portale --- .../coreplugin/dialogs/externaltoolconfig.cpp | 4 ++-- src/plugins/coreplugin/dialogs/newdialogwidget.cpp | 2 +- .../coreplugin/dialogs/readonlyfilesdialog.cpp | 5 ++--- .../coreplugin/editormanager/editorwindow.cpp | 2 +- src/plugins/coreplugin/editortoolbar.cpp | 10 ++++------ src/plugins/coreplugin/fancytabwidget.cpp | 2 +- src/plugins/coreplugin/find/findtoolbar.cpp | 4 ++-- src/plugins/coreplugin/find/findtoolwindow.cpp | 2 +- src/plugins/coreplugin/find/searchresultwidget.cpp | 4 ++-- src/plugins/coreplugin/find/searchresultwindow.cpp | 6 ++---- src/plugins/coreplugin/foldernavigationwidget.cpp | 7 ++----- src/plugins/coreplugin/locator/locator.cpp | 2 +- .../coreplugin/locator/locatorsettingspage.cpp | 2 +- src/plugins/coreplugin/locator/locatorwidget.cpp | 3 ++- src/plugins/coreplugin/loggingviewer.cpp | 4 ++-- src/plugins/coreplugin/mainwindow.cpp | 2 +- src/plugins/coreplugin/mimetypemagicdialog.cpp | 3 +-- src/plugins/coreplugin/navigationsubwidget.cpp | 3 +-- src/plugins/coreplugin/sidebarwidget.cpp | 3 +-- src/plugins/coreplugin/systemsettings.cpp | 12 ++++-------- src/plugins/coreplugin/windowsupport.cpp | 2 +- 21 files changed, 35 insertions(+), 49 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 21b09d08ce4..cee2c6d7c9d 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -496,9 +496,9 @@ ExternalToolConfig::ExternalToolConfig() this, &ExternalToolConfig::updateCurrentItem); connect(m_ui.environmentButton, &QAbstractButton::clicked, this, &ExternalToolConfig::editEnvironmentChanges); - connect(m_ui.outputBehavior, QOverload::of(&QComboBox::activated), + connect(m_ui.outputBehavior, &QComboBox::activated, this, &ExternalToolConfig::updateCurrentItem); - connect(m_ui.errorOutputBehavior, QOverload::of(&QComboBox::activated), + connect(m_ui.errorOutputBehavior, &QComboBox::activated, this, &ExternalToolConfig::updateCurrentItem); connect(m_ui.modifiesDocumentCheckbox, &QAbstractButton::clicked, this, &ExternalToolConfig::updateCurrentItem); diff --git a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp index 3b005307b0c..712f70fdc97 100644 --- a/src/plugins/coreplugin/dialogs/newdialogwidget.cpp +++ b/src/plugins/coreplugin/dialogs/newdialogwidget.cpp @@ -221,7 +221,7 @@ NewDialogWidget::NewDialogWidget(QWidget *parent) : connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &NewDialogWidget::accept); connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &NewDialogWidget::reject); - connect(m_ui->comboBox, QOverload::of(&QComboBox::currentIndexChanged), + connect(m_ui->comboBox, &QComboBox::currentIndexChanged, this, &NewDialogWidget::setSelectedPlatform); } diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp index 687288ad449..5f8475f35a0 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.cpp @@ -466,7 +466,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths) // Also save the buttongroup for every file to get the result for each entry. buttonGroups.append({filePath, radioButtonGroup}); - QObject::connect(radioButtonGroup, QOverload::of(&QButtonGroup::buttonClicked), + QObject::connect(radioButtonGroup, &QButtonGroup::buttonClicked, [this] { updateSelectAll(); }); } @@ -525,8 +525,7 @@ void ReadOnlyFilesDialogPrivate::initDialog(const FilePaths &filePaths) ui.setAll->addItem(saveAsText); setAllIndexForOperation[SaveAs] = ui.setAll->count() - 1; } - QObject::connect(ui.setAll, QOverload::of(&QComboBox::activated), - [this](int index) { setAll(index); }); + QObject::connect(ui.setAll, &QComboBox::activated, [this](int index) { setAll(index); }); // Filter which columns should be visible and resize them to content. for (int i = 0; i < NumberOfColumns; ++i) { diff --git a/src/plugins/coreplugin/editormanager/editorwindow.cpp b/src/plugins/coreplugin/editormanager/editorwindow.cpp index 02b5d15aae4..06839312dec 100644 --- a/src/plugins/coreplugin/editormanager/editorwindow.cpp +++ b/src/plugins/coreplugin/editormanager/editorwindow.cpp @@ -76,7 +76,7 @@ EditorWindow::EditorWindow(QWidget *parent) : connect(m_area, &EditorArea::windowTitleNeedsUpdate, this, &EditorWindow::updateWindowTitle); // editor area can be deleted by editor manager - connect(m_area, &EditorArea::destroyed, this, [this]() { + connect(m_area, &EditorArea::destroyed, this, [this] { m_area = nullptr; deleteLater(); }); diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 8680806bef7..ee027e11c1a 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -187,15 +187,13 @@ EditorToolBar::EditorToolBar(QWidget *parent) : // this signal is disconnected for standalone toolbars and replaced with // a private slot connection - connect(d->m_editorList, QOverload::of(&QComboBox::activated), - this, &EditorToolBar::listSelectionActivated); - + connect(d->m_editorList, &QComboBox::activated, this, &EditorToolBar::listSelectionActivated); connect(d->m_editorList, &QComboBox::customContextMenuRequested, [this](QPoint p) { QMenu menu; fillListContextMenu(&menu); menu.exec(d->m_editorList->mapToGlobal(p)); }); - connect(d->m_dragHandleMenu, &QMenu::aboutToShow, [this]() { + connect(d->m_dragHandleMenu, &QMenu::aboutToShow, this, [this] { d->m_dragHandleMenu->clear(); fillListContextMenu(d->m_dragHandleMenu); }); @@ -300,9 +298,9 @@ void EditorToolBar::setToolbarCreationFlags(ToolbarCreationFlags flags) this, &EditorToolBar::setCurrentEditor); - disconnect(d->m_editorList, QOverload::of(&QComboBox::activated), + disconnect(d->m_editorList, &QComboBox::activated, this, &EditorToolBar::listSelectionActivated); - connect(d->m_editorList, QOverload::of(&QComboBox::activated), + connect(d->m_editorList, &QComboBox::activated, this, &EditorToolBar::changeActiveEditor); d->m_splitButton->setVisible(false); d->m_closeSplitButton->setVisible(false); diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp index b41ea282a00..5a16decaa7a 100644 --- a/src/plugins/coreplugin/fancytabwidget.cpp +++ b/src/plugins/coreplugin/fancytabwidget.cpp @@ -221,7 +221,7 @@ void FancyTabBar::mousePressEvent(QMouseEvent *event) m_currentIndex = index; update(); // update tab bar before showing widget - QMetaObject::invokeMethod(this, [this]() { + QMetaObject::invokeMethod(this, [this] { emit currentChanged(m_currentIndex); }, Qt::QueuedConnection); } diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index ccfd99e9859..05c7e430d88 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -167,13 +167,13 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind) cmd = ActionManager::registerAction(m_findInDocumentAction, Constants::FIND_IN_DOCUMENT); cmd->setDefaultKeySequence(QKeySequence::Find); mfind->addAction(cmd, Constants::G_FIND_CURRENTDOCUMENT); - connect(m_findInDocumentAction, &QAction::triggered, this, [this]() { openFind(); }); + connect(m_findInDocumentAction, &QAction::triggered, this, [this] { openFind(); }); // Pressing the find shortcut while focus is in the tool bar should not change the search text, // so register a different find action for the tool bar auto localFindAction = new QAction(this); ActionManager::registerAction(localFindAction, Constants::FIND_IN_DOCUMENT, findcontext); - connect(localFindAction, &QAction::triggered, this, [this]() { + connect(localFindAction, &QAction::triggered, this, [this] { openFindToolBar(FindToolBar::OpenFlags(UpdateAll & ~UpdateFindText)); }); diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp index 2e1f363b29f..70fa1afae71 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.cpp +++ b/src/plugins/coreplugin/find/findtoolwindow.cpp @@ -77,7 +77,7 @@ FindToolWindow::FindToolWindow(QWidget *parent) connect(m_ui.matchCase, &QAbstractButton::toggled, Find::instance(), &Find::setCaseSensitive); connect(m_ui.wholeWords, &QAbstractButton::toggled, Find::instance(), &Find::setWholeWord); connect(m_ui.regExp, &QAbstractButton::toggled, Find::instance(), &Find::setRegularExpression); - connect(m_ui.filterList, QOverload::of(&QComboBox::activated), + connect(m_ui.filterList, &QComboBox::activated, this, QOverload::of(&FindToolWindow::setCurrentFilter)); m_findCompleter->setModel(Find::findCompletionModel()); diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp index 9e62153cf60..e9f2319038f 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.cpp +++ b/src/plugins/coreplugin/find/searchresultwidget.cpp @@ -284,8 +284,8 @@ void SearchResultWidget::addResults(const QList &items, Search InfoBarEntry info(sizeWarningId, tr("The search resulted in more than %n items, do you still want to continue?", nullptr, SEARCHRESULT_WARNING_LIMIT)); - info.setCancelButtonInfo(tr("Cancel"), [this]() { cancelAfterSizeWarning(); }); - info.addCustomButton(tr("Continue"), [this]() { continueAfterSizeWarning(); }); + info.setCancelButtonInfo(tr("Cancel"), [this] { cancelAfterSizeWarning(); }); + info.addCustomButton(tr("Continue"), [this] { continueAfterSizeWarning(); }); m_infoBar.addInfo(info); emit requestPopup(false/*no focus*/); } diff --git a/src/plugins/coreplugin/find/searchresultwindow.cpp b/src/plugins/coreplugin/find/searchresultwindow.cpp index 3deaa653227..7886ec3f7c7 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.cpp +++ b/src/plugins/coreplugin/find/searchresultwindow.cpp @@ -650,10 +650,8 @@ QList SearchResultWindowPrivate::toolBarWidgets() m_recentSearchesBox->setProperty("drawleftborder", true); m_recentSearchesBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); m_recentSearchesBox->addItem(tr("New Search")); - connect(m_recentSearchesBox, - QOverload::of(&QComboBox::activated), - this, - &SearchResultWindowPrivate::setCurrentIndexWithFocus); + connect(m_recentSearchesBox, &QComboBox::activated, + this, &SearchResultWindowPrivate::setCurrentIndexWithFocus); } return {m_expandCollapseButton, m_filterButton, diff --git a/src/plugins/coreplugin/foldernavigationwidget.cpp b/src/plugins/coreplugin/foldernavigationwidget.cpp index 428249e72ee..4c927e0e457 100644 --- a/src/plugins/coreplugin/foldernavigationwidget.cpp +++ b/src/plugins/coreplugin/foldernavigationwidget.cpp @@ -388,11 +388,8 @@ FolderNavigationWidget::FolderNavigationWidget(QWidget *parent) : QWidget(parent this, &FolderNavigationWidget::toggleAutoSynchronization); connect(m_toggleRootSync, &QAbstractButton::clicked, - this, [this]() { setRootAutoSynchronization(!m_rootAutoSync); }); - connect(m_rootSelector, - QOverload::of(&QComboBox::currentIndexChanged), - this, - [this](int index) { + this, [this] { setRootAutoSynchronization(!m_rootAutoSync); }); + connect(m_rootSelector, &QComboBox::currentIndexChanged, this, [this](int index) { const auto directory = m_rootSelector->itemData(index).value(); m_rootSelector->setToolTip(directory.toUserOutput()); setRootDirectory(directory); diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp index 362c5034d12..e29df61ac66 100644 --- a/src/plugins/coreplugin/locator/locator.cpp +++ b/src/plugins/coreplugin/locator/locator.cpp @@ -109,7 +109,7 @@ Locator::Locator() { m_instance = this; m_refreshTimer.setSingleShot(false); - connect(&m_refreshTimer, &QTimer::timeout, this, [this]() { refresh(filters()); }); + connect(&m_refreshTimer, &QTimer::timeout, this, [this] { refresh(filters()); }); } Locator::~Locator() diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.cpp b/src/plugins/coreplugin/locator/locatorsettingspage.cpp index e0c569d05e1..a728bc67108 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.cpp +++ b/src/plugins/coreplugin/locator/locatorsettingspage.cpp @@ -207,7 +207,7 @@ public: connect(m_ui.filterList, &Utils::TreeView::activated, this, &LocatorSettingsWidget::configureFilter); connect(m_ui.editButton, &QPushButton::clicked, - this, [this]() { configureFilter(m_ui.filterList->currentIndex()); }); + this, [this] { configureFilter(m_ui.filterList->currentIndex()); }); connect(m_ui.removeButton, &QPushButton::clicked, this, &LocatorSettingsWidget::removeCustomFilter); diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 4f6f666a633..73821c5d7a2 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -630,7 +630,8 @@ LocatorWidget::LocatorWidget(Locator *locator) : m_progressIndicator->hide(); m_showProgressTimer.setSingleShot(true); m_showProgressTimer.setInterval(50); // don't show progress for < 50ms tasks - connect(&m_showProgressTimer, &QTimer::timeout, [this]() { setProgressIndicatorVisible(true);}); + connect(&m_showProgressTimer, &QTimer::timeout, + this, [this] { setProgressIndicatorVisible(true); }); Command *locateCmd = ActionManager::command(Constants::LOCATE); if (QTC_GUARD(locateCmd)) { diff --git a/src/plugins/coreplugin/loggingviewer.cpp b/src/plugins/coreplugin/loggingviewer.cpp index 677bffd455c..f95183ac871 100644 --- a/src/plugins/coreplugin/loggingviewer.cpp +++ b/src/plugins/coreplugin/loggingviewer.cpp @@ -564,7 +564,7 @@ void LoggingViewManagerWidget::showLogViewContextMenu(const QPoint &pos) const m.addAction(copy); auto copyAll = new QAction(tr("Copy All"), &m); m.addAction(copyAll); - connect(copy, &QAction::triggered, &m, [this](){ + connect(copy, &QAction::triggered, &m, [this] { auto selectionModel = m_logView->selectionModel(); QString copied; const bool useTS = m_timestamps->isChecked(); @@ -576,7 +576,7 @@ void LoggingViewManagerWidget::showLogViewContextMenu(const QPoint &pos) const QGuiApplication::clipboard()->setText(copied); }); - connect(copyAll, &QAction::triggered, &m, [this](){ + connect(copyAll, &QAction::triggered, &m, [this] { QString copied; const bool useTS = m_timestamps->isChecked(); const bool useLL = m_messageTypes->isChecked(); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index ca635537330..7c1641ee789 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -1493,7 +1493,7 @@ void MainWindow::changeLog() "[\\1](https://bugreports.qt.io/browse/\\1)"); textEdit->setMarkdown(contents); }; - connect(versionCombo, QOverload::of(&QComboBox::currentIndexChanged), textEdit, showLog); + connect(versionCombo, &QComboBox::currentIndexChanged, textEdit, showLog); showLog(versionCombo->currentIndex()); connect(showInExplorer, &QPushButton::clicked, [versionCombo, versionedFiles] { diff --git a/src/plugins/coreplugin/mimetypemagicdialog.cpp b/src/plugins/coreplugin/mimetypemagicdialog.cpp index 633977638f1..c288a82be48 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.cpp +++ b/src/plugins/coreplugin/mimetypemagicdialog.cpp @@ -55,8 +55,7 @@ MimeTypeMagicDialog::MimeTypeMagicDialog(QWidget *parent) : connect(ui.informationLabel, &QLabel::linkActivated, this, [](const QString &link) { QDesktopServices::openUrl(QUrl(link)); }); - connect(ui.typeSelector, QOverload::of(&QComboBox::activated), - this, [this]() { + connect(ui.typeSelector, &QComboBox::activated, this, [this] { if (ui.useRecommendedGroupBox->isChecked()) setToRecommendedValues(); }); diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp index c2f2b406925..a47abc06d73 100644 --- a/src/plugins/coreplugin/navigationsubwidget.cpp +++ b/src/plugins/coreplugin/navigationsubwidget.cpp @@ -99,8 +99,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos setFactoryIndex(factoryIndex); - connect(m_navigationComboBox, - QOverload::of(&QComboBox::currentIndexChanged), + connect(m_navigationComboBox, &QComboBox::currentIndexChanged, this, &NavigationSubWidget::comboBoxIndexChanged); comboBoxIndexChanged(factoryIndex); diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp index 8c1d9b10809..373556bc3cc 100644 --- a/src/plugins/coreplugin/sidebarwidget.cpp +++ b/src/plugins/coreplugin/sidebarwidget.cpp @@ -99,8 +99,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id) } setCurrentItem(t); - connect(m_comboBox, QOverload::of(&QComboBox::currentIndexChanged), - this, &SideBarWidget::setCurrentIndex); + connect(m_comboBox, &QComboBox::currentIndexChanged, this, &SideBarWidget::setCurrentIndex); } SideBarWidget::~SideBarWidget() = default; diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp index a22afd61ba1..b7e98da416e 100644 --- a/src/plugins/coreplugin/systemsettings.cpp +++ b/src/plugins/coreplugin/systemsettings.cpp @@ -94,13 +94,10 @@ public: for (const TerminalCommand &term : availableTerminals) m_ui.terminalComboBox->addItem(term.command, QVariant::fromValue(term)); updateTerminalUi(TerminalCommand::terminalEmulator()); - connect(m_ui.terminalComboBox, - QOverload::of(&QComboBox::currentIndexChanged), - this, + connect(m_ui.terminalComboBox, &QComboBox::currentIndexChanged, this, [this](int index) { - updateTerminalUi( - m_ui.terminalComboBox->itemData(index).value()); - }); + updateTerminalUi(m_ui.terminalComboBox->itemData(index).value()); + }); } else { m_ui.terminalLabel->hide(); m_ui.terminalComboBox->hide(); @@ -156,8 +153,7 @@ public: connect(m_ui.helpCrashReportingButton, &QAbstractButton::clicked, this, [this] { showHelpDialog(tr("Crash Reporting"), CorePlugin::msgCrashpadInformation()); }); - connect(m_ui.enableCrashReportingCheckBox, - QOverload::of(&QCheckBox::stateChanged), this, [this] { + connect(m_ui.enableCrashReportingCheckBox, &QCheckBox::stateChanged, this, [this] { const QString restartText = tr("The change will take effect after restart."); Core::RestartDialog restartDialog(Core::ICore::dialogParent(), restartText); restartDialog.exec(); diff --git a/src/plugins/coreplugin/windowsupport.cpp b/src/plugins/coreplugin/windowsupport.cpp index 6a4b0574f9e..3434df57f5e 100644 --- a/src/plugins/coreplugin/windowsupport.cpp +++ b/src/plugins/coreplugin/windowsupport.cpp @@ -90,7 +90,7 @@ WindowSupport::WindowSupport(QWidget *window, const Context &context) m_windowList->addWindow(window); - connect(ICore::instance(), &ICore::coreAboutToClose, this, [this]() { m_shutdown = true; }); + connect(ICore::instance(), &ICore::coreAboutToClose, this, [this] { m_shutdown = true; }); } WindowSupport::~WindowSupport()