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

Vcs: Proliferate FilePath a bit further

Browse Source 
Change-Id: I8490917bf0bde59b1cef2509ec14c3ca985fa43d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2022-11-09 15:19:13 +01:00
parent 9c69a63b3b
commit 30312cc74a
12 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -328,9 +328,9 @@ Core::IDocument *VcsBaseSubmitEditor::document() const
return &d->m_file;
}
QString VcsBaseSubmitEditor::checkScriptWorkingDirectory() const
FilePath VcsBaseSubmitEditor::checkScriptWorkingDirectory() const
{
return d->m_checkScriptWorkingDirectory.toString();
return d->m_checkScriptWorkingDirectory;
}
void VcsBaseSubmitEditor::setCheckScriptWorkingDirectory(const FilePath &s)
@@ -380,8 +380,7 @@ static QSet<FilePath> filesFromModel(SubmitFileModel *model)
QSet<FilePath> result;
result.reserve(model->rowCount());
for (int row = 0; row < model->rowCount(); ++row) {
result.insert(FilePath::fromString(
QFileInfo(model->repositoryRoot(), model->file(row)).absoluteFilePath()));
result.insert(model->repositoryRoot().resolvePath(model->file(row)).absoluteFilePath());
}
return result;
}
@@ -628,13 +627,12 @@ QIcon VcsBaseSubmitEditor::submitIcon()
// Reduce a list of untracked files reported by a VCS down to the files
// that are actually part of the current project(s).
void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const QString &repositoryDirectory,
void VcsBaseSubmitEditor::filterUntrackedFilesOfProject(const FilePath &repositoryDirectory,
QStringList *untrackedFiles)
{
const QDir repoDir(repositoryDirectory);
for (QStringList::iterator it = untrackedFiles->begin(); it != untrackedFiles->end(); ) {
const QString path = repoDir.absoluteFilePath(*it);
if (ProjectExplorer::SessionManager::projectForFile(FilePath::fromString(path)))
const FilePath path = repositoryDirectory.resolvePath(*it).absoluteFilePath();
if (ProjectExplorer::SessionManager::projectForFile(path))
++it;
else
it = untrackedFiles->erase(it);