From: Antonio Rojas <arojas@archlinux.org>
Date: Sun, 29 Apr 2018 17:41:29 +0000 (+0200)
Subject: Merge branch 'Applications/18.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/05d389c56eb2b628c518b221d9ff8477227c64f0?hp=-c

Merge branch 'Applications/18.04'
---

05d389c56eb2b628c518b221d9ff8477227c64f0
diff --combined src/panels/places/placesitemmodel.cpp
index 1270d2473,3641b3e42..7e313482d
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@@ -397,10 -397,7 +397,7 @@@ void PlacesItemModel::addItemFromSource
  
      const KBookmark bookmark = m_sourceModel->bookmarkForIndex(index);
      Q_ASSERT(!bookmark.isNull());
-     PlacesItem *item = itemFromBookmark(bookmark);
-     if (!item) {
-         item = new PlacesItem(bookmark);
-     }
+     PlacesItem *item = new PlacesItem(bookmark);
      updateItem(item, index);
      insertSortedItem(item);
  
@@@ -456,7 -453,7 +453,7 @@@ void PlacesItemModel::initializeDefault
                  } else if (path == QLatin1String("/images")) {
                      props.setViewMode(DolphinView::IconsView);
                      props.setPreviewsShown(true);
 -                    props.setVisibleRoles({"text", "imageSize"});
 +                    props.setVisibleRoles({"text", "height", "width"});
                  } else if (path == QLatin1String("/audio")) {
                      props.setViewMode(DolphinView::DetailsView);
                      props.setPreviewsShown(false);
@@@ -600,8 -597,7 +597,8 @@@ void PlacesItemModel::onSourceModelData
  
  void PlacesItemModel::onSourceModelGroupHiddenChanged(KFilePlacesModel::GroupType group, bool hidden)
  {
 -    for(const QModelIndex &sourceIndex : m_sourceModel->groupIndexes(group)) {
 +    const auto groupIndexes = m_sourceModel->groupIndexes(group);
 +    for (const QModelIndex &sourceIndex : groupIndexes) {
          PlacesItem *item = placesItem(mapFromSource(sourceIndex));
          if (item) {
              item->setGroupHidden(hidden);