feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: FilePath-ify VcsManager::promptToAdd

Browse Source 
And adjust users a bit.

Change-Id: Idb31030b208403e88c5be0171b3ca9d4d7ded35d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2021-09-28 15:53:08 +02:00
parent b237db519b
commit 66bf957618
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -431,13 +431,13 @@ QStringList VcsManager::additionalToolsPath()
return d->m_cachedAdditionalToolsPaths;
}
void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNames)
void VcsManager::promptToAdd(const FilePath &directory, const FilePaths &filePaths)
{
IVersionControl *vc = findVersionControlForDirectory(FilePath::fromString(directory));
IVersionControl *vc = findVersionControlForDirectory(directory);
if (!vc || !vc->supportsOperation(IVersionControl::AddOperation))
return;
const FilePaths unmanagedFiles = vc->unmanagedFiles(Utils::transform(fileNames, &FilePath::fromString));
const FilePaths unmanagedFiles = vc->unmanagedFiles(filePaths);
if (unmanagedFiles.isEmpty())
return;
@@ -446,7 +446,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
if (dlg.exec() == QDialog::Accepted) {
QStringList notAddedToVc;
for (const FilePath &file : unmanagedFiles) {
if (!vc->vcsAdd(FilePath::fromString(QDir(directory).filePath(file.path()))))
if (!vc->vcsAdd(directory.resolvePath(file)))
notAddedToVc << file.toUserOutput();
}