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

Core: FilePath-ify DocumentManager

Browse Source 
And adjust users.

Change-Id: I10ca9aeb442a07f7c8d42af362b294aa3398f5c1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-09-21 06:36:32 +02:00
parent 08f3c10bf5
commit 1167f0fac7
22 changed files with 127 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/coreplugin/iwizardfactory.cpp
View File

@@ -213,7 +213,7 @@ QList<IWizardFactory*> IWizardFactory::allWizardFactories()
connect(newFactory->m_action, &QAction::triggered, newFactory, [newFactory]() {
if (!ICore::isNewItemDialogRunning()) {
QString path = newFactory->runPath(QString());
FilePath path = newFactory->runPath({});
newFactory->runWizard(path, ICore::dialogParent(), Id(), QVariantMap());
}
});
@@ -227,9 +227,9 @@ QList<IWizardFactory*> IWizardFactory::allWizardFactories()
return s_allFactories;
}
QString IWizardFactory::runPath(const QString &defaultPath) const
FilePath IWizardFactory::runPath(const FilePath &defaultPath) const
{
QString path = defaultPath;
FilePath path = defaultPath;
if (path.isEmpty()) {
switch (kind()) {
case IWizardFactory::ProjectWizard:
@@ -237,7 +237,7 @@ QString IWizardFactory::runPath(const QString &defaultPath) const
// use last visited directory of file dialog. Never start
// at current.
path = DocumentManager::useProjectsDirectory()
? DocumentManager::projectsDirectory().toString()
? DocumentManager::projectsDirectory()
: DocumentManager::fileDialogLastVisitedDirectory();
break;
default:
@@ -257,9 +257,9 @@ QString IWizardFactory::runPath(const QString &defaultPath) const
created. The wizard should fill this in its path selection elements as a
default path.
*/
Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, Id platform,
const QVariantMap &variables,
bool showWizard)
Wizard *IWizardFactory::runWizard(const FilePath &path, QWidget *parent, Id platform,
const QVariantMap &variables,
bool showWizard)
{
QTC_ASSERT(!s_isWizardRunning, return nullptr);