forked from qt-creator/qt-creator
StudioWelcome: use Utils::FilePath and avoid QString round‑trips
setProjectLocation() is invoked from QML and therefore keeps its QString parameter. The value is now converted only once to Utils::FilePath. No functional change. Change-Id: I1d12f1b5493c6b9be3bc8b6d9e9c7029671b80eb Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -133,7 +133,7 @@ void QdsNewDialog::setProjectName(const QString &name)
|
|||||||
|
|
||||||
void QdsNewDialog::setProjectLocation(const QString &location)
|
void QdsNewDialog::setProjectLocation(const QString &location)
|
||||||
{
|
{
|
||||||
m_qmlProjectLocation = Utils::FilePath::fromString(QDir::toNativeSeparators(location));
|
m_qmlProjectLocation = Utils::FilePath::fromString(location);
|
||||||
m_wizard.setProjectLocation(m_qmlProjectLocation);
|
m_wizard.setProjectLocation(m_qmlProjectLocation);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,8 +238,8 @@ void QdsNewDialog::onWizardCreated(QStandardItemModel *screenSizeModel, QStandar
|
|||||||
|
|
||||||
updateScreenSizes();
|
updateScreenSizes();
|
||||||
|
|
||||||
setProjectName(m_qmlProjectName);
|
m_wizard.setProjectName(m_qmlProjectName);
|
||||||
setProjectLocation(m_qmlProjectLocation.toUrlishString());
|
m_wizard.setProjectLocation(m_qmlProjectLocation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -330,12 +330,9 @@ void QdsNewDialog::setWizardFactories(QList<Core::IWizardFactory *> factories_,
|
|||||||
return; // TODO: some message box?
|
return; // TODO: some message box?
|
||||||
|
|
||||||
const Core::IWizardFactory *first = factories.front();
|
const Core::IWizardFactory *first = factories.front();
|
||||||
Utils::FilePath projectLocation = first->runPath(defaultLocation);
|
m_qmlProjectLocation = first->runPath(defaultLocation);
|
||||||
|
m_qmlProjectName = uniqueProjectName(m_qmlProjectLocation.toUrlishString());
|
||||||
m_qmlProjectName = uniqueProjectName(projectLocation.toUrlishString());
|
|
||||||
emit projectNameChanged(); // So that QML knows to update the field
|
emit projectNameChanged(); // So that QML knows to update the field
|
||||||
|
|
||||||
m_qmlProjectLocation = Utils::FilePath::fromString(QDir::toNativeSeparators(projectLocation.toUrlishString()));
|
|
||||||
emit projectLocationChanged(); // So that QML knows to update the field
|
emit projectLocationChanged(); // So that QML knows to update the field
|
||||||
|
|
||||||
/* NOTE:
|
/* NOTE:
|
||||||
|
Reference in New Issue
Block a user