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

Make BaseFileWizard async

Browse Source 
The side-effect is that WizardEventLoop can go!

Change-Id: I0eae0e0fa91a48e2a5010b47cc0de86758969904
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-29 17:25:40 +02:00
parent 9d0c39768f
commit 093a54cbb8
32 changed files with 287 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp
View File

@@ -57,10 +57,8 @@ CustomWidgetWizard::CustomWidgetWizard()
Core::BaseFileWizard *CustomWidgetWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
{
CustomWidgetWizardDialog *rc = new CustomWidgetWizardDialog(displayName(),
icon(),
parent,
parameters);
CustomWidgetWizardDialog *rc = new CustomWidgetWizardDialog(this, displayName(),
icon(), parent, parameters);
rc->setProjectName(CustomWidgetWizardDialog::uniqueProjectName(parameters.defaultPath()));
rc->setFileNamingParameters(FileNamingParameters(headerSuffix(), sourceSuffix(), QtWizard::lowerCaseFiles()));
return rc;

10
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp
View File

@@ -42,11 +42,11 @@ namespace Internal {
enum { IntroPageId = 0};
CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
const QIcon &icon,
QWidget *parent,
CustomWidgetWizardDialog::CustomWidgetWizardDialog(const Core::BaseFileWizardFactory *factory,
const QString &templateName,
const QIcon &icon, QWidget *parent,
const Core::WizardDialogParameters &parameters) :
BaseQmakeProjectWizardDialog(false, parent, parameters),
BaseQmakeProjectWizardDialog(factory, false, parent, parameters),
m_widgetsPage(new CustomWidgetWidgetsWizardPage),
m_pluginPage(new CustomWidgetPluginWizardPage)
{
@@ -61,7 +61,7 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const QString &templateName,
addPage(m_widgetsPage);
m_pluginPageId = addPage(m_pluginPage);
addExtensionPages(parameters.extensionPages());
addExtensionPages(extensionPages());
connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotCurrentIdChanged(int)));
}

4
src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h
View File

@@ -47,8 +47,8 @@ class CustomWidgetWizardDialog : public BaseQmakeProjectWizardDialog
{
Q_OBJECT
public:
explicit CustomWidgetWizardDialog(const QString &templateName,
const QIcon &icon,
explicit CustomWidgetWizardDialog(const Core::BaseFileWizardFactory *factory,
const QString &templateName, const QIcon &icon,
QWidget *parent,
const Core::WizardDialogParameters &parameters);