Merge branch 'master' into frameworks

[dolphin.git] / src / kitemviews / kstandarditemlistview.cpp

diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index bd4f6081fc1cb9dd8be49a0e31baab3e2177f45c..6471002c72f7a854b54d653f5248939a7861a225 100644 (file)
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,7 +19,6 @@
 
 #include "kstandarditemlistview.h"
 
 
 #include "kstandarditemlistview.h"
 

-#include <KDebug>

 #include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 #include "kstandarditemlistgroupheader.h"
 #include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 #include "kstandarditemlistgroupheader.h"


@@ -30,7 +29,7 @@ KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
 {
     setAcceptDrops(true);
     setScrollOrientation(Qt::Vertical);
 {
     setAcceptDrops(true);
     setScrollOrientation(Qt::Vertical);

-    setVisibleRoles(QList<QByteArray>() << "text");
+    setVisibleRoles({"text"});

 }
 
 KStandardItemListView::~KStandardItemListView()
 }
 
 KStandardItemListView::~KStandardItemListView()


@@ -48,23 +47,8 @@ void KStandardItemListView::setItemLayout(ItemLayout layout)
     const ItemLayout previous = m_itemLayout;
     m_itemLayout = layout;
 
     const ItemLayout previous = m_itemLayout;
     m_itemLayout = layout;
 

-    switch (layout) {
-    case IconsLayout:
-        setScrollOrientation(Qt::Vertical);
-        setSupportsItemExpanding(false);
-        break;
-    case DetailsLayout:
-        setScrollOrientation(Qt::Vertical);
-        setSupportsItemExpanding(true);
-        break;
-    case CompactLayout:
-        setScrollOrientation(Qt::Horizontal);
-        setSupportsItemExpanding(false);
-        break;
-    default:
-        Q_ASSERT(false);
-        break;
-    }
+    setSupportsItemExpanding(itemLayoutSupportsItemExpanding(layout));
+    setScrollOrientation(layout == CompactLayout ? Qt::Horizontal : Qt::Vertical);

 
     onItemLayoutChanged(layout, previous);
 
 
     onItemLayoutChanged(layout, previous);
 


@@ -117,6 +101,11 @@ bool KStandardItemListView::itemSizeHintUpdateRequired(const QSet<QByteArray>& c
     return false;
 }
 
     return false;
 }
 

+bool KStandardItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) const
+{
+    return layout == DetailsLayout;
+}
+

 void KStandardItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {
     Q_UNUSED(current);
 void KStandardItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {
     Q_UNUSED(current);


@@ -189,4 +178,3 @@ void KStandardItemListView::updateLayoutOfVisibleItems()
     }
 }
 
     }
 }
 

-#include "kstandarditemlistview.moc"