Clazy fix

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

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index fb209ec5b7a11a383960f71f479f5d1c173c86a1..566c4dec2ad356d909bcbcd725cc564eb7f16231 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -345,7 +345,7 @@ void KStandardItemListWidget::paint(QPainter *painter, const QStyleOptionGraphic
         drawSiblingsInformation(painter);
     }
 
         drawSiblingsInformation(painter);
     }
 

-    auto pixmap = m_pixmap;
+    auto pixmap = isHovered() ? m_hoverPixmap : m_pixmap;

     if (!m_overlays.isEmpty()) {
         const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
 
     if (!m_overlays.isEmpty()) {
         const qreal dpr = KItemViewsUtils::devicePixelRatio(this);
 


@@ -402,7 +402,7 @@ void KStandardItemListWidget::paint(QPainter *painter, const QStyleOptionGraphic
             // Finally paint pixmap1 on the widget
             drawPixmap(painter, pixmap1);
         } else {
             // Finally paint pixmap1 on the widget
             drawPixmap(painter, pixmap1);
         } else {

-            drawPixmap(painter, m_hoverPixmap);
+            drawPixmap(painter, pixmap);

         }
     } else if (!pixmap.isNull()) {
         drawPixmap(painter, pixmap);
         }
     } else if (!pixmap.isNull()) {
         drawPixmap(painter, pixmap);


@@ -647,7 +647,7 @@ void KStandardItemListWidget::startActivateSoonAnimation(int timeUntilActivation
     m_activateSoonAnimation->setEndValue(1.0);
     m_activateSoonAnimation->setDuration(timeUntilActivation);
 
     m_activateSoonAnimation->setEndValue(1.0);
     m_activateSoonAnimation->setDuration(timeUntilActivation);
 

-    const QVariant originalIconName{data()["iconName"]};
+    const QVariant originalIconName{value("iconName")};

     connect(m_activateSoonAnimation, &QVariantAnimation::valueChanged, this, [originalIconName, this](const QVariant &value) {
         auto progress = value.toFloat();
 
     connect(m_activateSoonAnimation, &QVariantAnimation::valueChanged, this, [originalIconName, this](const QVariant &value) {
         auto progress = value.toFloat();
 


@@ -682,7 +682,7 @@ void KStandardItemListWidget::startActivateSoonAnimation(int timeUntilActivation
 
 bool KStandardItemListWidget::isIconControlledByActivateSoonAnimation() const
 {
 
 bool KStandardItemListWidget::isIconControlledByActivateSoonAnimation() const
 {

-    return m_activateSoonAnimation && data()["iconName"] == "folder-open";
+    return m_activateSoonAnimation && value("iconName") == "folder-open";

 }
 
 KItemListWidgetInformant *KStandardItemListWidget::createInformant()
 }
 
 KItemListWidgetInformant *KStandardItemListWidget::createInformant()


@@ -1121,7 +1121,6 @@ void KStandardItemListWidget::updatePixmapCache()
                 // use a generic icon as fallback
                 iconName = QStringLiteral("unknown");
             }
                 // use a generic icon as fallback
                 iconName = QStringLiteral("unknown");
             }

-            const QStringList overlays = values["iconOverlays"].toStringList();

             const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();
             m_pixmap = pixmapForIcon(iconName,
                                      QSize(maxIconWidth, maxIconHeight),
             const bool hasFocus = scene()->views()[0]->parentWidget()->hasFocus();
             m_pixmap = pixmapForIcon(iconName,
                                      QSize(maxIconWidth, maxIconHeight),