summaryrefslogtreecommitdiff
path: root/src/modinfodialogconflicts.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2019-06-25 08:10:17 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2019-07-02 10:10:18 -0400
commit1ef0620f6e2d8a4e7d48b3b2b8eb96c3a8d3cd0d (patch)
tree4bf5c0919a42bac4e38e6f98467edd2e5b9d5dac /src/modinfodialogconflicts.cpp
parent1e54b4b57682b544bca0bb9d563fdb3d747073f2 (diff)
rework of the images tab to avoid using widgets at all, painting is done manually
Diffstat (limited to 'src/modinfodialogconflicts.cpp')
-rw-r--r--src/modinfodialogconflicts.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index d1384d7a..05b69f05 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -887,7 +887,6 @@ ConflictItem GeneralConflictsTab::createOverwriteItem(
const FileEntry::AlternativesVector& alternatives)
{
const auto& ds = *m_core.directoryStructure();
-
QString altString;
for (const auto& alt : alternatives) {
@@ -898,9 +897,6 @@ ConflictItem GeneralConflictsTab::createOverwriteItem(
altString += ToQString(ds.getOriginByID(alt.first).getName());
}
- QStringList fields(relativeName);
- fields.append(altString);
-
const auto origin = ToQString(ds.getOriginByID(alternatives.back().first).getName());
return {altString, relativeName, "", index, fileName, true, origin, archive};
@@ -918,12 +914,8 @@ ConflictItem GeneralConflictsTab::createOverwrittenItem(
const QString& fileName, const QString& relativeName)
{
const auto& ds = *m_core.directoryStructure();
-
const FilesOrigin &realOrigin = ds.getOriginByID(fileOrigin);
- QStringList fields(relativeName);
- fields.append(ToQString(realOrigin.getName()));
-
return {
"", relativeName, ToQString(realOrigin.getName()),
index, fileName, true, ToQString(realOrigin.getName()), archive};