aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2021-07-29 09:31:09 +0200
committerhjk <[email protected]>2021-07-29 13:20:23 +0000
commitedcedabed99849bd89022890b23a199ebb468ba5 (patch)
tree6f4dd9f214aac0ddc4172e6e87bb4f2e7319ceed /src/plugins/git/gitclient.cpp
parent69c6c9f7d5d585cb01ccbe6f9c7a14fc6420a3e2 (diff)
Vcs: Use FilePath in IVersionControl API
Adapt first level of users. Change-Id: Ifcd7bff45631ff3b9e26a9e3176daa6cf0cf2e56 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
-rw-r--r--src/plugins/git/gitclient.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index c1bbeec724c..f110dc198b1 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -844,14 +844,13 @@ bool GitClient::managesFile(const QString &workingDirectory, const QString &file
return proc.result() == QtcProcess::FinishedWithSuccess;
}
-QStringList GitClient::unmanagedFiles(const QStringList &filePaths) const
+FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
{
QMap<QString, QStringList> filesForDir;
- for (const QString &filePath : filePaths) {
- const FilePath fp = FilePath::fromString(filePath);
+ for (const FilePath &fp : filePaths) {
filesForDir[fp.parentDir().toString()] << fp.fileName();
}
- QStringList res;
+ FilePaths res;
for (auto it = filesForDir.begin(), end = filesForDir.end(); it != end; ++it) {
QStringList args({"ls-files", "-z"});
const QDir wd(it.key());
@@ -863,9 +862,10 @@ QStringList GitClient::unmanagedFiles(const QStringList &filePaths) const
const QStringList managedFilePaths
= transform(proc.stdOut().split('\0', Qt::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
- res += filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
+ const QStringList filtered = Utils::filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
return !managedFilePaths.contains(wd.absoluteFilePath(fp));
});
+ res += transform(filtered, &FilePath::fromString);
}
return res;
}