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

QPropertyBinding: port QScopedPointer to std::unique_ptr

Browse Source 
This is in preparation of adding QT_NO_SCOPED_POINTER.

Change-Id: I040e2ce66590a8a3be48d6d69bbb2493c9fc81b9
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2024-05-13 14:56:26 +02:00
parent fd36609064
commit c889b56901
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,13 @@
#include <qproperty.h> #include <qproperty.h>
#include <qmetaobject.h> #include <qmetaobject.h>
#include <qscopedpointer.h>
#include <qscopedvaluerollback.h> #include <qscopedvaluerollback.h>
#include <qvariant.h> #include <qvariant.h>
#include <vector> #include <vector>
#include <QtCore/QVarLengthArray> #include <QtCore/QVarLengthArray>
#include <memory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace QtPrivate { namespace QtPrivate {
@ -292,7 +293,7 @@ private:
ObserverArray inlineDependencyObservers; // for things we are observing ObserverArray inlineDependencyObservers; // for things we are observing
QPropertyObserverPointer firstObserver; // list of observers observing us QPropertyObserverPointer firstObserver; // list of observers observing us
QScopedPointer<std::vector<QPropertyObserver>> heapObservers; // for things we are observing std::unique_ptr<std::vector<QPropertyObserver>> heapObservers; // for things we are observing
protected: protected:
QUntypedPropertyData *propertyDataPtr = nullptr; QUntypedPropertyData *propertyDataPtr = nullptr;