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

Move QBindingStorage methods marked for removal to removed_api

Browse Source 
From the API review.

Pick-to: 6.3
Change-Id: I676ff811a3b3d43ebcbee78ed0210d669d642947
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Sona Kurazyan 2022-02-15 16:30:25 +01:00
parent d1f077a435
commit 221df41572
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/compat/removed_api.cpp
View File

@ -60,6 +60,17 @@ int QMetaType::id() const
#endif // QT_CORE_REMOVED_SINCE(6, 1) #endif // QT_CORE_REMOVED_SINCE(6, 1)
#if QT_CORE_REMOVED_SINCE(6, 2)
#include "qbindingstorage.h"
void QBindingStorage::maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const
{
registerDependency_helper(data);
}
#endif // QT_CORE_REMOVED_SINCE(6, 2)
#if QT_CORE_REMOVED_SINCE(6, 3) #if QT_CORE_REMOVED_SINCE(6, 3)
#include "qbytearraymatcher.h" #include "qbytearraymatcher.h"

6
src/corelib/kernel/qbindingstorage.h
View File

@ -94,8 +94,10 @@ public:
return nullptr; return nullptr;
return bindingData_helper(data); return bindingData_helper(data);
} }
// ### Qt 7: remove unused BIC shim
#if QT_CORE_REMOVED_SINCE(6, 2)
void maybeUpdateBindingAndRegister(const QUntypedPropertyData *data) const { registerDependency(data); } void maybeUpdateBindingAndRegister(const QUntypedPropertyData *data) const { registerDependency(data); }
#endif
QtPrivate::QPropertyBindingData *bindingData(QUntypedPropertyData *data, bool create) QtPrivate::QPropertyBindingData *bindingData(QUntypedPropertyData *data, bool create)
{ {
@ -106,8 +108,10 @@ public:
private: private:
void clear(); void clear();
void registerDependency_helper(const QUntypedPropertyData *data) const; void registerDependency_helper(const QUntypedPropertyData *data) const;
#if QT_CORE_REMOVED_SINCE(6, 2)
// ### Unused, but keep for BC // ### Unused, but keep for BC
void maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const; void maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const;
#endif
QtPrivate::QPropertyBindingData *bindingData_helper(const QUntypedPropertyData *data) const; QtPrivate::QPropertyBindingData *bindingData_helper(const QUntypedPropertyData *data) const;
QtPrivate::QPropertyBindingData *bindingData_helper(QUntypedPropertyData *data, bool create); QtPrivate::QPropertyBindingData *bindingData_helper(QUntypedPropertyData *data, bool create);
}; };

6
src/corelib/kernel/qproperty.cpp
View File

@ -2207,12 +2207,6 @@ void QBindingStorage::clear()
d = nullptr; d = nullptr;
} }
// ### Unused, retained for BC with 6.0
void QBindingStorage::maybeUpdateBindingAndRegister_helper(const QUntypedPropertyData *data) const
{
registerDependency_helper(data);
}
void QBindingStorage::registerDependency_helper(const QUntypedPropertyData *data) const void QBindingStorage::registerDependency_helper(const QUntypedPropertyData *data) const
{ {
Q_ASSERT(bindingStatus); Q_ASSERT(bindingStatus);