From b7935aedec70dd4f0c40dbe948dba9a80a56a75a Mon Sep 17 00:00:00 2001
From: AL <26797547+Al12rs@users.noreply.github.com>
Date: Sat, 31 Oct 2020 20:58:07 +0100
Subject: Change Alternatives vector to use a struct

---
 src/organizercore.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/organizercore.cpp')

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 92433f5e..df47c75d 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -921,7 +921,7 @@ QStringList OrganizerCore::getFileOrigins(const QString &fileName) const
         m_DirectoryStructure->getOriginByID(file->getOrigin()).getName()));
     foreach (auto i, file->getAlternatives()) {
       result.append(
-          ToQString(m_DirectoryStructure->getOriginByID(i.first).getName()));
+          ToQString(m_DirectoryStructure->getOriginByID(i.originID).getName()));
     }
   }
   return result;
@@ -945,10 +945,10 @@ QList<MOBase::IOrganizer::FileInfo> OrganizerCore::findFileInfos(
       info.origins.append(ToQString(
           m_DirectoryStructure->getOriginByID(file->getOrigin(fromArchive))
               .getName()));
-      info.archive = fromArchive ? ToQString(file->getArchive().first) : "";
+      info.archive = fromArchive ? ToQString(file->getArchive().name) : "";
       foreach (auto idx, file->getAlternatives()) {
         info.origins.append(
-            ToQString(m_DirectoryStructure->getOriginByID(idx.first).getName()));
+            ToQString(m_DirectoryStructure->getOriginByID(idx.originID).getName()));
       }
 
       if (filter(info)) {
@@ -1049,7 +1049,7 @@ bool OrganizerCore::previewFileWithAlternatives(
     // don't bother with the vector of origins, just add them as they come
     addFunc(file->getOrigin());
     for (auto alt : file->getAlternatives()) {
-      addFunc(alt.first);
+      addFunc(alt.originID);
     }
   } else {
     std::vector<int> origins;
@@ -1059,10 +1059,10 @@ bool OrganizerCore::previewFileWithAlternatives(
 
     // add other origins, push to front if it's the selected one
     for (auto alt : file->getAlternatives()) {
-      if (alt.first == selectedOrigin) {
-        origins.insert(origins.begin(), alt.first);
+      if (alt.originID == selectedOrigin) {
+        origins.insert(origins.begin(), alt.originID);
       } else {
-        origins.push_back(alt.first);
+        origins.push_back(alt.originID);
       }
     }
 
-- 
cgit v1.3.1