diff options
| author | Al <26797547+Al12rs@users.noreply.github.com> | 2020-11-03 05:48:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-03 05:48:51 -0800 |
| commit | a7d4f2a0c40d35d547e93994be3f92b6d43a0833 (patch) | |
| tree | 823e38d3f0af39be96a4a2b2d8264b7c851ed08b /src/syncoverwritedialog.cpp | |
| parent | 88475677d29a275fd9d25f452f58d3d745720124 (diff) | |
| parent | c5e3fb423fd144faa2db8f2bb156adba6c003d39 (diff) | |
Merge pull request #1276 from ModOrganizer2/alternatives_vector_refactor
Refactor of alternatives vector to use classes for readability.
Diffstat (limited to 'src/syncoverwritedialog.cpp')
| -rw-r--r-- | src/syncoverwritedialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp index 0afb1121..41c2b202 100644 --- a/src/syncoverwritedialog.cpp +++ b/src/syncoverwritedialog.cpp @@ -102,9 +102,9 @@ void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *director bool ignore;
int origin = entry->getOrigin(ignore);
addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin);
- const std::vector<std::pair<int, std::pair<std::wstring, int>>> &alternatives = entry->getAlternatives();
- for (std::vector<std::pair<int, std::pair<std::wstring, int>>>::const_iterator iter = alternatives.begin(); iter != alternatives.end(); ++iter) {
- addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(iter->first).getName()), iter->first);
+ const auto &alternatives = entry->getAlternatives();
+ for (const auto& alt : alternatives) {
+ addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(alt.originID()).getName()), alt.originID());
}
combo->setCurrentIndex(combo->count() - 1);
} else {
|