From 7607fae2bfcad1a07f3ffa9d7c15c4eba48e7a04 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sun, 29 Nov 2015 18:58:42 +0300 Subject: [PATCH] BareMetal: Use the Qt5 signal/slot connection syntax Change-Id: Icb51db0fbd77bbaba913a16eb468b0edafa047bb Reviewed-by: Tobias Hunger Reviewed-by: Tim Sander --- .../baremetaldeviceconfigurationwizardpages.cpp | 4 ++-- src/plugins/baremetal/gdbserverprovider.cpp | 13 +++++++++---- src/plugins/baremetal/gdbserverproviderprocess.cpp | 9 ++++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp index b26fc95b251..472a74c706c 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp @@ -57,8 +57,8 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS m_gdbServerProviderChooser->populate(); formLayout->addRow(tr("GDB server provider:"), m_gdbServerProviderChooser); - connect(m_nameLineEdit, SIGNAL(textChanged(QString)), - SIGNAL(completeChanged())); + connect(m_nameLineEdit, &QLineEdit::textChanged, + this, &BareMetalDeviceConfigurationWizardSetupPage::completeChanged); connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged, this, &QWizardPage::completeChanged); } diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp index cdb88987d45..646bdaa80dc 100644 --- a/src/plugins/baremetal/gdbserverprovider.cpp +++ b/src/plugins/baremetal/gdbserverprovider.cpp @@ -244,8 +244,11 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget( populateStartupModes(); setFromProvider(); - connect(m_nameLineEdit, SIGNAL(textChanged(QString)), SIGNAL(dirty())); - connect(m_startupModeComboBox, SIGNAL(currentIndexChanged(int)), SIGNAL(dirty())); + connect(m_nameLineEdit, &QLineEdit::textChanged, + this, &GdbServerProviderConfigWidget::dirty); + connect(m_startupModeComboBox, + static_cast(&QComboBox::currentIndexChanged), + this, &GdbServerProviderConfigWidget::dirty); } void GdbServerProviderConfigWidget::apply() @@ -375,8 +378,10 @@ HostWidget::HostWidget(QWidget *parent) layout->addWidget(m_hostLineEdit); layout->addWidget(m_portSpinBox); - connect(m_hostLineEdit, SIGNAL(textChanged(QString)), SIGNAL(dataChanged())); - connect(m_portSpinBox, SIGNAL(valueChanged(int)), SIGNAL(dataChanged())); + connect(m_hostLineEdit, &QLineEdit::textChanged, + this, &HostWidget::dataChanged); + connect(m_portSpinBox, static_cast(&QSpinBox::valueChanged), + this, &HostWidget::dataChanged); } void HostWidget::setHost(const QString &host) diff --git a/src/plugins/baremetal/gdbserverproviderprocess.cpp b/src/plugins/baremetal/gdbserverproviderprocess.cpp index 650ce92d765..8dd8e11a24c 100644 --- a/src/plugins/baremetal/gdbserverproviderprocess.cpp +++ b/src/plugins/baremetal/gdbserverproviderprocess.cpp @@ -47,9 +47,12 @@ GdbServerProviderProcess::GdbServerProviderProcess( : ProjectExplorer::DeviceProcess(device, parent) , m_process(new QProcess(this)) { - connect(m_process, SIGNAL(error(QProcess::ProcessError)), - SIGNAL(error(QProcess::ProcessError))); - connect(m_process, SIGNAL(finished(int)), SIGNAL(finished())); + connect(m_process, + static_cast(&QProcess::error), + this, &GdbServerProviderProcess::error); + connect(m_process, + static_cast(&QProcess::finished), + this, &GdbServerProviderProcess::finished); connect(m_process, &QProcess::readyReadStandardOutput, this, &ProjectExplorer::DeviceProcess::readyReadStandardOutput);