Merge with branch1.2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/genericicondelegate.h b/src/genericicondelegate.h
index 8bc75e27..98605250 100644
--- a/src/genericicondelegate.h
+++ b/src/genericicondelegate.h
@@ -20,11 +20,11 @@ public:
    *                     of the view, the delegate will turn off this behaviour if the column is smaller than "compactSize"

    * @param compactSize see explanation of logicalIndex

    */

-  GenericIconDelegate(QObject *parent = NULL, int role = Qt::UserRole + 1, int logicalIndex = -1, int compactSize = 150);

+  GenericIconDelegate(QObject *parent = nullptr, int role = Qt::UserRole + 1, int logicalIndex = -1, int compactSize = 150);

 public slots:

   void columnResized(int logicalIndex, int oldSize, int newSize);

 private:

-  virtual QList<QIcon> getIcons(const QModelIndex &index) const;

+  virtual QList<QString> getIcons(const QModelIndex &index) const;

   virtual size_t getNumIcons(const QModelIndex &index) const;

 private:

   int m_Role;