kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 12:40:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r4900

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4902 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-02-05 16:18:50 +00:00
parent e233d7ad77
commit 41659fa6fd
98 changed files with 606 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/elementspanel.cpp
View File

@@ -238,7 +238,7 @@ void ElementsPanel::reload(bool reload_collections) {
if (first_reload_) custom_tbt_collection_item_ -> setExpanded(true);
// add projects
for (QETProject *project: projects_to_display_.values()) {
foreach(QETProject *project, projects_to_display_.values()) {
addProject(project);
}
@@ -321,7 +321,7 @@ void ElementsPanel::filter(const QString &m, QET::Filtering filtering) {
const int expanded_role = 42; // magic number? So you consider Douglas Adams wrote about magic?
if (filtering == QET::BeginFilter) {
for (QTreeWidgetItem *item: items) {
foreach (QTreeWidgetItem *item, items) {
item -> setData(0, expanded_role, item -> isExpanded());
}
}
@@ -334,7 +334,7 @@ void ElementsPanel::filter(const QString &m, QET::Filtering filtering) {
QTreeWidgetItem *current_item = currentItem();
// restore the tree as it was before the filtering
for (QTreeWidgetItem *qtwi: items) {
foreach (QTreeWidgetItem *qtwi, items) {
qtwi -> setHidden(false);
qtwi -> setExpanded(qtwi -> data(0, expanded_role).toBool());
}
@@ -377,7 +377,7 @@ void ElementsPanel::buildFilterList() {
filter_list_ = filter_.split( '+' );
/*
qDebug() << "*******************";
for ( QString filter , filter_list_ ) {
foreach( QString filter , filter_list_ ) {
filter = filter.trimmed();
qDebug() << filter;
}
@@ -392,10 +392,10 @@ void ElementsPanel::applyCurrentFilter(const QList<QTreeWidgetItem *> &items) {
buildFilterList();
QList<QTreeWidgetItem *> matching_items;
for (QTreeWidgetItem *item: items) {
foreach (QTreeWidgetItem *item, items) {
bool item_matches = true;
for ( QString filter : filter_list_ ) {
foreach( QString filter , filter_list_ ) {
filter = filter.trimmed();
if ( !filter.isEmpty() ) {
item_matches &= matchesFilter(item, filter);
@@ -414,19 +414,19 @@ void ElementsPanel::applyCurrentFilter(const QList<QTreeWidgetItem *> &items) {
void ElementsPanel::ensureHierarchyIsVisible(const QList<QTreeWidgetItem *> &items) {
// remonte l'arborescence pour lister les categories contenant les elements filtres
QSet<QTreeWidgetItem *> parent_items;
for (QTreeWidgetItem *item: items) {
foreach(QTreeWidgetItem *item, items) {
for (QTreeWidgetItem *parent_qtwi = item -> parent() ; parent_qtwi ; parent_qtwi = parent_qtwi -> parent()) {
parent_items << parent_qtwi;
}
}
// etend les parents
for (QTreeWidgetItem *parent_qtwi: parent_items) {
foreach(QTreeWidgetItem *parent_qtwi, parent_items) {
if (!parent_qtwi -> isExpanded()) parent_qtwi -> setExpanded(true);
}
// affiche les parents
for (QTreeWidgetItem *parent_qtwi: parent_items) {
foreach(QTreeWidgetItem *parent_qtwi, parent_items) {
if (parent_qtwi -> isHidden()) parent_qtwi -> setHidden(false);
}
}