diff options
| author | AL <26797547+Al12rs@users.noreply.github.com> | 2020-11-02 21:45:32 +0100 |
|---|---|---|
| committer | AL <26797547+Al12rs@users.noreply.github.com> | 2020-11-02 21:45:32 +0100 |
| commit | 4814ba626e80f5137076556b687e59e6bbd8be34 (patch) | |
| tree | 7497d6feec3aa864197680eac88bb616dcaf68db /src/modinfowithconflictinfo.cpp | |
| parent | b7935aedec70dd4f0c40dbe948dba9a80a56a75a (diff) | |
Convert FileAlternative and DataArchiveOrigin to classes
Diffstat (limited to 'src/modinfowithconflictinfo.cpp')
| -rw-r--r-- | src/modinfowithconflictinfo.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp index b1765669..3db41147 100644 --- a/src/modinfowithconflictinfo.cpp +++ b/src/modinfowithconflictinfo.cpp @@ -145,7 +145,7 @@ void ModInfoWithConflictInfo::doConflictCheck() const } auto alternatives = file->getAlternatives(); - if ((alternatives.size() == 0) || (alternatives.back().originID == dataID)) { + if ((alternatives.size() == 0) || (alternatives.back().originID() == dataID)) { // no alternatives -> no conflict providesAnything = true; } else { @@ -155,8 +155,8 @@ void ModInfoWithConflictInfo::doConflictCheck() const archiveData = file->getArchive(); else { for (auto alt : alternatives) { - if (alt.originID == origin.getID()) { - archiveData = alt.archive; + if (alt.originID() == origin.getID()) { + archiveData = alt.archive(); break; } } @@ -181,8 +181,8 @@ void ModInfoWithConflictInfo::doConflictCheck() const // Sort out the alternatives for (auto altInfo : alternatives) { - if ((altInfo.originID != dataID) && (altInfo.originID != origin.getID())) { - FilesOrigin &altOrigin = (*m_DirectoryStructure)->getOriginByID(altInfo.originID); + if ((altInfo.originID() != dataID) && (altInfo.originID() != origin.getID())) { + FilesOrigin &altOrigin = (*m_DirectoryStructure)->getOriginByID(altInfo.originID()); QString altOriginName = ToQString(altOrigin.getName()); unsigned int altIndex = ModInfo::getIndex(altOriginName); if (!altInfo.isFromArchive()) { @@ -199,9 +199,9 @@ void ModInfoWithConflictInfo::doConflictCheck() const if (!archiveData.isValid()) { m_ArchiveLooseOverwriteList.insert(altIndex); } else { - if (archiveData.order > altInfo.archive.order) { + if (archiveData.order() > altInfo.archive().order()) { m_ArchiveOverwriteList.insert(altIndex); - } else if (archiveData.order < altInfo.archive.order) { + } else if (archiveData.order() < altInfo.archive().order()) { m_ArchiveOverwrittenList.insert(altIndex); } } |