From adc73cf5b9f73e5e99017130b91723352c2bf412 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Thu, 12 Sep 2024 16:38:12 +0200
Subject: [PATCH] QPropertyBindingPrivate: prevent -Wshadow in
 qqmlpropertybinding_p.h

This is preparation of applying headercheck to private headers, too.

Changing the private data member name to m_error is the simpler change
here, since it touches a bounded amount of code vs. the alternative of
fixing an unbounded number of unknown users.

Amends 9f33ad904aa0f43c9599e61afaf8984b3f8a3b1c.

Pick-to: 6.7 6.5 6.2
Task-number: QTBUG-126219
Change-Id: Ie0f6b5e711b35a12fadc9d8e642b885ce8b57315
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 9348212be3880ecd93111b7321043a53ab1df45a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/kernel/qproperty_p.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h
index 53e76412515..7d9bfa3d77e 100644
--- a/src/corelib/kernel/qproperty_p.h
+++ b/src/corelib/kernel/qproperty_p.h
@@ -314,7 +314,7 @@ protected:
         };
     };
 private:
-    QPropertyBindingError error;
+    QPropertyBindingError m_error;
 
     QMetaType metaType;
 
@@ -400,7 +400,7 @@ public:
         location.fileName = msg;
         return location;
     }
-    QPropertyBindingError bindingError() const { return error; }
+    QPropertyBindingError bindingError() const { return m_error; }
     QMetaType valueMetaType() const { return metaType; }
 
     void unlinkAndDeref();
@@ -417,7 +417,7 @@ public:
     { return static_cast<QPropertyBindingPrivate *>(binding.d.data()); }
 
     void setError(QPropertyBindingError &&e)
-    { error = std::move(e); }
+    { m_error = std::move(e); }
 
     void detachFromProperty()
     {
@@ -834,7 +834,7 @@ struct QUntypedBindablePrivate
 inline bool QPropertyBindingPrivate::evaluateRecursive_inline(PendingBindingObserverList &bindingObservers, QBindingStatus *status)
 {
     if (updating) {
-        error = QPropertyBindingError(QPropertyBindingError::BindingLoop);
+        m_error = QPropertyBindingError(QPropertyBindingError::BindingLoop);
         if (isQQmlPropertyBinding)
             errorCallBack(this);
         return false;