diff options
| author | hjk <hjk@qt.io> | 2019-02-26 09:40:49 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-02-26 15:18:14 +0000 |
| commit | 6f37348b4c9f00879787374672d42ca1d14083bc (patch) | |
| tree | 6196c3674e82fb5ab00a07ade44c0a509d7dc164 /src/plugins/git | |
| parent | 44a42db1ae4460142185e429ff6b39e37d6e3623 (diff) | |
Replace static_casts by QOverload where possible
Mainly to get rid of the QProcess::finished deprecation warning.
Also adjust coding style in the surrounding connects when needed.
Change-Id: I12f9b248c7974b892c4a069356e578e80f8c59e9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gerrit/gerritmodel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritpushdialog.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 6c53345ef9..931ce338d8 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -284,7 +284,7 @@ QueryContext::QueryContext(const QString &query, connect(&m_process, &QProcess::readyReadStandardOutput, this, [this] { m_output.append(m_process.readAllStandardOutput()); }); - connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &QueryContext::processFinished); connect(&m_process, &QProcess::errorOccurred, this, &QueryContext::processError); connect(&m_watcher, &QFutureWatcherBase::canceled, this, &QueryContext::terminate); @@ -376,7 +376,7 @@ void QueryContext::timeout() arg(timeOutMS / 1000), QMessageBox::NoButton, parent); QPushButton *terminateButton = box.addButton(tr("Terminate"), QMessageBox::YesRole); box.addButton(tr("Keep Running"), QMessageBox::NoRole); - connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), &box, &QDialog::reject); box.exec(); if (m_process.state() != QProcess::Running) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 3cc82f5c45..a18a0492bf 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -140,7 +140,7 @@ FetchContext::FetchContext(const QSharedPointer<GerritChange> &change, , m_state(FetchState) { connect(&m_process, &QProcess::errorOccurred, this, &FetchContext::processError); - connect(&m_process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), + connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &FetchContext::processFinished); connect(&m_process, &QProcess::readyReadStandardError, this, &FetchContext::processReadyReadStandardError); diff --git a/src/plugins/git/gerrit/gerritpushdialog.cpp b/src/plugins/git/gerrit/gerritpushdialog.cpp index 70f0ffa3b6..a59f615b57 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.cpp +++ b/src/plugins/git/gerrit/gerritpushdialog.cpp @@ -146,10 +146,10 @@ GerritPushDialog::GerritPushDialog(const QString &workingDir, const QString &rev } m_ui->localBranchComboBox->init(workingDir); - connect(m_ui->localBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(m_ui->localBranchComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &GerritPushDialog::updateCommits); - connect(m_ui->targetBranchComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(m_ui->targetBranchComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &GerritPushDialog::setChangeRange); connect(m_ui->targetBranchComboBox, &QComboBox::currentTextChanged, |