From 993fd2a92a9e90c9e06f161b40eb5b0201169ade Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 4 Oct 2022 13:27:02 +0200 Subject: [PATCH] VcsBasePlugin: Use FilePath::relativePath Instead of QDir::relativeFilePath(). Change-Id: Iacd25e51dc87b987402ff3677f6705c6e0e8edbf Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbaseplugin.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 509b9df6674..689de58428e 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -372,8 +372,7 @@ FilePath VcsBasePluginState::currentFileDirectory() const QString VcsBasePluginState::relativeCurrentFile() const { QTC_ASSERT(hasFile(), return {}); - return QDir(data->m_state.currentFileTopLevel.toString()).relativeFilePath( - data->m_state.currentFile.toString()); + return data->m_state.currentFile.relativePath(data->m_state.currentFileTopLevel).toString(); } QString VcsBasePluginState::currentPatchFile() const @@ -406,8 +405,7 @@ QString VcsBasePluginState::relativeCurrentProject() const QTC_ASSERT(hasProject(), return QString()); if (data->m_state.currentProjectTopLevel == data->m_state.currentProjectPath) return {}; - return QDir(data->m_state.currentProjectTopLevel.toString()).relativeFilePath( - data->m_state.currentProjectPath.toString()); + return data->m_state.currentProjectPath.relativePath(data->m_state.currentProjectTopLevel).toString(); } bool VcsBasePluginState::hasTopLevel() const