diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-09-20 11:13:31 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-04 08:40:28 +0200 |
| commit | 4def28e7f9da33aa047f8d201ce2298364f6db42 (patch) | |
| tree | bacc19377013a56ab93ecdc23114c15ff6b33f85 /sources/pyside2/libpyside/pyside.cpp | |
| parent | 6031a7ac6f326e87a39d3d5d10dbb599211ec550 (diff) | |
libpyside: Use new static strings
Initial-patch-by: Christian Tismer <tismer@stackless.com>
Task-number: PYSIDE-1087
Change-Id: I5b4f0e70bc9b79dd4a4a545e97722ceba778ee53
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/pyside.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sources/pyside2/libpyside/pyside.cpp b/sources/pyside2/libpyside/pyside.cpp index ffa837a01..2419b2e16 100644 --- a/sources/pyside2/libpyside/pyside.cpp +++ b/sources/pyside2/libpyside/pyside.cpp @@ -45,6 +45,7 @@ #include "pysideproperty.h" #include "pysidesignal.h" #include "pysidesignal_p.h" +#include "pysidestaticstrings.h" #include "pysideslot_p.h" #include "pysidemetafunction_p.h" #include "pysidemetafunction.h" @@ -57,6 +58,7 @@ #include <gilstate.h> #include <sbkconverter.h> #include <sbkstring.h> +#include <sbkstaticstrings.h> #include <qapp_macro.h> #include <QtCore/QByteArray> @@ -234,7 +236,8 @@ void initDynamicMetaObject(SbkObjectType *type, const QMetaObject *base, std::si if (!converter) return; Shiboken::AutoDecRef pyMetaObject(Shiboken::Conversions::pointerToPython(converter, metaObjectPtr)); - PyObject_SetAttrString(reinterpret_cast<PyObject *>(type), "staticMetaObject", pyMetaObject); + PyObject_SetAttr(reinterpret_cast<PyObject *>(type), + PySide::PyName::qtStaticMetaObject(), pyMetaObject); } TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj) @@ -540,7 +543,7 @@ bool registerInternalQtConf() // Querying __file__ should be done only for modules that have finished their initialization. // Thus querying for the top-level PySide2 package works for us whenever any Qt-wrapped module // is loaded. - PyObject *pysideInitFilePath = PyObject_GetAttrString(pysideModule, "__file__"); + PyObject *pysideInitFilePath = PyObject_GetAttr(pysideModule, Shiboken::PyMagicName::file()); Py_DECREF(pysideModule); if (!pysideInitFilePath) return false; |