diff --git a/src/libs/advanceddockingsystem/workspacedialog.cpp b/src/libs/advanceddockingsystem/workspacedialog.cpp index 57a16546395..dc065c0016e 100644 --- a/src/libs/advanceddockingsystem/workspacedialog.cpp +++ b/src/libs/advanceddockingsystem/workspacedialog.cpp @@ -164,11 +164,11 @@ WorkspaceDialog::WorkspaceDialog(DockManager *manager, QWidget *parent) m_ui.workspaceView, &WorkspaceView::resetCurrentWorkspace); connect(m_ui.workspaceView, - &WorkspaceView::activated, + &WorkspaceView::workspaceActivated, m_ui.workspaceView, &WorkspaceView::switchToCurrentWorkspace); connect(m_ui.workspaceView, - &WorkspaceView::selected, + &WorkspaceView::workspacesSelected, this, &WorkspaceDialog::updateActions); connect(m_ui.btImport, diff --git a/src/libs/advanceddockingsystem/workspaceview.cpp b/src/libs/advanceddockingsystem/workspaceview.cpp index 7c730443b40..b33cabb13bf 100644 --- a/src/libs/advanceddockingsystem/workspaceview.cpp +++ b/src/libs/advanceddockingsystem/workspaceview.cpp @@ -101,10 +101,10 @@ WorkspaceView::WorkspaceView(QWidget *parent) selectionModel()->select(firstRow, QItemSelectionModel::QItemSelectionModel::SelectCurrent); connect(this, &Utils::TreeView::activated, [this](const QModelIndex &index) { - emit activated(m_workspaceModel.workspaceAt(index.row())); + emit workspaceActivated(m_workspaceModel.workspaceAt(index.row())); }); connect(selectionModel(), &QItemSelectionModel::selectionChanged, [this] { - emit selected(selectedWorkspaces()); + emit workspacesSelected(selectedWorkspaces()); }); connect(&m_workspaceModel, diff --git a/src/libs/advanceddockingsystem/workspaceview.h b/src/libs/advanceddockingsystem/workspaceview.h index 3edd668cc23..4e3298d80df 100644 --- a/src/libs/advanceddockingsystem/workspaceview.h +++ b/src/libs/advanceddockingsystem/workspaceview.h @@ -71,8 +71,8 @@ public: QStringList selectedWorkspaces() const; signals: - void activated(const QString &workspace); - void selected(const QStringList &workspaces); + void workspaceActivated(const QString &workspace); + void workspacesSelected(const QStringList &workspaces); void workspaceSwitched(); private: diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 490853659fa..084fe3f366a 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -1002,7 +1002,7 @@ void ConsoleProcess::emitError(QProcess::ProcessError err, const QString &errorS { d->m_error = err; d->m_errorString = errorString; - emit error(err); + emit errorOccurred(err); emit processError(errorString); } diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 6af30c1f84b..5daa8665d3b 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -107,7 +107,7 @@ public: const Utils::Environment &env); signals: - void error(QProcess::ProcessError error); + void errorOccurred(QProcess::ProcessError error); void processError(const QString &errorString); // These reflect the state of the actual client process diff --git a/src/plugins/git/gitsubmiteditor.cpp b/src/plugins/git/gitsubmiteditor.cpp index 3e13bc338cb..ba5c0eead88 100644 --- a/src/plugins/git/gitsubmiteditor.cpp +++ b/src/plugins/git/gitsubmiteditor.cpp @@ -102,7 +102,7 @@ GitSubmitEditor::GitSubmitEditor() : VcsBaseSubmitEditor(new GitSubmitEditorWidget) { connect(this, &VcsBaseSubmitEditor::diffSelectedRows, this, &GitSubmitEditor::slotDiffSelected); - connect(submitEditorWidget(), &GitSubmitEditorWidget::show, this, &GitSubmitEditor::showCommit); + connect(submitEditorWidget(), &GitSubmitEditorWidget::showRequested, this, &GitSubmitEditor::showCommit); connect(GitPlugin::versionControl(), &Core::IVersionControl::repositoryChanged, this, &GitSubmitEditor::forceUpdateFileModel); connect(&m_fetchWatcher, &QFutureWatcher::finished, diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index def70f08ac9..68507b68910 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -101,7 +101,7 @@ void GitSubmitEditorWidget::initialize(CommitType commitType, logChangeGroupBox->setLayout(logChangeLayout); m_logChangeWidget = new LogChangeWidget; m_logChangeWidget->init(repository); - connect(m_logChangeWidget, &LogChangeWidget::commitActivated, this, &GitSubmitEditorWidget::show); + connect(m_logChangeWidget, &LogChangeWidget::commitActivated, this, &GitSubmitEditorWidget::showRequested); logChangeLayout->addWidget(m_logChangeWidget); insertLeftWidget(logChangeGroupBox); m_gitSubmitPanelUi.editGroup->hide(); diff --git a/src/plugins/git/gitsubmiteditorwidget.h b/src/plugins/git/gitsubmiteditorwidget.h index 9da282e9def..8d925a21a87 100644 --- a/src/plugins/git/gitsubmiteditorwidget.h +++ b/src/plugins/git/gitsubmiteditorwidget.h @@ -76,7 +76,7 @@ protected: QString commitName() const override; signals: - void show(const QString &commit); + void showRequested(const QString &commit); private: void authorInformationChanged(); diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp index a7ef5766611..48cd3337f54 100644 --- a/src/plugins/projectexplorer/applicationlauncher.cpp +++ b/src/plugins/projectexplorer/applicationlauncher.cpp @@ -152,7 +152,7 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare this, &ApplicationLauncherPrivate::localConsoleProcessError); connect(&m_consoleProcess, &ConsoleProcess::processStopped, this, &ApplicationLauncherPrivate::localProcessDone); - connect(&m_consoleProcess, QOverload::of(&ConsoleProcess::error), + connect(&m_consoleProcess, &ConsoleProcess::errorOccurred, q, &ApplicationLauncher::error); #ifdef Q_OS_WIN diff --git a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp index 786b0cf019b..2f8b3c62dd0 100644 --- a/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp @@ -195,7 +195,7 @@ void SshDeviceProcess::handleConnected() d->process->requestX11Forwarding(display); if (runInTerminal()) { d->process->requestTerminal(); - connect(&d->consoleProcess, QOverload::of(&ConsoleProcess::error), + connect(&d->consoleProcess, &ConsoleProcess::errorOccurred, this, &DeviceProcess::error); connect(&d->consoleProcess, &ConsoleProcess::processStarted, this, &SshDeviceProcess::handleProcessStarted); diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp index 6cda77927ba..09e2146abd7 100644 --- a/src/plugins/projectexplorer/sessiondialog.cpp +++ b/src/plugins/projectexplorer/sessiondialog.cpp @@ -138,10 +138,10 @@ SessionDialog::SessionDialog(QWidget *parent) : QDialog(parent) m_ui.sessionView, &SessionView::switchToCurrentSession); connect(m_ui.btRename, &QAbstractButton::clicked, m_ui.sessionView, &SessionView::renameCurrentSession); - connect(m_ui.sessionView, &SessionView::activated, + connect(m_ui.sessionView, &SessionView::sessionActivated, m_ui.sessionView, &SessionView::switchToCurrentSession); - connect(m_ui.sessionView, &SessionView::selected, + connect(m_ui.sessionView, &SessionView::sessionsSelected, this, &SessionDialog::updateActions); connect(m_ui.sessionView, &SessionView::sessionSwitched, this, &QDialog::reject); diff --git a/src/plugins/projectexplorer/sessionview.cpp b/src/plugins/projectexplorer/sessionview.cpp index 49cd8b1486d..00825985309 100644 --- a/src/plugins/projectexplorer/sessionview.cpp +++ b/src/plugins/projectexplorer/sessionview.cpp @@ -77,10 +77,10 @@ SessionView::SessionView(QWidget *parent) SelectCurrent); connect(this, &Utils::TreeView::activated, [this](const QModelIndex &index){ - emit activated(m_sessionModel.sessionAt(index.row())); + emit sessionActivated(m_sessionModel.sessionAt(index.row())); }); connect(selectionModel(), &QItemSelectionModel::selectionChanged, [this] { - emit selected(selectedSessions()); + emit sessionsSelected(selectedSessions()); }); connect(&m_sessionModel, &SessionModel::sessionSwitched, diff --git a/src/plugins/projectexplorer/sessionview.h b/src/plugins/projectexplorer/sessionview.h index 21988c38383..d991dd92d55 100644 --- a/src/plugins/projectexplorer/sessionview.h +++ b/src/plugins/projectexplorer/sessionview.h @@ -52,8 +52,8 @@ public: void selectSession(const QString &sessionName); signals: - void activated(const QString &session); - void selected(const QStringList &sessions); + void sessionActivated(const QString &session); + void sessionsSelected(const QStringList &sessions); void sessionSwitched(); private: