Merge branch 'Applications/16.04'

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

diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index 826452255d73784b3a7f0443fe7a2a676d2f553b..e6ba4bb3f6d3d2098bdd4d86643be47d4a45251c 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -104,7 +104,7 @@ public:
     void setSupportsItemExpanding(bool supportsItemExpanding);
     bool supportsItemExpanding() const;
 
     void setSupportsItemExpanding(bool supportsItemExpanding);
     bool supportsItemExpanding() const;
 

-    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+    virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override;

 
     virtual QRectF iconRect() const Q_DECL_OVERRIDE;
     virtual QRectF textRect() const Q_DECL_OVERRIDE;
 
     virtual QRectF iconRect() const Q_DECL_OVERRIDE;
     virtual QRectF textRect() const Q_DECL_OVERRIDE;


@@ -183,6 +183,7 @@ protected:
     virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
     virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
     virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
     virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE;
     virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
     virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;

+    bool event(QEvent *event) Q_DECL_OVERRIDE;

 
 private slots:
     void slotCutItemsChanged();
 
 private slots:
     void slotCutItemsChanged();


@@ -212,7 +213,7 @@ private:
      */
     void closeRoleEditor();
 
      */
     void closeRoleEditor();
 

-    static QPixmap pixmapForIcon(const QString& name, const QStringList& overlays, int size);
+    static QPixmap pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode);

 
     /**
      * @return Preferred size of the rating-image based on the given
 
     /**
      * @return Preferred size of the rating-image based on the given


@@ -242,7 +243,7 @@ private:
     Layout m_layout;
     QPointF m_pixmapPos;
     QPixmap m_pixmap;
     Layout m_layout;
     QPointF m_pixmapPos;
     QPixmap m_pixmap;

-    QSize m_scaledPixmapSize;
+    QSize m_scaledPixmapSize; //Size of the pixmap in device independent pixels

 
     QRectF m_iconRect;          // Cache for KItemListWidget::iconRect()
     QPixmap m_hoverPixmap;      // Cache for modified m_pixmap when hovering the item
 
     QRectF m_iconRect;          // Cache for KItemListWidget::iconRect()
     QPixmap m_hoverPixmap;      // Cache for modified m_pixmap when hovering the item