From 5d973ea50824a3ffb46b9cdd22c619a7a464edee Mon Sep 17 00:00:00 2001 From: "Vogel, Rick" Date: Mon, 17 Jul 2023 10:32:15 +0200 Subject: [PATCH] rename compareExchange --- .../LevelingSensor/QskLevelingSensorNodes.h | 20 +++++++++---------- .../LevelingSensor/QskLevelingSensorUtility.h | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/controls/LevelingSensor/QskLevelingSensorNodes.h b/src/controls/LevelingSensor/QskLevelingSensorNodes.h index 1202136e..d245d703 100644 --- a/src/controls/LevelingSensor/QskLevelingSensorNodes.h +++ b/src/controls/LevelingSensor/QskLevelingSensorNodes.h @@ -36,9 +36,9 @@ public: m_geometry.setLineWidth(lineWidth); } - dirty |= compare_exchange(m_r1, r1); - dirty |= compare_exchange(m_r2, r2); - dirty |= compare_exchange(m_tickmarksHash, tickmarks.hash()); + dirty |= compareExchange(m_r1, r1); + dirty |= compareExchange(m_r2, r2); + dirty |= compareExchange(m_tickmarksHash, tickmarks.hash()); if (dirty) { @@ -122,9 +122,9 @@ public: } dirty |= m_geometry.vertexCount() != tickmarks.tickCount() * 2; - dirty |= compare_exchange(m_tickmarkSize, tickmarkSize); - dirty |= compare_exchange(m_scale, scale); - dirty |= compare_exchange(m_offset, offset); + dirty |= compareExchange(m_tickmarkSize, tickmarkSize); + dirty |= compareExchange(m_scale, scale); + dirty |= compareExchange(m_offset, offset); if (dirty) { @@ -186,10 +186,10 @@ public: void setGeometryProperties(const qreal radius = 1.0, const qreal cx = 0.0, const qreal cy = 0.0, const int count = 360) { auto dirty = false; - dirty |= compare_exchange(m_radius, radius); - dirty |= compare_exchange(m_cx, cx); - dirty |= compare_exchange(m_cy, cy); - dirty |= compare_exchange(m_count, count); + dirty |= compareExchange(m_radius, radius); + dirty |= compareExchange(m_cx, cx); + dirty |= compareExchange(m_cy, cy); + dirty |= compareExchange(m_count, count); if (dirty) { diff --git a/src/controls/LevelingSensor/QskLevelingSensorUtility.h b/src/controls/LevelingSensor/QskLevelingSensorUtility.h index 99d73f9a..42cee547 100644 --- a/src/controls/LevelingSensor/QskLevelingSensorUtility.h +++ b/src/controls/LevelingSensor/QskLevelingSensorUtility.h @@ -39,7 +39,7 @@ inline Q_REQUIRED_RESULT QMatrix4x4 matrix_deg( } template -inline bool compare_exchange(T& dst, const T& src) +inline bool compareExchange(T& dst, const T& src) { if (dst != src) { @@ -50,7 +50,7 @@ inline bool compare_exchange(T& dst, const T& src) } template<> -inline bool compare_exchange(float& dst, const float& src) +inline bool compareExchange(float& dst, const float& src) { if (!qskFuzzyCompare (dst, src)) { @@ -61,7 +61,7 @@ inline bool compare_exchange(float& dst, const float& src) } template<> -inline bool compare_exchange(qreal& dst, const qreal& src) +inline bool compareExchange(qreal& dst, const qreal& src) { if (!qskFuzzyCompare (dst, src)) {