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

Core: Partially convert basefilewizardfactory.cpp to FilePath

Browse Source 
Change-Id: I68abf990c2125e09228598fff151cbae9910ca44
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2023-01-03 16:20:19 +01:00
parent 6b2b52937d
commit 1b43a4a1bd
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,15 +9,16 @@
#include "icontext.h" #include "icontext.h"
#include "icore.h" #include "icore.h"
#include "ifilewizardextension.h" #include "ifilewizardextension.h"
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/fileutils.h>
#include <utils/filewizardpage.h> #include <utils/filewizardpage.h>
#include <utils/mimeutils.h> #include <utils/mimeutils.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/wizard.h> #include <utils/wizard.h>
#include <QDir>
#include <QFileInfo>
#include <QDebug> #include <QDebug>
#include <QIcon> #include <QIcon>
@@ -190,7 +191,7 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge
if (debugWizard) if (debugWizard)
qDebug() << Q_FUNC_INFO << files; qDebug() << Q_FUNC_INFO << files;
QStringList existingFiles; FilePaths existingFiles;
bool oddStuffFound = false; bool oddStuffFound = false;
static const QString readOnlyMsg = tr("[read only]"); static const QString readOnlyMsg = tr("[read only]");
@@ -200,33 +201,33 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge
for (const GeneratedFile &file : std::as_const(*files)) { for (const GeneratedFile &file : std::as_const(*files)) {
const FilePath path = file.filePath(); const FilePath path = file.filePath();
if (path.exists()) if (path.exists())
existingFiles.append(path.toString()); existingFiles.append(path);
} }
if (existingFiles.isEmpty()) if (existingFiles.isEmpty())
return OverwriteOk; return OverwriteOk;
// Before prompting to overwrite existing files, loop over files and check // Before prompting to overwrite existing files, loop over files and check
// if there is anything blocking overwriting them (like them being links or folders). // if there is anything blocking overwriting them (like them being links or folders).
// Format a file list message as ( "<file1> [readonly], <file2> [folder]"). // Format a file list message as ( "<file1> [readonly], <file2> [folder]").
const QString commonExistingPath = Utils::commonPath(existingFiles); const FilePath commonExistingPath = FileUtils::commonPath(existingFiles);
const int commonPrefixLen = commonExistingPath.toUserOutput().size() + 1;
QString fileNamesMsgPart; QString fileNamesMsgPart;
for (const QString &fileName : std::as_const(existingFiles)) { for (const FilePath &filePath : std::as_const(existingFiles)) {
const QFileInfo fi(fileName); if (filePath.exists()) {
if (fi.exists()) {
if (!fileNamesMsgPart.isEmpty()) if (!fileNamesMsgPart.isEmpty())
fileNamesMsgPart += QLatin1String(", "); fileNamesMsgPart += QLatin1String(", ");
fileNamesMsgPart += QDir::toNativeSeparators(fileName.mid(commonExistingPath.size() + 1)); fileNamesMsgPart += filePath.toUserOutput().mid(commonPrefixLen);
do { do {
if (fi.isDir()) { if (filePath.isDir()) {
oddStuffFound = true; oddStuffFound = true;
fileNamesMsgPart += QLatin1Char(' ') + directoryMsg; fileNamesMsgPart += QLatin1Char(' ') + directoryMsg;
break; break;
} }
if (fi.isSymLink()) { if (filePath.isSymLink()) {
oddStuffFound = true; oddStuffFound = true;
fileNamesMsgPart += QLatin1Char(' ') + symLinkMsg; fileNamesMsgPart += QLatin1Char(' ') + symLinkMsg;
break; break;
} }
if (!fi.isWritable()) { if (!filePath.isWritableDir() && !filePath.isWritableFile()) {
oddStuffFound = true; oddStuffFound = true;
fileNamesMsgPart += QLatin1Char(' ') + readOnlyMsg; fileNamesMsgPart += QLatin1Char(' ') + readOnlyMsg;
} }
@@ -236,13 +237,13 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge
if (oddStuffFound) { if (oddStuffFound) {
*errorMessage = tr("The project directory %1 contains files which cannot be overwritten:\n%2.") *errorMessage = tr("The project directory %1 contains files which cannot be overwritten:\n%2.")
.arg(QDir::toNativeSeparators(commonExistingPath), fileNamesMsgPart); .arg(commonExistingPath.toUserOutput(), fileNamesMsgPart);
return OverwriteError; return OverwriteError;
} }
// Prompt to overwrite existing files. // Prompt to overwrite existing files.
PromptOverwriteDialog overwriteDialog; PromptOverwriteDialog overwriteDialog;
// Scripts cannot handle overwrite // Scripts cannot handle overwrite
overwriteDialog.setFiles(existingFiles); overwriteDialog.setFiles(Utils::transform(existingFiles, &FilePath::toString));
for (const GeneratedFile &file : std::as_const(*files)) for (const GeneratedFile &file : std::as_const(*files))
if (file.attributes() & GeneratedFile::CustomGeneratorAttribute) if (file.attributes() & GeneratedFile::CustomGeneratorAttribute)
overwriteDialog.setFileEnabled(file.filePath().toString(), false); overwriteDialog.setFileEnabled(file.filePath().toString(), false);