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

ProjectExplorer: Replace some uses of QAction::setData

Browse Source 
... by connections to lambdas.

Change-Id: I32a276146cf6a4cfc79ae9c133a4cb5f0783c867
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-03 23:43:37 +01:00
parent a8dd74c020
commit 674b798350
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/buildsettingspropertiespage.cpp
View File

@@ -186,8 +186,10 @@ void BuildSettingsWidget::updateAddButtonMenu()
return; return;
m_buildInfoList = factory->availableBuilds(m_target); m_buildInfoList = factory->availableBuilds(m_target);
foreach (BuildInfo *info, m_buildInfoList) { foreach (BuildInfo *info, m_buildInfoList) {
QAction *action = m_addButtonMenu->addAction(info->typeName, this, SLOT(createConfiguration())); QAction *action = m_addButtonMenu->addAction(info->typeName);
action->setData(QVariant::fromValue(static_cast<void *>(info))); connect(action, &QAction::triggered, this, [this, info] {
createConfiguration(info);
});
} }
} }
} }
@@ -235,10 +237,8 @@ void BuildSettingsWidget::updateActiveConfiguration()
updateBuildSettings(); updateBuildSettings();
} }
void BuildSettingsWidget::createConfiguration() void BuildSettingsWidget::createConfiguration(BuildInfo *info)
{ {
QAction *action = qobject_cast<QAction *>(sender());
BuildInfo *info = static_cast<BuildInfo *>(action->data().value<void*>());
QString originalDisplayName = info->displayName; QString originalDisplayName = info->displayName;
if (info->displayName.isEmpty()) { if (info->displayName.isEmpty()) {

2
src/plugins/projectexplorer/buildsettingspropertiespage.h
View File

@@ -64,7 +64,6 @@ private slots:
void updateBuildSettings(); void updateBuildSettings();
void currentIndexChanged(int index); void currentIndexChanged(int index);
void createConfiguration();
void cloneConfiguration(); void cloneConfiguration();
void deleteConfiguration(); void deleteConfiguration();
void renameConfiguration(); void renameConfiguration();
@@ -73,6 +72,7 @@ private slots:
void updateActiveConfiguration(); void updateActiveConfiguration();
private: private:
void createConfiguration(BuildInfo *info);
void cloneConfiguration(BuildConfiguration *toClone); void cloneConfiguration(BuildConfiguration *toClone);
void deleteConfiguration(BuildConfiguration *toDelete); void deleteConfiguration(BuildConfiguration *toDelete);
QString uniqueName(const QString &name); QString uniqueName(const QString &name);

13
src/plugins/projectexplorer/taskwindow.cpp
View File

@@ -272,7 +272,6 @@ TaskWindow::TaskWindow() : d(new TaskWindowPrivate)
d->m_categoriesMenu = new QMenu(d->m_categoriesButton); d->m_categoriesMenu = new QMenu(d->m_categoriesButton);
connect(d->m_categoriesMenu, SIGNAL(aboutToShow()), this, SLOT(updateCategoriesMenu())); connect(d->m_categoriesMenu, SIGNAL(aboutToShow()), this, SLOT(updateCategoriesMenu()));
connect(d->m_categoriesMenu, SIGNAL(triggered(QAction*)), this, SLOT(filterCategoryTriggered(QAction*)));
d->m_categoriesButton->setMenu(d->m_categoriesMenu); d->m_categoriesButton->setMenu(d->m_categoriesMenu);
@@ -523,20 +522,14 @@ void TaskWindow::updateCategoriesMenu()
QAction *action = new QAction(d->m_categoriesMenu); QAction *action = new QAction(d->m_categoriesMenu);
action->setCheckable(true); action->setCheckable(true);
action->setText(displayName); action->setText(displayName);
action->setData(categoryId.toSetting());
action->setChecked(!filteredCategories.contains(categoryId)); action->setChecked(!filteredCategories.contains(categoryId));
connect(action, &QAction::triggered, this, [this, action, categoryId] {
setCategoryVisibility(categoryId, action->isChecked());
});
d->m_categoriesMenu->addAction(action); d->m_categoriesMenu->addAction(action);
} }
} }
void TaskWindow::filterCategoryTriggered(QAction *action)
{
Core::Id categoryId = Core::Id::fromSetting(action->data());
QTC_CHECK(categoryId.uniqueIdentifier() != 0);
setCategoryVisibility(categoryId, action->isChecked());
}
int TaskWindow::taskCount(Core::Id category) const int TaskWindow::taskCount(Core::Id category) const
{ {
return d->m_model->taskCount(category); return d->m_model->taskCount(category);

1
src/plugins/projectexplorer/taskwindow.h
View File

@@ -101,7 +101,6 @@ private slots:
void actionTriggered(); void actionTriggered();
void setShowWarnings(bool); void setShowWarnings(bool);
void updateCategoriesMenu(); void updateCategoriesMenu();
void filterCategoryTriggered(QAction *action);
private: private:
int sizeHintForColumn(int column) const; int sizeHintForColumn(int column) const;