diff options
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/kitemlistwidget.cpp | 5 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistwidget.h | 5 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 5 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistsmoothscroller.cpp | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp index dac5ac296..baf244572 100644 --- a/src/kitemviews/kitemlistwidget.cpp +++ b/src/kitemviews/kitemlistwidget.cpp @@ -98,6 +98,11 @@ QHash<QByteArray, QVariant> KItemListWidget::data() const return m_data; } +QVariant KItemListWidget::value(const QByteArray &key) const +{ + return m_data.value(key); +} + void KItemListWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { Q_UNUSED(option) diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index e254292c0..0e07d7ab5 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -52,8 +52,6 @@ class DOLPHIN_EXPORT KItemListWidget : public QGraphicsWidget { Q_OBJECT - Q_PROPERTY(int iconSize READ iconSize WRITE setIconSize) - public: KItemListWidget(KItemListWidgetInformant *informant, QGraphicsItem *parent); ~KItemListWidget() override; @@ -63,6 +61,7 @@ public: void setData(const QHash<QByteArray, QVariant> &data, const QSet<QByteArray> &roles = QSet<QByteArray>()); QHash<QByteArray, QVariant> data() const; + QVariant value(const QByteArray &key) const; /** * Draws the hover-rectangle if the item is hovered. Overwrite this method @@ -251,8 +250,6 @@ private: void drawItemStyleOption(QPainter *painter, QWidget *widget, QStyle::State styleState); private: - Q_PROPERTY(qreal hoverOpacity READ hoverOpacity WRITE setHoverOpacity) - KItemListWidgetInformant *m_informant; int m_index; bool m_selected; diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 729411c11..566c4dec2 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -647,7 +647,7 @@ void KStandardItemListWidget::startActivateSoonAnimation(int 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(); @@ -682,7 +682,7 @@ void KStandardItemListWidget::startActivateSoonAnimation(int timeUntilActivation bool KStandardItemListWidget::isIconControlledByActivateSoonAnimation() const { - return m_activateSoonAnimation && data()["iconName"] == "folder-open"; + return m_activateSoonAnimation && value("iconName") == "folder-open"; } KItemListWidgetInformant *KStandardItemListWidget::createInformant() @@ -1121,7 +1121,6 @@ void KStandardItemListWidget::updatePixmapCache() // 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), diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp index 0e7546044..14a280e33 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.cpp +++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp @@ -29,7 +29,7 @@ KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar *scrollBar, QObject KConfigGroup configGroup(globalConfig, QStringLiteral("KDE")); updateAnimationDuration(configGroup.readEntry("SmoothScroll", true)); - QDBusConnection::sessionBus().connect(QStringLiteral(""), + QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/SmoothScroll"), QStringLiteral("org.kde.SmoothScroll"), QStringLiteral("notifyChange"), |
