From 82b2b2cae98b353208a6eb39740ab7274ef752e3 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 11 Oct 2022 16:08:14 +0300
Subject: [PATCH] VCS: Fix misuses of parentDir().absolutePath()

absolutePath() *is* the parent directory.

Change-Id: I59f2c4ae65b265270d432f381258b95c65e53581
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/bazaar/bazaarplugin.cpp       |  2 +-
 src/plugins/clearcase/clearcaseplugin.cpp | 10 +++++-----
 src/plugins/git/gitplugin.cpp             |  2 +-
 src/plugins/perforce/perforceplugin.cpp   |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index cbef03141ad..0867e24f994 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -942,7 +942,7 @@ bool BazaarPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
 {
     const QFileInfo fromInfo = from.toFileInfo();
     const QFileInfo toInfo = to.toFileInfo();
-    return m_client.synchronousMove(from.parentDir().absoluteFilePath(),
+    return m_client.synchronousMove(from.absolutePath(),
                                     fromInfo.absoluteFilePath(),
                                     toInfo.absoluteFilePath());
 }
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 459ac361fbd..8f316a09c51 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -2392,7 +2392,7 @@ IVersionControl::OpenSupportMode ClearCasePluginPrivate::openSupportMode(const F
 
 bool ClearCasePluginPrivate::vcsOpen(const FilePath &filePath)
 {
-    return vcsOpen(filePath.parentDir().absolutePath(), filePath.fileName());
+    return vcsOpen(filePath.absolutePath(), filePath.fileName());
 }
 
 IVersionControl::SettingsFlags ClearCasePluginPrivate::settingsFlags() const
@@ -2405,22 +2405,22 @@ IVersionControl::SettingsFlags ClearCasePluginPrivate::settingsFlags() const
 
 bool ClearCasePluginPrivate::vcsAdd(const FilePath &filePath)
 {
-    return vcsAdd(filePath.parentDir().absolutePath(), filePath.fileName());
+    return vcsAdd(filePath.absolutePath(), filePath.fileName());
 }
 
 bool ClearCasePluginPrivate::vcsDelete(const FilePath &filePath)
 {
-    return vcsDelete(filePath.parentDir().absoluteFilePath(), filePath.fileName());
+    return vcsDelete(filePath.absoluteFilePath(), filePath.fileName());
 }
 
 bool ClearCasePluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
 {
-    return vcsMove(from.parentDir().absolutePath(), from.fileName(), to.fileName());
+    return vcsMove(from.absolutePath(), from.fileName(), to.fileName());
 }
 
 void ClearCasePluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
 {
-    vcsAnnotateHelper(filePath.parentDir().absolutePath(), filePath.fileName(), QString(), line);
+    vcsAnnotateHelper(filePath.absolutePath(), filePath.fileName(), QString(), line);
 }
 
 QString ClearCasePluginPrivate::vcsOpenText() const
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index f2e277a7552..0972ac8b36f 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1841,7 +1841,7 @@ bool GitPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
 {
     const QFileInfo fromInfo = from.toFileInfo();
     const QFileInfo toInfo = to.toFileInfo();
-    return m_gitClient.synchronousMove(from.parentDir().absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath());
+    return m_gitClient.synchronousMove(from.absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath());
 }
 
 bool GitPluginPrivate::vcsCreateRepository(const FilePath &directory)
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 15202625682..770ad3ebca5 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1172,7 +1172,7 @@ bool PerforcePluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
 {
     const QFileInfo fromInfo = from.toFileInfo();
     const QFileInfo toInfo = to.toFileInfo();
-    return vcsMove(from.parentDir().absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath());
+    return vcsMove(from.absolutePath(), fromInfo.absoluteFilePath(), toInfo.absoluteFilePath());
 }
 
 bool PerforcePluginPrivate::vcsCreateRepository(const FilePath &)