diff options
Diffstat (limited to 'sources/pyside6/PySide6/qtcorehelper.h')
| -rw-r--r-- | sources/pyside6/PySide6/qtcorehelper.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sources/pyside6/PySide6/qtcorehelper.h b/sources/pyside6/PySide6/qtcorehelper.h index 8ce18444b..589d0b295 100644 --- a/sources/pyside6/PySide6/qtcorehelper.h +++ b/sources/pyside6/PySide6/qtcorehelper.h @@ -4,15 +4,17 @@ #ifndef QTCOREHELPER_H #define QTCOREHELPER_H -#include <QtCore/qsharedpointer.h> #include <QtCore/qmutex.h> #include <QtCore/qobjectdefs.h> +#include <memory> + +QT_BEGIN_NAMESPACE namespace QtCoreHelper { - using MutexLocker = QMutexLocker<QMutex>; - using RecursiveMutexLocker = QMutexLocker<QRecursiveMutex>; + using MutexLocker = QT_PREPEND_NAMESPACE(QMutexLocker<QMutex>); + using RecursiveMutexLocker = QT_PREPEND_NAMESPACE(QMutexLocker<QRecursiveMutex>); // ::QMutexLocker is a template with the QMutex class as parameter which can // only be represented by different type names in Python. Provide a common API. @@ -82,13 +84,13 @@ namespace QtCoreHelper { QGenericArgumentHolder &operator=(QGenericArgumentHolder &&); ~QGenericArgumentHolder(); - operator QGenericArgument () const; + QGenericArgument toGenericArgument() const; QMetaType metaType() const; const void *data() const; private: - QSharedPointer<QGenericArgumentData> d; + std::shared_ptr<QGenericArgumentData> d; }; class QGenericReturnArgumentData; @@ -104,15 +106,17 @@ namespace QtCoreHelper { QGenericReturnArgumentHolder &operator=(QGenericReturnArgumentHolder &&); ~QGenericReturnArgumentHolder(); - operator QGenericReturnArgument () const; + QGenericReturnArgument toGenericReturnArgument() const; QMetaType metaType() const; const void *data() const; private: - QSharedPointer<QGenericReturnArgumentData> d; + std::shared_ptr<QGenericReturnArgumentData> d; }; } // namespace QtCoreHelper +QT_END_NAMESPACE + #endif // QTCOREHELPER_H |