From b3331ef2c0b50ab2cea4c328e78f6ab58bca099d Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Fri, 6 Dec 2019 23:12:18 -0600
Subject: Separate conflict flags and render them in separate columns

---
 src/modflagicondelegate.cpp | 74 ++-------------------------------------------
 1 file changed, 2 insertions(+), 72 deletions(-)

(limited to 'src/modflagicondelegate.cpp')

diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index a5e9aa22..6e1df147 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -4,18 +4,6 @@
 
 using namespace MOBase;
 
-ModInfo::EFlag ModFlagIconDelegate::m_ConflictFlags[4] = { ModInfo::FLAG_CONFLICT_MIXED
-                                                         , ModInfo::FLAG_CONFLICT_OVERWRITE
-                                                         , ModInfo::FLAG_CONFLICT_OVERWRITTEN
-                                                         , ModInfo::FLAG_CONFLICT_REDUNDANT };
-
-ModInfo::EFlag ModFlagIconDelegate::m_ArchiveLooseConflictFlags[2] = { ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE
-                                                                     , ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN };
-
-ModInfo::EFlag ModFlagIconDelegate::m_ArchiveConflictFlags[3] = { ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED
-                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE
-                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN };
-
 ModFlagIconDelegate::ModFlagIconDelegate(QObject *parent, int logicalIndex, int compactSize)
   : IconDelegate(parent)
   , m_LogicalIndex(logicalIndex)
@@ -37,54 +25,9 @@ QList<QString> ModFlagIconDelegate::getIconsForFlags(
   QList<QString> result;
 
   // Don't do flags for overwrite
-  if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
+  if (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())
     return result;
 
-  // insert conflict icons to provide nicer alignment
-  { // insert loose file conflicts first
-    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);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert loose vs archive overwrite second
-    auto iter = std::find(flags.begin(), flags.end(),
-      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert loose vs archive overwritten third
-    auto iter = std::find_first_of(flags.begin(), flags.end(),
-      m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert archive conflicts last
-    auto iter = std::find_first_of(flags.begin(), flags.end(),
-      m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
   for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
     auto iconPath = getFlagIcon(*iter);
     if (!iconPath.isEmpty())
@@ -113,15 +56,6 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag)
     case ModInfo::FLAG_INVALID: return QStringLiteral(":/MO/gui/problem");
     case ModInfo::FLAG_NOTENDORSED: return QStringLiteral(":/MO/gui/emblem_notendorsed");
     case ModInfo::FLAG_NOTES: return QStringLiteral(":/MO/gui/emblem_notes");
-    case ModInfo::FLAG_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/emblem_conflict_mixed");
-    case ModInfo::FLAG_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/emblem_conflict_overwrite");
-    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/emblem_conflict_overwritten");
-    case ModInfo::FLAG_CONFLICT_REDUNDANT: return QStringLiteral(":/MO/gui/emblem_conflict_redundant");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwrite");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwritten");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/archive_conflict_mixed");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_conflict_winner");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_conflict_loser");
     case ModInfo::FLAG_ALTERNATE_GAME: return QStringLiteral(":/MO/gui/alternate_game");
     case ModInfo::FLAG_FOREIGN: return QString();
     case ModInfo::FLAG_SEPARATOR: return QString();
@@ -140,11 +74,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();
-    size_t count = flags.size();
-    if (std::find_first_of(flags.begin(), flags.end(), m_ConflictFlags, m_ConflictFlags + 4) == flags.end()) {
-      ++count;
-    }
-    return count;
+    return flags.size();
   } else {
     return 0;
   }
-- 
cgit v1.3.1