diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-15 14:38:01 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-12-16 15:05:20 +0100 |
| commit | b6d8b5f77f5721d8b43c9d7b14f0c2aa15a519a0 (patch) | |
| tree | d10d746908c3c7d43cad7d76ed46b8ff274f60d8 /sources/pyside6/libpyside/pyside.cpp | |
| parent | 0d0ffa51609670d3a034c0b5ac5d2b6855bf9372 (diff) | |
libpyside: Rename the static strings
Shiboken::Py(Magic)Name needs to be disambiguated from
PySide::Py(Magic)Name as otherwise
using namespace Shiboken;
using namespace PySide;
leads to ambiguities in jumbo builds.
Task-number: PYSIDE-2155
Change-Id: I7ffd1c9325f9c9a83be8ef797aebb096cc15f593
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside/pyside.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/pyside.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp index 09acfea07..b3d88e23b 100644 --- a/sources/pyside6/libpyside/pyside.cpp +++ b/sources/pyside6/libpyside/pyside.cpp @@ -273,7 +273,7 @@ static bool _setProperty(PyObject *qObj, PyObject *name, PyObject *value, bool * static PyObject *magicGet = Shiboken::PyMagicName::get(); if (found && prop_flag) { // the indirection of the setter descriptor in a true property - AutoDecRef descr(PyObject_GetAttr(look, PyName::fset())); + AutoDecRef descr(PyObject_GetAttr(look, PySideName::fset())); propSetter.reset(PyObject_CallMethodObjArgs(descr, magicGet, qObj, nullptr)); } else { // look is already the descriptor @@ -530,7 +530,7 @@ PyObject *getHiddenDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *n // would create confusion with overload. // Note: before implementing this property handling, the meta function code // below created meta functions which was quite wrong. - auto *subdict = _PepType_Lookup(Py_TYPE(self), PyMagicName::property_methods()); + auto *subdict = _PepType_Lookup(Py_TYPE(self), PySideMagicName::property_methods()); PyObject *propName = PyDict_GetItem(subdict, name); if (propName) { // We really have a property name and need to fetch the fget or fset function. @@ -543,7 +543,7 @@ PyObject *getHiddenDataFromQObject(QObject *cppSelf, PyObject *self, PyObject *n auto *trial = arr[idx]; auto *res = PyObject_GetAttr(prop, trial); if (res) { - AutoDecRef elemName(PyObject_GetAttr(res, PyMagicName::name())); + AutoDecRef elemName(PyObject_GetAttr(res, PySideMagicName::name())); // Note: This comparison works because of interned strings. if (elemName == name) return res; @@ -774,9 +774,9 @@ QString pyPathToQString(PyObject *path) bool isCompiledMethod(PyObject *callback) { - return PyObject_HasAttr(callback, PySide::PyName::im_func()) - && PyObject_HasAttr(callback, PySide::PyName::im_self()) - && PyObject_HasAttr(callback, PySide::PyMagicName::code()); + return PyObject_HasAttr(callback, PySide::PySideName::im_func()) + && PyObject_HasAttr(callback, PySide::PySideName::im_self()) + && PyObject_HasAttr(callback, PySide::PySideMagicName::code()); } static const unsigned char qt_resource_name[] = { |