From d330a9d74b88a4d24c2e97b877c2641c94984737 Mon Sep 17 00:00:00 2001 From: AL <26797547+Al12rs@users.noreply.github.com> Date: Sat, 31 Oct 2020 17:54:56 +0100 Subject: Cleanup clear() --- src/modinfodialogconflicts.cpp | 3 ++- src/modinfodialogconflicts.h | 13 +------------ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp index 358571d6..f7a27bf8 100644 --- a/src/modinfodialogconflicts.cpp +++ b/src/modinfodialogconflicts.cpp @@ -593,6 +593,8 @@ GeneralConflictsTab::GeneralConflictsTab( void GeneralConflictsTab::clear() { + m_counts.clear(); + m_overwriteModel->clear(); m_overwrittenModel->clear(); m_noConflictModel->clear(); @@ -625,7 +627,6 @@ void GeneralConflictsTab::restoreState(const Settings& s) bool GeneralConflictsTab::update() { clear(); - m_counts.clear(); if (m_tab->origin() != nullptr) { const auto rootPath = m_tab->mod().absolutePath(); diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h index 5c0e9158..db195e3d 100644 --- a/src/modinfodialogconflicts.h +++ b/src/modinfodialogconflicts.h @@ -67,18 +67,7 @@ private: int numOverwrittenArchive = 0; void clear() { - numTotalFiles = 0; - numTotalLoose = 0; - numTotalArchive = 0; - numNonConflicting = 0; - numNonConflictingLoose = 0; - numNonConflictingArchive = 0; - numOverwrite = 0; - numOverwriteLoose = 0; - numOverwriteArchive = 0; - numOverwritten = 0; - numOverwrittenLoose = 0; - numOverwrittenArchive = 0; + *this = {}; }; }; -- cgit v1.3.1