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

BareMetal: Use the Qt5 signal/slot connection syntax

Browse Source 
Change-Id: Icb51db0fbd77bbaba913a16eb468b0edafa047bb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
This commit is contained in:
Denis Shienkov
2015-11-29 18:58:42 +03:00
parent 6e2738af0e
commit 7607fae2bf
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
View File

@@ -57,8 +57,8 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS
m_gdbServerProviderChooser->populate(); m_gdbServerProviderChooser->populate();
formLayout->addRow(tr("GDB server provider:"), m_gdbServerProviderChooser); formLayout->addRow(tr("GDB server provider:"), m_gdbServerProviderChooser);
connect(m_nameLineEdit, SIGNAL(textChanged(QString)), connect(m_nameLineEdit, &QLineEdit::textChanged,
SIGNAL(completeChanged())); this, &BareMetalDeviceConfigurationWizardSetupPage::completeChanged);
connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged, connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged,
this, &QWizardPage::completeChanged); this, &QWizardPage::completeChanged);
} }

13
src/plugins/baremetal/gdbserverprovider.cpp
View File

@@ -244,8 +244,11 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget(
populateStartupModes(); populateStartupModes();
setFromProvider(); setFromProvider();
connect(m_nameLineEdit, SIGNAL(textChanged(QString)), SIGNAL(dirty())); connect(m_nameLineEdit, &QLineEdit::textChanged,
connect(m_startupModeComboBox, SIGNAL(currentIndexChanged(int)), SIGNAL(dirty())); this, &GdbServerProviderConfigWidget::dirty);
connect(m_startupModeComboBox,
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this, &GdbServerProviderConfigWidget::dirty);
} }
void GdbServerProviderConfigWidget::apply() void GdbServerProviderConfigWidget::apply()
@@ -375,8 +378,10 @@ HostWidget::HostWidget(QWidget *parent)
layout->addWidget(m_hostLineEdit); layout->addWidget(m_hostLineEdit);
layout->addWidget(m_portSpinBox); layout->addWidget(m_portSpinBox);
connect(m_hostLineEdit, SIGNAL(textChanged(QString)), SIGNAL(dataChanged())); connect(m_hostLineEdit, &QLineEdit::textChanged,
connect(m_portSpinBox, SIGNAL(valueChanged(int)), SIGNAL(dataChanged())); this, &HostWidget::dataChanged);
connect(m_portSpinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged),
this, &HostWidget::dataChanged);
} }
void HostWidget::setHost(const QString &host) void HostWidget::setHost(const QString &host)

9
src/plugins/baremetal/gdbserverproviderprocess.cpp
View File

@@ -47,9 +47,12 @@ GdbServerProviderProcess::GdbServerProviderProcess(
: ProjectExplorer::DeviceProcess(device, parent) : ProjectExplorer::DeviceProcess(device, parent)
, m_process(new QProcess(this)) , m_process(new QProcess(this))
{ {
connect(m_process, SIGNAL(error(QProcess::ProcessError)), connect(m_process,
SIGNAL(error(QProcess::ProcessError))); static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
connect(m_process, SIGNAL(finished(int)), SIGNAL(finished())); this, &GdbServerProviderProcess::error);
connect(m_process,
static_cast<void (QProcess::*)(int)>(&QProcess::finished),
this, &GdbServerProviderProcess::finished);
connect(m_process, &QProcess::readyReadStandardOutput, connect(m_process, &QProcess::readyReadStandardOutput,
this, &ProjectExplorer::DeviceProcess::readyReadStandardOutput); this, &ProjectExplorer::DeviceProcess::readyReadStandardOutput);