Initial archive conflict parsing

Squashed commit:
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Basic archive conflict parsing - pass 1
  Merge fixes for archive parsing
  Should fix conflict detection for archive files

1 files changed, 4 insertions, 4 deletions

diff --git a/src/modinfodialog.cpp b/src/modinfodialog.cpp
index 416eca58..204b539b 100644
--- a/src/modinfodialog.cpp
+++ b/src/modinfodialog.cpp
@@ -312,10 +312,10 @@ void ModInfoDialog::refreshLists()
       QString fileName = relativeName.mid(0).prepend(m_RootPath);

       bool archive;

       if ((*iter)->getOrigin(archive) == m_Origin->getID()) {

-        std::vector<std::pair<int, std::wstring>> alternatives = (*iter)->getAlternatives();

+        std::vector<std::pair<int, std::pair<std::wstring, int>>> alternatives = (*iter)->getAlternatives();

         if (!alternatives.empty()) {

           std::wostringstream altString;

-          for (std::vector<std::pair<int, std::wstring>>::iterator altIter = alternatives.begin();

+          for (std::vector<std::pair<int, std::pair<std::wstring, int>>>::iterator altIter = alternatives.begin();

                altIter != alternatives.end(); ++altIter) {

             if (altIter != alternatives.begin()) {

               altString << ", ";

@@ -326,8 +326,8 @@ void ModInfoDialog::refreshLists()
           fields.append(ToQString(altString.str()));

           QTreeWidgetItem *item = new QTreeWidgetItem(fields);

           item->setData(0, Qt::UserRole, fileName);

-          item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives.begin()->first).getName()));

-          item->setData(1, Qt::UserRole + 1, alternatives.begin()->first);

+          item->setData(1, Qt::UserRole, ToQString(m_Directory->getOriginByID(alternatives.back().first).getName()));

+          item->setData(1, Qt::UserRole + 1, alternatives.back().first);

           item->setData(1, Qt::UserRole + 2, archive);

           ui->overwriteTree->addTopLevelItem(item);

           ++numOverwrite;