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

Use FilePath in several file wizards

Browse Source 
Change-Id: I9bab9d602096a3872f73fb16d901b8aedcd82516
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-09-27 18:06:38 +02:00
parent 324105febe
commit 4bbab39467
27 changed files with 153 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,11 +86,11 @@ Utils::Wizard *BaseFileWizardFactory::runWizardImpl(const FilePath &path, QWidge
if (flags().testFlag(ForceCapitalLetterForFileName))
dialogParameterFlags |= WizardDialogParameters::ForceCapitalLetterForFileName;
Utils::Wizard *wizard = create(parent, WizardDialogParameters(path.toString(),
platform,
requiredFeatures(),
dialogParameterFlags,
extraValues));
Wizard *wizard = create(parent, WizardDialogParameters(path,
platform,
requiredFeatures(),
dialogParameterFlags,
extraValues));
QTC_CHECK(wizard);
return wizard;
}
@@ -287,21 +287,17 @@ BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(Ge
\a baseName already has one.
*/
QString BaseFileWizardFactory::buildFileName(const QString &path,
const QString &baseName,
const QString &extension)
FilePath BaseFileWizardFactory::buildFileName(const FilePath &path,
const QString &baseName,
const QString &extension)
{
QString rc = path;
const QChar slash = QLatin1Char('/');
if (!rc.isEmpty() && !rc.endsWith(slash))
rc += slash;
rc += baseName;
FilePath rc = path.pathAppended(baseName);
// Add extension unless user specified something else
const QChar dot = QLatin1Char('.');
const QChar dot = '.';
if (!extension.isEmpty() && !baseName.contains(dot)) {
if (!extension.startsWith(dot))
rc += dot;
rc += extension;
rc = rc.stringAppended(dot);
rc = rc.stringAppended(extension);
}
if (debugWizard)
qDebug() << Q_FUNC_INFO << rc;