Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 135cd0b7df0102e698cbde8155fb4a19d4206861..097f681c57243591b24af460a7107a30f8d1f765 100644 (file)
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,10 +19,9 @@
 
 #include "kstandarditemlistview.h"
 
 
 #include "kstandarditemlistview.h"
 

-#include <KDebug>
-#include <KIconLoader>

 #include "kstandarditemlistwidget.h"
 #include "kstandarditemlistwidget.h"

-#include "kstandarditemlistgroupheader.h"
+
+#include <KIconLoader>

 
 KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
     KItemListView(parent),
 
 KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
     KItemListView(parent),


@@ -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()


@@ -109,21 +108,21 @@ bool KStandardItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) c
 
 void KStandardItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {
 
 void KStandardItemListView::onItemLayoutChanged(ItemLayout current, ItemLayout previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

     updateLayoutOfVisibleItems();
 }
 
 void KStandardItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {
     updateLayoutOfVisibleItems();
 }
 
 void KStandardItemListView::onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous)
 {

-    Q_UNUSED(current);
-    Q_UNUSED(previous);
+    Q_UNUSED(current)
+    Q_UNUSED(previous)

     updateLayoutOfVisibleItems();
 }
 
 void KStandardItemListView::onSupportsItemExpandingChanged(bool supportsExpanding)
 {
     updateLayoutOfVisibleItems();
 }
 
 void KStandardItemListView::onSupportsItemExpandingChanged(bool supportsExpanding)
 {

-    Q_UNUSED(supportsExpanding);
+    Q_UNUSED(supportsExpanding)

     updateLayoutOfVisibleItems();
 }
 
     updateLayoutOfVisibleItems();
 }
 


@@ -147,27 +146,20 @@ void KStandardItemListView::applyDefaultStyleOption(int iconSize,
 {
     KItemListStyleOption option = styleOption();
 
 {
     KItemListStyleOption option = styleOption();
 

-    bool changed = false;

     if (option.iconSize < 0) {
         option.iconSize = iconSize;
     if (option.iconSize < 0) {
         option.iconSize = iconSize;

-        changed = true;

     }
     if (option.padding < 0) {
         option.padding = padding;
     }
     if (option.padding < 0) {
         option.padding = padding;

-        changed = true;

     }
     if (option.horizontalMargin < 0) {
         option.horizontalMargin = horizontalMargin;
     }
     if (option.horizontalMargin < 0) {
         option.horizontalMargin = horizontalMargin;

-        changed = true;

     }
     if (option.verticalMargin < 0) {
         option.verticalMargin = verticalMargin;
     }
     if (option.verticalMargin < 0) {
         option.verticalMargin = verticalMargin;

-        changed = true;

     }
 
     }
 

-    if (changed) {
-        setStyleOption(option);
-    }
+    setStyleOption(option);

 }
 
 void KStandardItemListView::updateLayoutOfVisibleItems()
 }
 
 void KStandardItemListView::updateLayoutOfVisibleItems()


@@ -179,4 +171,3 @@ void KStandardItemListView::updateLayoutOfVisibleItems()
     }
 }
 
     }
 }
 

-#include "kstandarditemlistview.moc"