bare-metal: Add missed 'const' keywords

Change-Id: I109a4df799a06f11381a49a32bdd7a56c4d9dff1
Reviewed-by: hjk <[email protected]>

8 files changed, 18 insertions, 19 deletions

diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp
index c0fade472df..57a0a860341 100644
--- a/src/plugins/baremetal/baremetaldebugsupport.cpp
+++ b/src/plugins/baremetal/baremetaldebugsupport.cpp
@@ -101,7 +101,7 @@ void BareMetalDebugSupport::start()
     const Target *target = runControl()->target();
     QTC_ASSERT(target, reportFailure(); return);
 
-    auto dev = qSharedPointerCast<const BareMetalDevice>(device());
+    const auto dev = qSharedPointerCast<const BareMetalDevice>(device());
     QTC_ASSERT(dev, reportFailure(); return);
     const GdbServerProvider *p = GdbServerProviderManager::findProvider(dev->gdbServerProviderId());
     QTC_ASSERT(p, reportFailure(); return);
@@ -124,7 +124,7 @@ void BareMetalDebugSupport::start()
 
     Runnable inferior;
     inferior.executable = bin;
-    if (auto aspect = runControl()->aspect<ArgumentsAspect>())
+    if (const auto aspect = runControl()->aspect<ArgumentsAspect>())
         inferior.commandLineArguments = aspect->arguments(runControl()->macroExpander());
     setInferior(inferior);
     setSymbolFile(bin);
diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index 80d920b9e0b..f262551f293 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -110,7 +110,7 @@ void BareMetalDevice::fromMap(const QVariantMap &map)
             gdbServerProvider = provider->id();
         } else {
             const QSsh::SshConnectionParameters sshParams = sshParameters();
-            auto newProvider = new DefaultGdbServerProvider;
+            const auto newProvider = new DefaultGdbServerProvider;
             newProvider->setDisplayName(name);
             newProvider->m_host = sshParams.host();
             newProvider->m_port = sshParams.port();
diff --git a/src/plugins/baremetal/defaultgdbserverprovider.cpp b/src/plugins/baremetal/defaultgdbserverprovider.cpp
index d22ee1f7939..d6f72b63204 100644
--- a/src/plugins/baremetal/defaultgdbserverprovider.cpp
+++ b/src/plugins/baremetal/defaultgdbserverprovider.cpp
@@ -155,7 +155,7 @@ bool DefaultGdbServerProviderFactory::canRestore(const QVariantMap &data) const
 GdbServerProvider *DefaultGdbServerProviderFactory::restore(const QVariantMap &data)
 {
     const auto p = new DefaultGdbServerProvider;
-    auto updated = data;
+    const auto updated = data;
     if (p->fromMap(updated))
         return p;
     delete p;
@@ -216,7 +216,7 @@ void DefaultGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<DefaultGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);
     m_initCommandsTextEdit->setPlainText(p->initCommands());
diff --git a/src/plugins/baremetal/gdbserverprovider.cpp b/src/plugins/baremetal/gdbserverprovider.cpp
index dedef56c4f0..f4ea912ba08 100644
--- a/src/plugins/baremetal/gdbserverprovider.cpp
+++ b/src/plugins/baremetal/gdbserverprovider.cpp
@@ -358,7 +358,7 @@ void GdbServerProviderConfigWidget::clearErrorMessage()
 
 void GdbServerProviderConfigWidget::setFromProvider()
 {
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     m_nameLineEdit->setText(m_provider->displayName());
     setStartupMode(m_provider->startupMode());
 }
@@ -402,7 +402,7 @@ HostWidget::HostWidget(QWidget *parent)
 
 void HostWidget::setHost(const QString &host)
 {
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     m_hostLineEdit->setText(host);
 }
 
@@ -413,7 +413,7 @@ QString HostWidget::host() const
 
 void HostWidget::setPort(const quint16 &port)
 {
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     m_portSpinBox->setValue(port);
 }
 
diff --git a/src/plugins/baremetal/gdbserverproviderchooser.cpp b/src/plugins/baremetal/gdbserverproviderchooser.cpp
index 0ab9eb2c965..d1354f71226 100644
--- a/src/plugins/baremetal/gdbserverproviderchooser.cpp
+++ b/src/plugins/baremetal/gdbserverproviderchooser.cpp
@@ -103,7 +103,7 @@ QString GdbServerProviderChooser::providerText(const GdbServerProvider *provider
 
 void GdbServerProviderChooser::populate()
 {
-    QSignalBlocker blocker(m_chooser);
+    const QSignalBlocker blocker(m_chooser);
     m_chooser->clear();
     m_chooser->addItem(tr("None"));
 
diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp
index 93763e2650e..b538ebce338 100644
--- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp
+++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp
@@ -107,7 +107,7 @@ GdbServerProviderModel::GdbServerProviderModel()
 
 GdbServerProvider *GdbServerProviderModel::provider(const QModelIndex &index) const
 {
-    if (GdbServerProviderNode *node = nodeForIndex(index))
+    if (const GdbServerProviderNode *node = nodeForIndex(index))
         return node->provider;
 
     return nullptr;
@@ -130,7 +130,7 @@ void GdbServerProviderModel::apply()
 
     // Update providers
     for (TreeItem *item : *rootItem()) {
-        auto n = static_cast<GdbServerProviderNode *>(item);
+        const auto n = static_cast<GdbServerProviderNode *>(item);
         if (!n->changed)
             continue;
 
@@ -172,7 +172,7 @@ GdbServerProviderNode *GdbServerProviderModel::findNode(const GdbServerProvider
 
 QModelIndex GdbServerProviderModel::indexForProvider(GdbServerProvider *provider) const
 {
-    GdbServerProviderNode *n = findNode(provider);
+    const GdbServerProviderNode *n = findNode(provider);
     return n ? indexForItem(n) : QModelIndex();
 }
 
@@ -342,7 +342,7 @@ void GdbServerProvidersSettingsWidget::providerSelectionChanged()
     if (w)
         w->setVisible(false);
 
-    GdbServerProviderNode *node = m_model.nodeForIndex(current);
+    const GdbServerProviderNode *node = m_model.nodeForIndex(current);
     w = node ? node->widget : nullptr;
     m_container->setWidget(w);
     m_container->setVisible(w != nullptr);
@@ -353,7 +353,7 @@ void GdbServerProvidersSettingsWidget::createProvider(GdbServerProviderFactory *
 {
     GdbServerProvider *provider = nullptr;
     if (!f) {
-        GdbServerProvider *old = m_model.provider(currentIndex());
+        const GdbServerProvider *old = m_model.provider(currentIndex());
         if (!old)
             return;
         provider = old->clone();
diff --git a/src/plugins/baremetal/openocdgdbserverprovider.cpp b/src/plugins/baremetal/openocdgdbserverprovider.cpp
index c4ef7a5f050..f97eb228395 100644
--- a/src/plugins/baremetal/openocdgdbserverprovider.cpp
+++ b/src/plugins/baremetal/openocdgdbserverprovider.cpp
@@ -234,7 +234,7 @@ bool OpenOcdGdbServerProviderFactory::canRestore(const QVariantMap &data) const
 GdbServerProvider *OpenOcdGdbServerProviderFactory::restore(const QVariantMap &data)
 {
     const auto p = new OpenOcdGdbServerProvider;
-    auto updated = data;
+    const auto updated = data;
     if (p->fromMap(updated))
         return p;
     delete p;
@@ -344,7 +344,7 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<OpenOcdGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     startupModeChanged();
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);
diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
index 7766319bb15..db3f26f40d6 100644
--- a/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
+++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.cpp
@@ -231,7 +231,7 @@ bool StLinkUtilGdbServerProviderFactory::canRestore(const QVariantMap &data) con
 GdbServerProvider *StLinkUtilGdbServerProviderFactory::restore(const QVariantMap &data)
 {
     const auto p = new StLinkUtilGdbServerProvider;
-    auto updated = data;
+    const auto updated = data;
     if (p->fromMap(updated))
         return p;
     delete p;
@@ -312,7 +312,6 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget
             this, &StLinkUtilGdbServerProviderConfigWidget::startupModeChanged);
 }
 
-
 void StLinkUtilGdbServerProviderConfigWidget::startupModeChanged()
 {
     const GdbServerProvider::StartupMode m = startupMode();
@@ -390,7 +389,7 @@ void StLinkUtilGdbServerProviderConfigWidget::setFromProvider()
     const auto p = static_cast<StLinkUtilGdbServerProvider *>(provider());
     Q_ASSERT(p);
 
-    QSignalBlocker blocker(this);
+    const QSignalBlocker blocker(this);
     startupModeChanged();
     m_hostWidget->setHost(p->m_host);
     m_hostWidget->setPort(p->m_port);