Debugger: Use more FilePath in source file handling

Needed for the double-remote case.

With this we have proper breakpoint markers in the text editor for a remotely
running gdb on a remotely loaded project.

Change-Id: If80e4a4108a4a0bcdd7612a59e2bd695213f5ea5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp
index 983e38adc0..4b632c0f0d 100644
--- a/src/plugins/debugger/qml/qmlinspectoragent.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp
@@ -32,6 +32,7 @@
 
 using namespace QmlDebug;
 using namespace QmlDebug::Constants;
+using namespace Utils;
 
 namespace Debugger::Internal {
 
@@ -541,8 +542,8 @@ void QmlInspectorAgent::buildDebugIdHashRecursive(const ObjectReference &ref)
         lineNum += match.captured(3).toInt() - 1;
     }
 
-    const QString filePath = m_qmlEngine->toFileInProject(fileUrl);
-    m_debugIdLocations.insert(ref.debugId(), FileReference(filePath, lineNum, colNum));
+    const FilePath filePath = m_qmlEngine->toFileInProject(fileUrl);
+    m_debugIdLocations.insert(ref.debugId(), FileReference(filePath.toFSPathString(), lineNum, colNum));
 
     const auto children = ref.children();
     for (const ObjectReference &it : children)
@@ -735,7 +736,7 @@ void QmlInspectorAgent::onShowAppOnTopChanged(bool checked)
 
 void QmlInspectorAgent::jumpToObjectDefinitionInEditor(const FileReference &objSource)
 {
-    const auto filePath = Utils::FilePath::fromString(m_qmlEngine->toFileInProject(objSource.url()));
+    const FilePath filePath = m_qmlEngine->toFileInProject(objSource.url());
     Core::EditorManager::openEditorAt({filePath, objSource.lineNumber()});
 }