From 0a0f0c76dbd6d07c1d1287e93e3f4ce947aa7e7a Mon Sep 17 00:00:00 2001 From: Willyanto Willyanto Date: Mon, 16 Jan 2023 23:44:25 +0700 Subject: [PATCH] Replace qswap with std::swap Fixes obsolete function 'qSwap' called. It is recommended to use 'std::swap' instead. (CWE-477) --- src/dolphintabpage.cpp | 4 ++-- src/kitemviews/private/kfileitemmodelsortalgorithm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index 52545e349..f6d288e7d 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -120,7 +120,7 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, Animated animated, const // If the primary view is active, we have to swap the pointers // because the secondary view will be the new primary view. - qSwap(m_primaryViewContainer, m_secondaryViewContainer); + std::swap(m_primaryViewContainer, m_secondaryViewContainer); m_primaryViewActive = false; } } else { @@ -132,7 +132,7 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, Animated animated, const // If the secondary view is active, we have to swap the pointers // because the secondary view will be the new primary view. - qSwap(m_primaryViewContainer, m_secondaryViewContainer); + std::swap(m_primaryViewContainer, m_secondaryViewContainer); m_primaryViewActive = true; } } diff --git a/src/kitemviews/private/kfileitemmodelsortalgorithm.h b/src/kitemviews/private/kfileitemmodelsortalgorithm.h index 4ee6095ca..4fe6aa66a 100644 --- a/src/kitemviews/private/kfileitemmodelsortalgorithm.h +++ b/src/kitemviews/private/kfileitemmodelsortalgorithm.h @@ -100,7 +100,7 @@ static void merge(RandomAccessIterator begin, if (len1 + len2 == 2) { if (lessThan(*(begin + 1), *(begin))) { - qSwap(*begin, *(begin + 1)); + std::swap(*begin, *(begin + 1)); } return; } -- 2.47.3