From 50fec438169919d9809835680aee36fadb5af225 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Wed, 27 Nov 2019 15:46:11 +0300 Subject: [PATCH] BareMetal: Replace name of GDB_PROVIDERS_SETTINGS_ID constant ... with the DEBUG_SERVER_PROVIDERS_SETTINGS_ID name. Reason is that this identifier includes not only the GDB providers, it includes all possible provider types. Change-Id: If545826aaf1606d33d4fec55653cd6e3ba2c5d61 Reviewed-by: hjk --- src/plugins/baremetal/baremetalconstants.h | 2 +- src/plugins/baremetal/debugserverproviderchooser.cpp | 2 +- src/plugins/baremetal/debugserverproviderssettingspage.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/baremetal/baremetalconstants.h b/src/plugins/baremetal/baremetalconstants.h index 5c49ba9f59b..8fa2768007f 100644 --- a/src/plugins/baremetal/baremetalconstants.h +++ b/src/plugins/baremetal/baremetalconstants.h @@ -34,7 +34,7 @@ const char BareMetalOsType[] = "BareMetalOsType"; const char ACTION_ID[] = "BareMetal.Action"; const char MENU_ID[] = "BareMetal.Menu"; -const char GDB_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.GdbServerProvidersOptions"; +const char DEBUG_SERVER_PROVIDERS_SETTINGS_ID[] = "EE.BareMetal.DebugServerProvidersOptions"; // Debugger Server Provider Ids const char OPENOCD_PROVIDER_ID[] = "BareMetal.GdbServerProvider.OpenOcd"; diff --git a/src/plugins/baremetal/debugserverproviderchooser.cpp b/src/plugins/baremetal/debugserverproviderchooser.cpp index de1f5c845d9..0f8ecd2a2d2 100644 --- a/src/plugins/baremetal/debugserverproviderchooser.cpp +++ b/src/plugins/baremetal/debugserverproviderchooser.cpp @@ -82,7 +82,7 @@ void DebugServerProviderChooser::setCurrentProviderId(const QString &id) void DebugServerProviderChooser::manageButtonClicked() { - Core::ICore::showOptionsDialog(Constants::GDB_PROVIDERS_SETTINGS_ID, this); + Core::ICore::showOptionsDialog(Constants::DEBUG_SERVER_PROVIDERS_SETTINGS_ID, this); } void DebugServerProviderChooser::currentIndexChanged(int index) diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp index c26b290a32b..32de0ccb5f3 100644 --- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp @@ -447,7 +447,7 @@ QModelIndex DebugServerProvidersSettingsWidget::currentIndex() const DebugServerProvidersSettingsPage::DebugServerProvidersSettingsPage() { - setId(Constants::GDB_PROVIDERS_SETTINGS_ID); + setId(Constants::DEBUG_SERVER_PROVIDERS_SETTINGS_ID); setDisplayName(tr("Bare Metal")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); }