1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QPropertyBindingPrivate: prevent -Wshadow in qqmlpropertybinding_p.h

Browse Source 
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>
This commit is contained in:
Marc Mutz 2024-09-12 16:38:12 +02:00 committed by Qt Cherry-pick Bot
parent 77b8cd0a45
commit adc73cf5b9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/kernel/qproperty_p.h
View File

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