From b71462d495f5ab2802ac1a0525053baea9c06620 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 6 Jan 2015 16:18:36 +0100 Subject: [PATCH] BareMetal: Fix compile for older compiler Introduced with 165f008dce6b3129b93daf4d7eb314ea7885f769 Change-Id: Idc5b00313de807857bcd4deaaf99cabf95e81c6a Reviewed-by: hjk --- src/plugins/baremetal/baremetaldebugsupport.cpp | 14 +++++++------- .../baremetaldeviceconfigurationwidget.cpp | 2 +- .../baremetaldeviceconfigurationwizardpages.cpp | 2 +- src/plugins/baremetal/defaultgdbserverprovider.cpp | 6 +++--- .../baremetal/gdbserverproviderssettingspage.cpp | 4 ++-- src/plugins/baremetal/openocdgdbserverprovider.cpp | 14 +++++++------- .../baremetal/stlinkutilgdbserverprovider.cpp | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index 0946df6b103..c2c4fb02b17 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/src/plugins/baremetal/baremetaldebugsupport.cpp @@ -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(); diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp index 84cc00c013a..b9121bd604d 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp @@ -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); } diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp index 36af30a9362..eb416ebaccd 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp @@ -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); } diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp index 6b82e07fb4e..72daa756249 100644 --- a/src/plugins/baremetal/defaultgdbserverprovider.cpp +++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp @@ -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); } diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index 156619609a0..043cc33c70e 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -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(); diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp index a4a9b19706d..5d4bb82d53d 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp @@ -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)), diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp index 3b53e76953a..d34fa25a0ca 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp @@ -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)),