From e757122843ecb411ec2bd01b70137427a23ce6f6 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 13 Oct 2022 22:43:30 +0300 Subject: VCS: Minor optimization in relative file resolving Change-Id: Idc7349ef7066cdc3888d0b0cfabf6b4390b8659a Reviewed-by: Jarek Kobus --- src/plugins/vcsbase/vcsbaseplugin.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/vcsbase/vcsbaseplugin.cpp') diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 689de58428..f09ad1c903 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -372,7 +372,7 @@ FilePath VcsBasePluginState::currentFileDirectory() const QString VcsBasePluginState::relativeCurrentFile() const { QTC_ASSERT(hasFile(), return {}); - return data->m_state.currentFile.relativePath(data->m_state.currentFileTopLevel).toString(); + return data->m_state.currentFile.relativeChildPath(data->m_state.currentFileTopLevel).toString(); } QString VcsBasePluginState::currentPatchFile() const @@ -403,9 +403,7 @@ FilePath VcsBasePluginState::currentProjectTopLevel() const QString VcsBasePluginState::relativeCurrentProject() const { QTC_ASSERT(hasProject(), return QString()); - if (data->m_state.currentProjectTopLevel == data->m_state.currentProjectPath) - return {}; - return data->m_state.currentProjectPath.relativePath(data->m_state.currentProjectTopLevel).toString(); + return data->m_state.currentProjectPath.relativeChildPath(data->m_state.currentProjectTopLevel).toString(); } bool VcsBasePluginState::hasTopLevel() const -- cgit v1.2.1