From b5e935948afe4b28833b9afaa712f461341c59b3 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 10 Nov 2021 16:34:48 +0100 Subject: [PATCH] BareMetal: Use more FilePath in OpenOcdGdbServerProvider Change-Id: Ie3eee9aa6765e2fb3d634ee7a6309edcf6ef9e1f Reviewed-by: Christian Stenger --- .../gdb/openocdgdbserverprovider.cpp | 20 +++++++++---------- .../gdb/openocdgdbserverprovider.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 7ac79e4aa7d..8d6431e0fc8 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -110,10 +110,10 @@ CommandLine OpenOcdGdbServerProvider::command() const cmd.addArg("gdb_port " + QString::number(channel().port())); if (!m_rootScriptsDir.isEmpty()) - cmd.addArgs({"-s", m_rootScriptsDir}); + cmd.addArgs({"-s", m_rootScriptsDir.path()}); if (!m_configurationFile.isEmpty()) - cmd.addArgs({"-f", m_configurationFile}); + cmd.addArgs({"-f", m_configurationFile.path()}); if (!m_additionalArguments.isEmpty()) cmd.addArgs(m_additionalArguments, CommandLine::Raw); @@ -151,8 +151,8 @@ QVariantMap OpenOcdGdbServerProvider::toMap() const { QVariantMap data = GdbServerProvider::toMap(); data.insert(executableFileKeyC, m_executableFile.toVariant()); - data.insert(rootScriptsDirKeyC, m_rootScriptsDir); - data.insert(configurationFileKeyC, m_configurationFile); + data.insert(rootScriptsDirKeyC, m_rootScriptsDir.toVariant()); + data.insert(configurationFileKeyC, m_configurationFile.toVariant()); data.insert(additionalArgumentsKeyC, m_additionalArguments); return data; } @@ -163,8 +163,8 @@ bool OpenOcdGdbServerProvider::fromMap(const QVariantMap &data) return false; m_executableFile = FilePath::fromVariant(data.value(executableFileKeyC)); - m_rootScriptsDir = data.value(rootScriptsDirKeyC).toString(); - m_configurationFile = data.value(configurationFileKeyC).toString(); + m_rootScriptsDir = FilePath::fromVariant(data.value(rootScriptsDirKeyC)); + m_configurationFile = FilePath::fromVariant(data.value(configurationFileKeyC)); m_additionalArguments = data.value(additionalArgumentsKeyC).toString(); return true; } @@ -258,8 +258,8 @@ void OpenOcdGdbServerProviderConfigWidget::apply() p->setChannel(m_hostWidget->channel()); p->m_executableFile = m_executableFileChooser->filePath(); - p->m_rootScriptsDir = m_rootScriptsDirChooser->filePath().toString(); - p->m_configurationFile = m_configurationFileChooser->filePath().toString(); + p->m_rootScriptsDir = m_rootScriptsDirChooser->filePath(); + p->m_configurationFile = m_configurationFileChooser->filePath(); p->m_additionalArguments = m_additionalArgumentsLineEdit->text(); p->setInitCommands(m_initCommandsTextEdit->toPlainText()); p->setResetCommands(m_resetCommandsTextEdit->toPlainText()); @@ -289,8 +289,8 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider() startupModeChanged(); m_hostWidget->setChannel(p->channel()); m_executableFileChooser->setFilePath(p->m_executableFile); - m_rootScriptsDirChooser->setFilePath(Utils::FilePath::fromString(p->m_rootScriptsDir)); - m_configurationFileChooser->setFilePath(Utils::FilePath::fromString(p->m_configurationFile)); + m_rootScriptsDirChooser->setFilePath(p->m_rootScriptsDir); + m_configurationFileChooser->setFilePath(p->m_configurationFile); m_additionalArgumentsLineEdit->setText(p->m_additionalArguments); m_initCommandsTextEdit->setPlainText(p->initCommands()); m_resetCommandsTextEdit->setPlainText(p->resetCommands()); diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h index 41e03f688aa..96d7c3e4428 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h @@ -59,8 +59,8 @@ private: static QString defaultResetCommands(); Utils::FilePath m_executableFile = "openocd"; - QString m_rootScriptsDir; - QString m_configurationFile; + Utils::FilePath m_rootScriptsDir; + Utils::FilePath m_configurationFile; QString m_additionalArguments; friend class OpenOcdGdbServerProviderConfigWidget;