Merge with branch1.2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/modflagicondelegate.h b/src/modflagicondelegate.h
index cc652c06..b31a250b 100644
--- a/src/modflagicondelegate.h
+++ b/src/modflagicondelegate.h
@@ -9,10 +9,10 @@ public:
   explicit ModFlagIconDelegate(QObject *parent = 0);

   virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;

 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;

 

-  QIcon getFlagIcon(ModInfo::EFlag flag) const;

+  QString getFlagIcon(ModInfo::EFlag flag) const;

 private:

   static ModInfo::EFlag m_ConflictFlags[4];

 };