Merge pull request #954 from ModOrganizer2/Develop

Stage for release 2.2.2

1 files changed, 7 insertions, 8 deletions

diff --git a/src/modflagicondelegate.h b/src/modflagicondelegate.h
index eb6a76ab..ecab7e95 100644
--- a/src/modflagicondelegate.h
+++ b/src/modflagicondelegate.h
@@ -5,26 +5,25 @@
 

 class ModFlagIconDelegate : public IconDelegate

 {

-Q_OBJECT

+  Q_OBJECT;

 

 public:

   explicit ModFlagIconDelegate(QObject *parent = 0, int logicalIndex = -1, int compactSize = 120);

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

 

+  static QList<QString> getIconsForFlags(

+    std::vector<ModInfo::EFlag> flags, bool compact);

+

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

+

 public slots:

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

 

-private:

+protected:

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

   virtual size_t getNumIcons(const QModelIndex &index) const;

 

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

-

 private:

-  static ModInfo::EFlag m_ConflictFlags[4];

-  static ModInfo::EFlag m_ArchiveLooseConflictFlags[2];

-  static ModInfo::EFlag m_ArchiveConflictFlags[3];

-

   int m_LogicalIndex;

   int m_CompactSize;

   bool m_Compact;