From cf010911f7681b23aff6a150c50252374447addd Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 8 Dec 2020 15:41:46 +0100 Subject: Don't allocate unneeded temporary containers Fix clazy warnings: allocating an unneeded temporary container [clazy-container-anti-pattern] Change-Id: I4b4c2c634eea650bbdf3c12d982a17f899fc94ec Reviewed-by: Alessandro Portale Reviewed-by: David Schulz Reviewed-by: hjk --- src/plugins/ctfvisualizer/ctfstatisticsmodel.cpp | 4 +++- src/plugins/ctfvisualizer/ctftracemanager.cpp | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/plugins/ctfvisualizer') diff --git a/src/plugins/ctfvisualizer/ctfstatisticsmodel.cpp b/src/plugins/ctfvisualizer/ctfstatisticsmodel.cpp index 8738d3d747..1b997b2797 100644 --- a/src/plugins/ctfvisualizer/ctfstatisticsmodel.cpp +++ b/src/plugins/ctfvisualizer/ctfstatisticsmodel.cpp @@ -83,7 +83,9 @@ QVariant CtfStatisticsModel::data(const QModelIndex &index, int role) const if (!index.isValid()) return QVariant(); - QString title = m_data.keys().at(index.row()); + auto it = m_data.cbegin(); + std::advance(it, index.row()); + const QString &title = it.key(); switch (role) { case Qt::TextAlignmentRole: diff --git a/src/plugins/ctfvisualizer/ctftracemanager.cpp b/src/plugins/ctfvisualizer/ctftracemanager.cpp index ba0976dbec..651e6c6f8e 100644 --- a/src/plugins/ctfvisualizer/ctftracemanager.cpp +++ b/src/plugins/ctfvisualizer/ctftracemanager.cpp @@ -176,8 +176,9 @@ void CtfTraceManager::load(const QString &filename) void CtfTraceManager::finalize() { bool userConsentToIgnoreDeepTraces = false; - for (qint64 tid: m_threadModels.keys()) { - if (m_threadModels[tid]->m_maxStackSize > 512) { + auto it = m_threadModels.begin(); + while (it != m_threadModels.end()) { + if (it.value()->m_maxStackSize > 512) { if (!userConsentToIgnoreDeepTraces) { QMessageBox::StandardButton answer = QMessageBox::question(Core::ICore::dialogParent(), @@ -192,8 +193,10 @@ void CtfTraceManager::finalize() break; } } - m_threadModels.remove(tid); - m_threadRestrictions.remove(tid); + m_threadRestrictions.remove(it.key()); + it = m_threadModels.erase(it); + } else { + ++it; } } for (CtfTimelineModel *model: m_threadModels) { -- cgit v1.2.1