From d2e48ed72e3526c08580d5c4b3531778267532c5 Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jeremy.rimpo@servermonkey.com>
Date: Thu, 21 Sep 2023 17:43:29 -0500
Subject: Fix rebase issues

---
 src/modlist.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/modlist.cpp')

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 41d679d9..9f64cc71 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -285,10 +285,11 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
   } else if (role == GroupingRole) {
     if (column == COL_CATEGORY) {
       QVariantList categoryNames;
-      std::set<int> categories = modInfo->getCategories();
+      std::set<int> categories         = modInfo->getCategories();
       CategoryFactory* categoryFactory = CategoryFactory::instance();
       for (auto iter = categories.begin(); iter != categories.end(); ++iter) {
-        categoryNames.append(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
+        categoryNames.append(
+            categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*iter)));
       }
       if (categoryNames.count() != 0) {
         return categoryNames;
@@ -453,7 +454,10 @@ QVariant ModList::data(const QModelIndex& modelIndex, int role) const
           categoryString << " , ";
         }
         try {
-          categoryString << "<span style=\"white-space: nowrap;\"><i>" << ToWString(categoryFactory->getCategoryName(categoryFactory->getCategoryIndex(*catIter))) << "</font></span>";
+          categoryString << "<span style=\"white-space: nowrap;\"><i>"
+                         << ToWString(categoryFactory->getCategoryName(
+                                categoryFactory->getCategoryIndex(*catIter)))
+                         << "</font></span>";
         } catch (const std::exception& e) {
           log::error("failed to generate tooltip: {}", e.what());
           return QString();
-- 
cgit v1.3.1