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

BareMetal: Fix compile for older compiler

Browse Source 
Introduced with 165f008dce

Change-Id: Idc5b00313de807857bcd4deaaf99cabf95e81c6a
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-01-06 16:18:36 +01:00
committed by hjk
parent ece373387c
commit b71462d495
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/baremetal/baremetaldebugsupport.cpp
View File

@@ -53,7 +53,7 @@ BareMetalDebugSupport::BareMetalDebugSupport(
, m_state(BareMetalDebugSupport::Inactive)
{
Q_ASSERT(runControl);
connect(m_runControl, &Debugger::DebuggerRunControl::requestRemoteSetup,
connect(m_runControl.data(), &Debugger::DebuggerRunControl::requestRemoteSetup,
this, &BareMetalDebugSupport::remoteSetupRequested);
connect(runControl, &Debugger::DebuggerRunControl::finished,
this, &BareMetalDebugSupport::debuggingFinished);
@@ -159,17 +159,17 @@ void BareMetalDebugSupport::startExecution()
m_state = StartingRunner;
showMessage(tr("Starting GDB server...") + QLatin1Char('\n'), Debugger::LogStatus);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteStderr,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteStderr,
this, &BareMetalDebugSupport::remoteErrorOutputMessage);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteStdout,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteStdout,
this, &BareMetalDebugSupport::remoteOutputMessage);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::remoteProcessStarted,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::remoteProcessStarted,
this, &BareMetalDebugSupport::remoteProcessStarted);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::finished,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::finished,
this, &BareMetalDebugSupport::appRunnerFinished);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::reportProgress,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::reportProgress,
this, &BareMetalDebugSupport::progressReport);
connect(m_appRunner, &ProjectExplorer::DeviceApplicationRunner::reportError,
connect(m_appRunner.data(), &ProjectExplorer::DeviceApplicationRunner::reportError,
this, &BareMetalDebugSupport::appRunnerError);
const QString cmd = p->executable();

2
src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
View File

@@ -57,7 +57,7 @@ BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget(
m_gdbServerProviderChooser->setCurrentProviderId(dev->gdbServerProviderId());
formLayout->addRow(tr("GDB server provider:"), m_gdbServerProviderChooser);
connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged,
connect(m_gdbServerProviderChooser.data(), &GdbServerProviderChooser::providerChanged,
this, &BareMetalDeviceConfigurationWidget::gdbServerProviderChanged);
}

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

@@ -59,7 +59,7 @@ BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardS
connect(m_nameLineEdit, SIGNAL(textChanged(QString)),
SIGNAL(completeChanged()));
connect(m_gdbServerProviderChooser, &GdbServerProviderChooser::providerChanged,
connect(m_gdbServerProviderChooser.data(), &GdbServerProviderChooser::providerChanged,
this, &QWizardPage::completeChanged);
}

6
src/plugins/baremetal/defaultgdbserverprovider.cpp
View File

@@ -162,11 +162,11 @@ DefaultGdbServerProviderConfigWidget::DefaultGdbServerProviderConfigWidget(
addErrorLabel();
setFromProvider();
connect(m_hostWidget, &HostWidget::dataChanged,
connect(m_hostWidget.data(), &HostWidget::dataChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
}

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

@@ -483,7 +483,7 @@ QWidget *GdbServerProvidersSettingsPage::widget()
Q_ASSERT(!m_model);
m_model = new GdbServerProviderModel(m_configWidget);
connect(m_model, &GdbServerProviderModel::providerStateChanged,
connect(m_model.data(), &GdbServerProviderModel::providerStateChanged,
this, &GdbServerProvidersSettingsPage::updateState);
m_providerView->setModel(m_model);
@@ -519,7 +519,7 @@ QWidget *GdbServerProvidersSettingsPage::widget()
m_addButton->setMenu(addMenu);
connect(m_delButton, &QPushButton::clicked,
connect(m_delButton.data(), &QPushButton::clicked,
this, &GdbServerProvidersSettingsPage::removeProvider);
updateState();

14
src/plugins/baremetal/openocdgdbserverprovider.cpp
View File

@@ -287,19 +287,19 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget(
addErrorLabel();
setFromProvider();
connect(m_hostWidget, &HostWidget::dataChanged,
connect(m_hostWidget.data(), &HostWidget::dataChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_executableFileChooser, &Utils::PathChooser::changed,
connect(m_executableFileChooser.data(), &Utils::PathChooser::changed,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_rootScriptsDirChooser, &Utils::PathChooser::changed,
connect(m_rootScriptsDirChooser.data(), &Utils::PathChooser::changed,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_configurationFileChooser, &Utils::PathChooser::changed,
connect(m_configurationFileChooser.data(), &Utils::PathChooser::changed,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_additionalArgumentsLineEdit, &QLineEdit::textChanged,
connect(m_additionalArgumentsLineEdit.data(), &QLineEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_startupModeComboBox, SIGNAL(currentIndexChanged(int)),

8
src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
View File

@@ -286,9 +286,9 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget
addErrorLabel();
setFromProvider();
connect(m_hostWidget, &HostWidget::dataChanged,
connect(m_hostWidget.data(), &HostWidget::dataChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_executableFileChooser, &Utils::PathChooser::changed,
connect(m_executableFileChooser.data(), &Utils::PathChooser::changed,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_verboseLevelSpinBox, SIGNAL(valueChanged(int)), SIGNAL(dirty()));
@@ -296,9 +296,9 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget
connect(m_resetBoardCheckBox, SIGNAL(clicked()), SIGNAL(dirty()));
connect(m_transportLayerComboBox, SIGNAL(currentIndexChanged(int)), SIGNAL(dirty()));
connect(m_initCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_initCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_resetCommandsTextEdit, &QPlainTextEdit::textChanged,
connect(m_resetCommandsTextEdit.data(), &QPlainTextEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty);
connect(m_startupModeComboBox, SIGNAL(currentIndexChanged(int)),