From 37b079a19ccda8eb4443214d524798ae080623b2 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 14 Apr 2020 09:54:08 +0200 Subject: [PATCH] Debugger: Some FileName cosmetics Use {from,to}Variant for settings, and one time fromUserInput is enough. Change-Id: I5774f425a4c775b0d78b87c60eabf7f48d78a082 Reviewed-by: Christian Stenger --- src/plugins/debugger/breakhandler.cpp | 2 +- src/plugins/debugger/debuggeritem.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp index e0aecca42c9..023d0120cc9 100644 --- a/src/plugins/debugger/breakhandler.cpp +++ b/src/plugins/debugger/breakhandler.cpp @@ -665,7 +665,7 @@ void BreakpointDialog::getParts(unsigned partsMask, BreakpointParameters *data) if (partsMask & FileAndLinePart) { data->lineNumber = m_lineEditLineNumber->text().toInt(); data->pathUsage = static_cast(m_comboBoxPathUsage->currentIndex()); - data->fileName = FilePath::fromUserInput(m_pathChooserFileName->filePath().toString()); + data->fileName = m_pathChooserFileName->filePath(); } if (partsMask & FunctionPart) data->functionName = m_lineEditFunction->text(); diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index bb31684a54a..a0775c2da68 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -107,8 +107,8 @@ DebuggerItem::DebuggerItem(const QVariant &id) DebuggerItem::DebuggerItem(const QVariantMap &data) { m_id = data.value(DEBUGGER_INFORMATION_ID).toString(); - m_command = FilePath::fromUserInput(data.value(DEBUGGER_INFORMATION_COMMAND).toString()); - m_workingDirectory = FilePath::fromUserInput(data.value(DEBUGGER_INFORMATION_WORKINGDIRECTORY).toString()); + m_command = FilePath::fromVariant(data.value(DEBUGGER_INFORMATION_COMMAND)); + m_workingDirectory = FilePath::fromVariant(data.value(DEBUGGER_INFORMATION_WORKINGDIRECTORY)); m_unexpandedDisplayName = data.value(DEBUGGER_INFORMATION_DISPLAYNAME).toString(); m_isAutoDetected = data.value(DEBUGGER_INFORMATION_AUTODETECTED, false).toBool(); m_version = data.value(DEBUGGER_INFORMATION_VERSION).toString(); @@ -309,8 +309,8 @@ QVariantMap DebuggerItem::toMap() const QVariantMap data; data.insert(DEBUGGER_INFORMATION_DISPLAYNAME, m_unexpandedDisplayName); data.insert(DEBUGGER_INFORMATION_ID, m_id); - data.insert(DEBUGGER_INFORMATION_COMMAND, m_command.toString()); - data.insert(DEBUGGER_INFORMATION_WORKINGDIRECTORY, m_workingDirectory.toString()); + data.insert(DEBUGGER_INFORMATION_COMMAND, m_command.toVariant()); + data.insert(DEBUGGER_INFORMATION_WORKINGDIRECTORY, m_workingDirectory.toVariant()); data.insert(DEBUGGER_INFORMATION_ENGINETYPE, int(m_engineType)); data.insert(DEBUGGER_INFORMATION_AUTODETECTED, m_isAutoDetected); data.insert(DEBUGGER_INFORMATION_VERSION, m_version);