diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-04 09:41:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-04 12:26:11 +0100 |
| commit | b96b672b208c6717c3362e08e42247912423fea1 (patch) | |
| tree | 43b44110f6d7a2be6e12aa41a89f53c0fefc453c /sources/pyside6/libpysideqml | |
| parent | 3bc23d37737184a89f780d84f431757cd7f725c2 (diff) | |
PySide6: Port from QSharedPointer to std::shared_ptr
Task-number: QTBUG-109570
Change-Id: Ieb13bf352d9b75e364a73bddc464548ec19701ed
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/libpysideqml')
7 files changed, 13 insertions, 13 deletions
diff --git a/sources/pyside6/libpysideqml/pysideqmlattached.cpp b/sources/pyside6/libpysideqml/pysideqmlattached.cpp index 295cb7595..930358d77 100644 --- a/sources/pyside6/libpysideqml/pysideqmlattached.cpp +++ b/sources/pyside6/libpysideqml/pysideqmlattached.cpp @@ -173,10 +173,10 @@ void initQmlAttached(PyObject *module) } PySide::Qml::QmlExtensionInfo qmlAttachedInfo(PyTypeObject *t, - const QSharedPointer<QmlTypeInfo> &info) + const std::shared_ptr<QmlTypeInfo> &info) { PySide::Qml::QmlExtensionInfo result{nullptr, nullptr}; - if (info.isNull() || info->attachedType == nullptr) + if (!info || info->attachedType == nullptr) return result; auto *name = reinterpret_cast<PyTypeObject *>(t)->tp_name; diff --git a/sources/pyside6/libpysideqml/pysideqmlattached_p.h b/sources/pyside6/libpysideqml/pysideqmlattached_p.h index 93b1bb0e6..7c8a47fb8 100644 --- a/sources/pyside6/libpysideqml/pysideqmlattached_p.h +++ b/sources/pyside6/libpysideqml/pysideqmlattached_p.h @@ -6,7 +6,7 @@ #include <sbkpython.h> -#include <QtCore/QSharedPointer> +#include <memory> namespace PySide::Qml { struct QmlExtensionInfo; @@ -15,7 +15,7 @@ struct QmlTypeInfo; void initQmlAttached(PyObject *module); PySide::Qml::QmlExtensionInfo qmlAttachedInfo(PyTypeObject *t, - const QSharedPointer<QmlTypeInfo> &info); + const std::shared_ptr<QmlTypeInfo> &info); } // namespace PySide::Qml #endif // PYSIDEQMLATTACHED_P_H diff --git a/sources/pyside6/libpysideqml/pysideqmlextended.cpp b/sources/pyside6/libpysideqml/pysideqmlextended.cpp index e42fe20dd..014794854 100644 --- a/sources/pyside6/libpysideqml/pysideqmlextended.cpp +++ b/sources/pyside6/libpysideqml/pysideqmlextended.cpp @@ -92,7 +92,7 @@ static QObject *extensionFactory(QObject *o) auto *pyObjType = Py_TYPE(pyObj); const auto info = qmlTypeInfo(reinterpret_cast<PyObject *>(pyObjType)); - if (info.isNull() || info->extensionType == nullptr) { + if (!info || info->extensionType == nullptr) { qWarning("QmlExtended: Cannot find extension of %s.", pyObjType->tp_name); return nullptr; } @@ -128,10 +128,10 @@ void initQmlExtended(PyObject *module) } PySide::Qml::QmlExtensionInfo qmlExtendedInfo(PyObject *t, - const QSharedPointer<QmlTypeInfo> &info) + const std::shared_ptr<QmlTypeInfo> &info) { PySide::Qml::QmlExtensionInfo result{nullptr, nullptr}; - if (!info.isNull() && info->extensionType) { + if (info && info->extensionType) { result.metaObject = PySide::retrieveMetaObject(info->extensionType); if (result.metaObject) { result.factory = extensionFactory; diff --git a/sources/pyside6/libpysideqml/pysideqmlextended_p.h b/sources/pyside6/libpysideqml/pysideqmlextended_p.h index 9650a26c3..17d6dae64 100644 --- a/sources/pyside6/libpysideqml/pysideqmlextended_p.h +++ b/sources/pyside6/libpysideqml/pysideqmlextended_p.h @@ -6,7 +6,7 @@ #include <sbkpython.h> -#include <QtCore/QSharedPointer> +#include <memory> namespace PySide::Qml { struct QmlExtensionInfo; @@ -15,7 +15,7 @@ struct QmlTypeInfo; void initQmlExtended(PyObject *module); PySide::Qml::QmlExtensionInfo qmlExtendedInfo(PyObject *t, - const QSharedPointer<QmlTypeInfo> &info); + const std::shared_ptr<QmlTypeInfo> &info); } // namespace PySide::Qml #endif // PYSIDEQMLEXTENDED_P_H diff --git a/sources/pyside6/libpysideqml/pysideqmlregistertype.cpp b/sources/pyside6/libpysideqml/pysideqmlregistertype.cpp index 26398ae76..8333550ed 100644 --- a/sources/pyside6/libpysideqml/pysideqmlregistertype.cpp +++ b/sources/pyside6/libpysideqml/pysideqmlregistertype.cpp @@ -436,7 +436,7 @@ PyObject *qmlElementMacro(PyObject *pyObj, const char *decoratorName, const char *noCreationReason = nullptr; const auto info = PySide::Qml::qmlTypeInfo(pyObj); auto *registerObject = pyObj; - if (!info.isNull()) { + if (info) { if (info->flags.testFlag(PySide::Qml::QmlTypeFlag::Singleton)) mode = RegisterMode::Singleton; else if (info->flags.testFlag(PySide::Qml::QmlTypeFlag::Uncreatable)) diff --git a/sources/pyside6/libpysideqml/pysideqmltypeinfo.cpp b/sources/pyside6/libpysideqml/pysideqmltypeinfo.cpp index 31abedd8a..0304d33e3 100644 --- a/sources/pyside6/libpysideqml/pysideqmltypeinfo.cpp +++ b/sources/pyside6/libpysideqml/pysideqmltypeinfo.cpp @@ -19,7 +19,7 @@ QmlTypeInfoPtr ensureQmlTypeInfo(const PyObject *o) auto *hash = qmlTypeInfoHashStatic(); auto it = hash->find(o); if (it == hash->end()) - it = hash->insert(o, QmlTypeInfoPtr(new QmlTypeInfo)); + it = hash->insert(o, std::make_shared<QmlTypeInfo>()); return it.value(); } diff --git a/sources/pyside6/libpysideqml/pysideqmltypeinfo_p.h b/sources/pyside6/libpysideqml/pysideqmltypeinfo_p.h index 465299833..e10a2b38c 100644 --- a/sources/pyside6/libpysideqml/pysideqmltypeinfo_p.h +++ b/sources/pyside6/libpysideqml/pysideqmltypeinfo_p.h @@ -7,8 +7,8 @@ #include <sbkpython.h> #include <QtCore/QFlags> -#include <QtCore/QSharedPointer> +#include <memory> #include <string> QT_FORWARD_DECLARE_CLASS(QDebug) @@ -36,7 +36,7 @@ struct QmlTypeInfo PyTypeObject *extensionType = nullptr; }; -using QmlTypeInfoPtr = QSharedPointer<QmlTypeInfo>; +using QmlTypeInfoPtr = std::shared_ptr<QmlTypeInfo>; QmlTypeInfoPtr ensureQmlTypeInfo(const PyObject *o); void insertQmlTypeInfoAlias(const PyObject *o, const QmlTypeInfoPtr &value); |