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

Core: Some modernization in NewDialog

Browse Source 
Flags and some foreach.

Change-Id: I2c139905e568e76b064b3519986d63f4cf2e9b86
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-01-22 12:44:03 +01:00
parent 3a5cb65128
commit 9f29bd6c03
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/dialogs/newdialog.cpp
View File

@@ -256,10 +256,10 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
QStandardItem *projectKindItem = new QStandardItem(tr("Projects")); QStandardItem *projectKindItem = new QStandardItem(tr("Projects"));
projectKindItem->setData(IWizardFactory::ProjectWizard, Qt::UserRole); projectKindItem->setData(IWizardFactory::ProjectWizard, Qt::UserRole);
projectKindItem->setFlags(nullptr); // disable item to prevent focus projectKindItem->setFlags({}); // disable item to prevent focus
QStandardItem *filesKindItem = new QStandardItem(tr("Files and Classes")); QStandardItem *filesKindItem = new QStandardItem(tr("Files and Classes"));
filesKindItem->setData(IWizardFactory::FileWizard, Qt::UserRole); filesKindItem->setData(IWizardFactory::FileWizard, Qt::UserRole);
filesKindItem->setFlags(nullptr); // disable item to prevent focus filesKindItem->setFlags({}); // disable item to prevent focus
parentItem->appendRow(projectKindItem); parentItem->appendRow(projectKindItem);
parentItem->appendRow(filesKindItem); parentItem->appendRow(filesKindItem);
@@ -267,13 +267,13 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
if (m_dummyIcon.isNull()) if (m_dummyIcon.isNull())
m_dummyIcon = QIcon(":/utils/images/wizardicon-file.png"); m_dummyIcon = QIcon(":/utils/images/wizardicon-file.png");
QSet<Id> availablePlatforms = IWizardFactory::allAvailablePlatforms(); const QSet<Id> availablePlatforms = IWizardFactory::allAvailablePlatforms();
const bool allowAllTemplates = ICore::settings()->value(ALLOW_ALL_TEMPLATES, true).toBool(); const bool allowAllTemplates = ICore::settings()->value(ALLOW_ALL_TEMPLATES, true).toBool();
if (allowAllTemplates) if (allowAllTemplates)
m_ui->comboBox->addItem(tr("All Templates"), Id().toSetting()); m_ui->comboBox->addItem(tr("All Templates"), Id().toSetting());
foreach (Id platform, availablePlatforms) { for (Id platform : availablePlatforms) {
const QString displayNameForPlatform = IWizardFactory::displayNameForPlatform(platform); const QString displayNameForPlatform = IWizardFactory::displayNameForPlatform(platform);
m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform.toSetting()); m_ui->comboBox->addItem(tr("%1 Templates").arg(displayNameForPlatform), platform.toSetting());
} }
@@ -285,7 +285,7 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
if (!showPlatformFilter) if (!showPlatformFilter)
m_ui->comboBox->hide(); m_ui->comboBox->hide();
foreach (IWizardFactory *factory, factories) { for (IWizardFactory *factory : qAsConst(factories)) {
QStandardItem *kindItem; QStandardItem *kindItem;
switch (factory->kind()) { switch (factory->kind()) {
case IWizardFactory::ProjectWizard: case IWizardFactory::ProjectWizard:
@@ -318,7 +318,7 @@ void NewDialog::showDialog()
static_cast<PlatformFilterProxyModel*>(m_filterProxyModel)->manualReset(); static_cast<PlatformFilterProxyModel*>(m_filterProxyModel)->manualReset();
if (!lastCategory.isEmpty()) if (!lastCategory.isEmpty())
foreach (QStandardItem* item, m_categoryItems) { for (QStandardItem *item : qAsConst(m_categoryItems)) {
if (item->data(Qt::UserRole) == lastCategory) if (item->data(Qt::UserRole) == lastCategory)
idx = m_filterProxyModel->mapFromSource(m_model->indexFromItem(item)); idx = m_filterProxyModel->mapFromSource(m_model->indexFromItem(item));
} }