forked from qt-creator/qt-creator
VCS: Fix misuses of parentDir().absolutePath()
absolutePath() *is* the parent directory. Change-Id: I59f2c4ae65b265270d432f381258b95c65e53581 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
5f4612dd07
commit
82b2b2cae9
@@ -942,7 +942,7 @@ bool BazaarPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
|
|||||||
{
|
{
|
||||||
const QFileInfo fromInfo = from.toFileInfo();
|
const QFileInfo fromInfo = from.toFileInfo();
|
||||||
const QFileInfo toInfo = to.toFileInfo();
|
const QFileInfo toInfo = to.toFileInfo();
|
||||||
return m_client.synchronousMove(from.parentDir().absoluteFilePath(),
|
return m_client.synchronousMove(from.absolutePath(),
|
||||||
fromInfo.absoluteFilePath(),
|
fromInfo.absoluteFilePath(),
|
||||||
toInfo.absoluteFilePath());
|
toInfo.absoluteFilePath());
|
||||||
}
|
}
|
||||||
|
@@ -2392,7 +2392,7 @@ IVersionControl::OpenSupportMode ClearCasePluginPrivate::openSupportMode(const F
|
|||||||
|
|
||||||
bool ClearCasePluginPrivate::vcsOpen(const FilePath &filePath)
|
bool ClearCasePluginPrivate::vcsOpen(const FilePath &filePath)
|
||||||
{
|
{
|
||||||
return vcsOpen(filePath.parentDir().absolutePath(), filePath.fileName());
|
return vcsOpen(filePath.absolutePath(), filePath.fileName());
|
||||||
}
|
}
|
||||||
|
|
||||||
IVersionControl::SettingsFlags ClearCasePluginPrivate::settingsFlags() const
|
IVersionControl::SettingsFlags ClearCasePluginPrivate::settingsFlags() const
|
||||||
@@ -2405,22 +2405,22 @@ IVersionControl::SettingsFlags ClearCasePluginPrivate::settingsFlags() const
|
|||||||
|
|
||||||
bool ClearCasePluginPrivate::vcsAdd(const FilePath &filePath)
|
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)
|
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)
|
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)
|
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
|
QString ClearCasePluginPrivate::vcsOpenText() const
|
||||||
|
@@ -1841,7 +1841,7 @@ bool GitPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
|
|||||||
{
|
{
|
||||||
const QFileInfo fromInfo = from.toFileInfo();
|
const QFileInfo fromInfo = from.toFileInfo();
|
||||||
const QFileInfo toInfo = to.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)
|
bool GitPluginPrivate::vcsCreateRepository(const FilePath &directory)
|
||||||
|
@@ -1172,7 +1172,7 @@ bool PerforcePluginPrivate::vcsMove(const FilePath &from, const FilePath &to)
|
|||||||
{
|
{
|
||||||
const QFileInfo fromInfo = from.toFileInfo();
|
const QFileInfo fromInfo = from.toFileInfo();
|
||||||
const QFileInfo toInfo = to.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 &)
|
bool PerforcePluginPrivate::vcsCreateRepository(const FilePath &)
|
||||||
|
Reference in New Issue
Block a user