Merge pull request #1350 from Holt59/collapsible-separators

Collapsible separators - Fix & Improvements.

1 files changed, 5 insertions, 34 deletions

diff --git a/src/modlist.cpp b/src/modlist.cpp
index ea1d2754..f820e4d1 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -194,30 +194,6 @@ QString ModList::getConflictFlagText(ModInfo::EConflictFlag flag, ModInfo::Ptr m
   }
 }
 
-
-QVariantList ModList::contentsToIcons(const std::set<int> &contents) const
-{
-  QVariantList result;
-  m_Organizer->modDataContents().forEachContentInOrOut(
-    contents,
-    [&result](auto const& content) { result.append(content.icon()); },
-    [&result](auto const&) { result.append(QString()); });
-  return result;
-}
-
-QString ModList::contentsToToolTip(const std::set<int> &contents) const
-{
-  QString result("<table cellspacing=7>");
-  m_Organizer->modDataContents().forEachContentIn(contents, [&result](auto const& content) {
-    result.append(QString("<tr><td><img src=\"%1\" width=32/></td>"
-      "<td valign=\"middle\">%2</td></tr>")
-      .arg(content.icon()).arg(content.name()));
-    });
-  result.append("</table>");
-  return result;
-}
-
-
 QVariant ModList::data(const QModelIndex &modelIndex, int role) const
 {
   if (m_Profile == nullptr) return QVariant();
@@ -385,9 +361,6 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
       default: return QtGroupingProxy::AGGR_NONE;
     }
   }
-  else if (role == ContentsRole) {
-    return contentsToIcons(modInfo->getContents());
-  }
   else if (role == GameNameRole) {
     return modInfo->gameName();
   }
@@ -494,9 +467,6 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
 
       return result;
     }
-    else if (column == COL_CONTENT) {
-      return contentsToToolTip(modInfo->getContents());
-    }
     else if (column == COL_NAME) {
       try {
         return modInfo->getDescription();
@@ -585,15 +555,16 @@ bool ModList::renameMod(int index, const QString &newName)
     m_Profile->cancelModlistWrite();
 
 
-    if (modInfo->setName(nameFixed))
+    if (modInfo->setName(nameFixed)) {
       // Notice there is a good chance that setName() updated the modinfo indexes
       // the modRenamed() call will refresh the indexes in the current profile
       // and update the modlists in all profiles
       emit modRenamed(oldName, nameFixed);
-  }
+    }
 
-  // invalidate the currently displayed state of this list
-  notifyChange(-1);
+    // invalidate the currently displayed state of this list
+    notifyChange(-1);
+  }
   return true;
 }