feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Avoid signal overloading

Browse Source 
Choose a different name for them.

Change-Id: Ie2cc2c85dca72b7f7ff84c95fb0abd0a0e99a63d
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2020-11-17 14:18:49 +01:00
parent f54784cbbe
commit 2341609719
13 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/advanceddockingsystem/workspacedialog.cpp
View File

@@ -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,

4
src/libs/advanceddockingsystem/workspaceview.cpp
View File

@@ -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,

4
src/libs/advanceddockingsystem/workspaceview.h
View File

@@ -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:

2
src/libs/utils/consoleprocess.cpp
View File

@@ -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);
}

2
src/libs/utils/consoleprocess.h
View File

@@ -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

2
src/plugins/git/gitsubmiteditor.cpp
View File

@@ -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<CommitDataFetchResult>::finished,

2
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -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();

2
src/plugins/git/gitsubmiteditorwidget.h
View File

@@ -76,7 +76,7 @@ protected:
QString commitName() const override;
signals:
void show(const QString &commit);
void showRequested(const QString &commit);
private:
void authorInformationChanged();

2
src/plugins/projectexplorer/applicationlauncher.cpp
View File

@@ -152,7 +152,7 @@ ApplicationLauncherPrivate::ApplicationLauncherPrivate(ApplicationLauncher *pare
this, &ApplicationLauncherPrivate::localConsoleProcessError);
connect(&m_consoleProcess, &ConsoleProcess::processStopped,
this, &ApplicationLauncherPrivate::localProcessDone);
connect(&m_consoleProcess, QOverload<QProcess::ProcessError>::of(&ConsoleProcess::error),
connect(&m_consoleProcess, &ConsoleProcess::errorOccurred,
q, &ApplicationLauncher::error);
#ifdef Q_OS_WIN

2
src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
View File

@@ -195,7 +195,7 @@ void SshDeviceProcess::handleConnected()
d->process->requestX11Forwarding(display);
if (runInTerminal()) {
d->process->requestTerminal();
connect(&d->consoleProcess, QOverload<QProcess::ProcessError>::of(&ConsoleProcess::error),
connect(&d->consoleProcess, &ConsoleProcess::errorOccurred,
this, &DeviceProcess::error);
connect(&d->consoleProcess, &ConsoleProcess::processStarted,
this, &SshDeviceProcess::handleProcessStarted);

4
src/plugins/projectexplorer/sessiondialog.cpp
View File

@@ -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);

4
src/plugins/projectexplorer/sessionview.cpp
View File

@@ -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,

4
src/plugins/projectexplorer/sessionview.h
View File

@@ -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: