Merge pull request #1276 from ModOrganizer2/alternatives_vector_refactor

Refactor of alternatives vector to use classes for readability. 

1 files changed, 12 insertions, 12 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 92433f5e..1c35720b 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -919,9 +919,9 @@ QStringList OrganizerCore::getFileOrigins(const QString &fileName) const
   if (file.get() != nullptr) {
     result.append(ToQString(
         m_DirectoryStructure->getOriginByID(file->getOrigin()).getName()));
-    foreach (auto i, file->getAlternatives()) {
+    foreach (const auto& i, file->getAlternatives()) {
       result.append(
-          ToQString(m_DirectoryStructure->getOriginByID(i.first).getName()));
+          ToQString(m_DirectoryStructure->getOriginByID(i.originID()).getName()));
     }
   }
   return result;
@@ -938,17 +938,17 @@ QList<MOBase::IOrganizer::FileInfo> OrganizerCore::findFileInfos(
     dir = dir->findSubDirectoryRecursive(ToWString(path));
   if (dir != nullptr) {
     std::vector<FileEntryPtr> files = dir->getFiles();
-    foreach (FileEntryPtr file, files) {
+    for (FileEntryPtr file : files) {
       IOrganizer::FileInfo info;
       info.filePath    = ToQString(file->getFullPath());
       bool fromArchive = false;
       info.origins.append(ToQString(
           m_DirectoryStructure->getOriginByID(file->getOrigin(fromArchive))
               .getName()));
-      info.archive = fromArchive ? ToQString(file->getArchive().first) : "";
-      foreach (auto idx, file->getAlternatives()) {
+      info.archive = fromArchive ? ToQString(file->getArchive().name()) : "";
+      for (const auto& idx : file->getAlternatives()) {
         info.origins.append(
-            ToQString(m_DirectoryStructure->getOriginByID(idx.first).getName()));
+            ToQString(m_DirectoryStructure->getOriginByID(idx.originID()).getName()));
       }
 
       if (filter(info)) {
@@ -1048,8 +1048,8 @@ bool OrganizerCore::previewFileWithAlternatives(
   if (selectedOrigin == -1) {
     // 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);
+    for (const auto& alt : file->getAlternatives()) {
+      addFunc(alt.originID());
     }
   } else {
     std::vector<int> origins;
@@ -1058,11 +1058,11 @@ bool OrganizerCore::previewFileWithAlternatives(
     origins.push_back(file->getOrigin());
 
     // 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);
+    for (const auto& alt : file->getAlternatives()) {
+      if (alt.originID() == selectedOrigin) {
+        origins.insert(origins.begin(), alt.originID());
       } else {
-        origins.push_back(alt.first);
+        origins.push_back(alt.originID());
       }
     }