git.iko.soy/unity8
on xenial help sign in
foreach -> Q_FOREACH
ffd9bbbAlbert Astals
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+7−7
compare with xenial
unifiedsplit
@@ -203,7 +203,7 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)
203 }
203 }
204
204
205 // Cleanup the existing items
205 // Cleanup the existing items
206− foreach(ListItem *item, m_visibleItems)
206+ Q_FOREACH(ListItem *item, m_visibleItems)
207 releaseItem(item);
207 releaseItem(item);
208 m_visibleItems.clear();
208 m_visibleItems.clear();
209 m_firstVisibleIndex = -1;
209 m_firstVisibleIndex = -1;
@@ -314,7 +314,7 @@ void ListViewWithPageHeader::positionAtBeginning()
314 // TODO This could be optimized by trying to reuse the interesection
314 // TODO This could be optimized by trying to reuse the interesection
315 // of items that may end up intersecting between the existing
315 // of items that may end up intersecting between the existing
316 // m_visibleItems and the items we are creating in the next loop
316 // m_visibleItems and the items we are creating in the next loop
317− foreach(ListItem *item, m_visibleItems)
317+ Q_FOREACH(ListItem *item, m_visibleItems)
318 releaseItem(item);
318 releaseItem(item);
319 m_visibleItems.clear();
319 m_visibleItems.clear();
320 m_firstVisibleIndex = -1;
320 m_firstVisibleIndex = -1;
@@ -735,7 +735,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo
735// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
735// qDebug() << "ListViewWithPageHeader::onModelUpdated" << changeSet << reset;
736 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
736 const auto oldFirstVisibleIndex = m_firstVisibleIndex;
737
737
738− foreach(const QQuickChangeSet::Remove &remove, changeSet.removes()) {
738+ Q_FOREACH(const QQuickChangeSet::Remove &remove, changeSet.removes()) {
739// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
739// qDebug() << "ListViewWithPageHeader::onModelUpdated Remove" << remove.index << remove.count;
740 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
740 if (remove.index + remove.count > m_firstVisibleIndex && remove.index < m_firstVisibleIndex + m_visibleItems.count()) {
741 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
741 const qreal oldFirstValidIndexPos = m_visibleItems.first()->y();
@@ -785,7 +785,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo
785 }
785 }
786 }
786 }
787
787
788− foreach(const QQuickChangeSet::Insert &insert, changeSet.inserts()) {
788+ Q_FOREACH(const QQuickChangeSet::Insert &insert, changeSet.inserts()) {
789// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
789// qDebug() << "ListViewWithPageHeader::onModelUpdated Insert" << insert.index << insert.count;
790 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
790 const bool insertingInValidIndexes = insert.index > m_firstVisibleIndex && insert.index < m_firstVisibleIndex + m_visibleItems.count();
791 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
791 const bool firstItemWithViewOnTop = insert.index == 0 && m_firstVisibleIndex == 0 && m_visibleItems.first()->y() + m_clipItem->y() > contentY();
@@ -906,7 +906,7 @@ void ListViewWithPageHeader::adjustMinYExtent()
906 // Calculate the average height of items to estimate the position of the list start
906 // Calculate the average height of items to estimate the position of the list start
907 const int visibleItems = m_visibleItems.count();
907 const int visibleItems = m_visibleItems.count();
908 qreal visibleItemsHeight = 0;
908 qreal visibleItemsHeight = 0;
909− foreach(ListItem *item, m_visibleItems) {
909+ Q_FOREACH(ListItem *item, m_visibleItems) {
910 visibleItemsHeight += item->height();
910 visibleItemsHeight += item->height();
911 }
911 }
912 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
912 nonCreatedHeight = m_firstVisibleIndex * visibleItemsHeight / visibleItems;
@@ -940,7 +940,7 @@ void ListViewWithPageHeader::layout()
940// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
940// qDebug() << "ListViewWithPageHeader::layout Updating positions and heights. contentY" << contentY() << "minYExtent" << minYExtent();
941 int firstReallyVisibleItem = -1;
941 int firstReallyVisibleItem = -1;
942 int modelIndex = m_firstVisibleIndex;
942 int modelIndex = m_firstVisibleIndex;
943− foreach(ListItem *item, m_visibleItems) {
943+ Q_FOREACH(ListItem *item, m_visibleItems) {
944 const bool cull = pos + item->height() < visibleFrom || pos >= visibleTo;
944 const bool cull = pos + item->height() < visibleFrom || pos >= visibleTo;
945 item->setCulled(cull);
945 item->setCulled(cull);
946 item->setY(pos);
946 item->setY(pos);
@@ -1032,7 +1032,7 @@ void ListViewWithPageHeader::updatePolish()
1032 if (lastValidIndex != modelCount - 1) {
1032 if (lastValidIndex != modelCount - 1) {
1033 const int visibleItems = m_visibleItems.count();
1033 const int visibleItems = m_visibleItems.count();
1034 qreal visibleItemsHeight = 0;
1034 qreal visibleItemsHeight = 0;
1035− foreach(ListItem *item, m_visibleItems) {
1035+ Q_FOREACH(ListItem *item, m_visibleItems) {
1036 visibleItemsHeight += item->height();
1036 visibleItemsHeight += item->height();
1037 }
1037 }
1038 const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);
1038 const int unknownSizes = modelCount - (m_firstVisibleIndex + visibleItems);