diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index 9fd605a6c5f..6bb5ca9190e 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -343,12 +343,12 @@ void ICore::showNewItemDialog(const QString &title, { QTC_ASSERT(!isNewItemDialogRunning(), return); auto newDialog = new NewDialog(dialogParent()); - connect(newDialog, &QObject::destroyed, m_instance, &ICore::validateNewDialogIsRunning); + connect(newDialog, &QObject::destroyed, m_instance, &ICore::validateNewItemDialogIsRunning); newDialog->setWizardFactories(factories, defaultLocation, extraVariables); newDialog->setWindowTitle(title); newDialog->showDialog(); - validateNewDialogIsRunning(); + validateNewItemDialogIsRunning(); } bool ICore::showOptionsDialog(const Id page, QWidget *parent) @@ -571,7 +571,7 @@ void ICore::saveSettings() ICore::settings(QSettings::UserScope)->sync(); } -void ICore::validateNewDialogIsRunning() +void ICore::validateNewItemDialogIsRunning() { static bool wasRunning = false; if (wasRunning == isNewItemDialogRunning()) diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 067e475f8d2..783753ebb78 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -140,7 +140,7 @@ signals: void themeChanged(); private: - static void validateNewDialogIsRunning(); + static void validateNewItemDialogIsRunning(); static void newItemDialogOpened(); static void newItemDialogClosed(); }; diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp index 0c5033c0a5d..d9fbf599e05 100644 --- a/src/plugins/coreplugin/iwizardfactory.cpp +++ b/src/plugins/coreplugin/iwizardfactory.cpp @@ -250,7 +250,7 @@ QString IWizardFactory::runPath(const QString &defaultPath) Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &variables) { s_isWizardRunning = true; - ICore::validateNewDialogIsRunning(); + ICore::validateNewItemDialogIsRunning(); Utils::Wizard *wizard = runWizardImpl(path, parent, platform, variables); @@ -262,7 +262,7 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, c connect(wizard, &Utils::Wizard::finished, [wizard]() { s_isWizardRunning = false; s_inspectWizardAction->setEnabled(false); - ICore::validateNewDialogIsRunning(); + ICore::validateNewItemDialogIsRunning(); wizard->deleteLater(); }); s_inspectWizardAction->setEnabled(true); @@ -270,7 +270,7 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, c Core::ICore::registerWindow(wizard, Core::Context("Core.NewWizard")); } else { s_isWizardRunning = false; - ICore::validateNewDialogIsRunning(); + ICore::validateNewItemDialogIsRunning(); } return wizard; }