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

Core: Convert promptoverwritedialog to FilePath

Browse Source 
Change-Id: I4c1fc7b8c8956f671a3beef8834fe8039333482e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-01-03 16:35:37 +01:00
parent a3d1ef4e89
commit ba42169e8a
4 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/basefilewizardfactory.cpp
View File

@@ -243,18 +243,18 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge
// Prompt to overwrite existing files.
PromptOverwriteDialog overwriteDialog;
// Scripts cannot handle overwrite
overwriteDialog.setFiles(Utils::transform(existingFiles, &FilePath::toString));
overwriteDialog.setFiles(existingFiles);
for (const GeneratedFile &file : std::as_const(*files))
if (file.attributes() & GeneratedFile::CustomGeneratorAttribute)
overwriteDialog.setFileEnabled(file.filePath().toString(), false);
overwriteDialog.setFileEnabled(file.filePath(), false);
if (overwriteDialog.exec() != QDialog::Accepted)
return OverwriteCanceled;
const QStringList existingFilesToKeep = overwriteDialog.uncheckedFiles();
const FilePaths existingFilesToKeep = overwriteDialog.uncheckedFiles();
if (existingFilesToKeep.size() == files->size()) // All exist & all unchecked->Cancel.
return OverwriteCanceled;
// Set 'keep' attribute in files
for (const QString &keepFile : std::as_const(existingFilesToKeep)) {
const int i = indexOfFile(*files, FilePath::fromString(keepFile).cleanPath());
for (const FilePath &keepFile : existingFilesToKeep) {
const int i = indexOfFile(*files, keepFile.cleanPath());
QTC_ASSERT(i != -1, return OverwriteCanceled);
GeneratedFile &file = (*files)[i];
file.setAttributes(file.attributes() | GeneratedFile::KeepExistingFileAttribute);