Merge pull request #252 from LePresidente/new_vfs_library

Update master to latest stable code.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index d66c3ac5..61df0a0d 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -12,8 +12,7 @@ ModFlagIconDelegate::ModFlagIconDelegate(QObject *parent)
 {

 }

 

-QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const

-{

+QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {

   QList<QString> result;

   QVariant modid = index.data(Qt::UserRole + 1);

   if (modid.isValid()) {

@@ -21,7 +20,8 @@ QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const
     std::vector<ModInfo::EFlag> flags = info->getFlags();

 

     { // insert conflict icon first to provide nicer alignment

-      auto iter = std::find_first_of(flags.begin(), flags.end(), m_ConflictFlags, m_ConflictFlags + 4);

+      auto iter = std::find_first_of(flags.begin(), flags.end(),

+                                     m_ConflictFlags, m_ConflictFlags + 4);

       if (iter != flags.end()) {

         result.append(getFlagIcon(*iter));

         flags.erase(iter);

@@ -58,7 +58,7 @@ size_t ModFlagIconDelegate::getNumIcons(const QModelIndex &index) const
   if (modIdx < ModInfo::getNumMods()) {

     ModInfo::Ptr info = ModInfo::getByIndex(modIdx);

     std::vector<ModInfo::EFlag> flags = info->getFlags();

-    int count = flags.size();

+    size_t count = flags.size();

     if (std::find_first_of(flags.begin(), flags.end(), m_ConflictFlags, m_ConflictFlags + 4) == flags.end()) {

       ++count;

     }

@@ -71,11 +71,11 @@ size_t ModFlagIconDelegate::getNumIcons(const QModelIndex &index) const
 

 QSize ModFlagIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &modelIndex) const

 {

-  int count = getNumIcons(modelIndex);

+  size_t count = getNumIcons(modelIndex);

   unsigned int index = modelIndex.data(Qt::UserRole + 1).toInt();

   QSize result;

   if (index < ModInfo::getNumMods()) {

-    result = QSize(count * 40, 20);

+    result = QSize(static_cast<int>(count) * 40, 20);

   } else {

     result = QSize(1, 20);

   }