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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp

Change-Id: I1ba32d76f151df16f70e930cc713525017e3dd92
This commit is contained in:
Eike Ziller
2023-07-21 11:57:09 +02:00
parent eb5e258d96 be94484434
commit c9505c4412
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/taskmodel.h
View File

@@ -118,8 +118,12 @@ public:
bool filterIncludesErrors() const { return m_includeErrors; } bool filterIncludesErrors() const { return m_includeErrors; }
void setFilterIncludesErrors(bool b) { m_includeErrors = b; invalidateFilter(); } void setFilterIncludesErrors(bool b) { m_includeErrors = b; invalidateFilter(); }
QList<Utils::Id> filteredCategories() const { return m_categoryIds; } QSet<Utils::Id> filteredCategories() const { return m_categoryIds; }
void setFilteredCategories(const QList<Utils::Id> &categoryIds) { m_categoryIds = categoryIds; invalidateFilter(); } void setFilteredCategories(const QSet<Utils::Id> &categoryIds)
{
m_categoryIds = categoryIds;
invalidateFilter();
}
Task task(const QModelIndex &index) const { return taskModel()->task(mapToSource(index)); } Task task(const QModelIndex &index) const { return taskModel()->task(mapToSource(index)); }
Tasks tasks(const QModelIndexList &indexes) const; Tasks tasks(const QModelIndexList &indexes) const;
@@ -145,7 +149,7 @@ private:
bool m_filterStringIsRegexp = false; bool m_filterStringIsRegexp = false;
bool m_filterIsInverted = false; bool m_filterIsInverted = false;
Qt::CaseSensitivity m_filterCaseSensitivity = Qt::CaseInsensitive; Qt::CaseSensitivity m_filterCaseSensitivity = Qt::CaseInsensitive;
QList<Utils::Id> m_categoryIds; QSet<Utils::Id> m_categoryIds;
QString m_filterText; QString m_filterText;
QRegularExpression m_filterRegexp; QRegularExpression m_filterRegexp;
}; };

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

@@ -329,19 +329,20 @@ void TaskWindow::setCategoryVisibility(Id categoryId, bool visible)
if (!categoryId.isValid()) if (!categoryId.isValid())
return; return;
QList<Id> categories = d->m_filter->filteredCategories(); QSet<Id> categories = d->m_filter->filteredCategories();
if (visible) if (visible)
categories.removeOne(categoryId); categories.remove(categoryId);
else else
categories.append(categoryId); categories.insert(categoryId);
d->m_filter->setFilteredCategories(categories); d->m_filter->setFilteredCategories(categories);
} }
void TaskWindow::saveSettings() void TaskWindow::saveSettings()
{ {
QStringList categories = Utils::transform(d->m_filter->filteredCategories(), &Id::toString); const QStringList categories = Utils::toList(
Utils::transform(d->m_filter->filteredCategories(), &Id::toString));
SessionManager::setValue(QLatin1String(SESSION_FILTER_CATEGORIES), categories); SessionManager::setValue(QLatin1String(SESSION_FILTER_CATEGORIES), categories);
SessionManager::setValue(QLatin1String(SESSION_FILTER_WARNINGS), d->m_filter->filterIncludesWarnings()); SessionManager::setValue(QLatin1String(SESSION_FILTER_WARNINGS), d->m_filter->filterIncludesWarnings());
} }
@@ -350,7 +351,8 @@ void TaskWindow::loadSettings()
{ {
QVariant value = SessionManager::value(QLatin1String(SESSION_FILTER_CATEGORIES)); QVariant value = SessionManager::value(QLatin1String(SESSION_FILTER_CATEGORIES));
if (value.isValid()) { if (value.isValid()) {
QList<Id> categories = Utils::transform(value.toStringList(), &Id::fromString); const QSet<Id> categories = Utils::toSet(
Utils::transform(value.toStringList(), &Id::fromString));
d->m_filter->setFilteredCategories(categories); d->m_filter->setFilteredCategories(categories);
} }
value = SessionManager::value(QLatin1String(SESSION_FILTER_WARNINGS)); value = SessionManager::value(QLatin1String(SESSION_FILTER_WARNINGS));
@@ -371,8 +373,8 @@ void TaskWindow::addCategory(const TaskCategory &category)
{ {
d->m_model->addCategory(category); d->m_model->addCategory(category);
if (!category.visible) { if (!category.visible) {
QList<Id> filters = d->m_filter->filteredCategories(); QSet<Id> filters = d->m_filter->filteredCategories();
filters += category.id; filters.insert(category.id);
d->m_filter->setFilteredCategories(filters); d->m_filter->setFilteredCategories(filters);
} }
} }
@@ -469,7 +471,7 @@ void TaskWindow::updateCategoriesMenu()
{ {
d->m_categoriesMenu->clear(); d->m_categoriesMenu->clear();
const QList<Id> filteredCategories = d->m_filter->filteredCategories(); const QSet<Id> filteredCategories = d->m_filter->filteredCategories();
const QList<TaskCategory> categories = Utils::sorted(d->m_model->categories(), const QList<TaskCategory> categories = Utils::sorted(d->m_model->categories(),
&TaskCategory::displayName); &TaskCategory::displayName);