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/feature_select.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/feature_select.cpp')
| -rw-r--r-- | sources/pyside6/libpyside/feature_select.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp index c12869777..b3b692578 100644 --- a/sources/pyside6/libpyside/feature_select.cpp +++ b/sources/pyside6/libpyside/feature_select.cpp @@ -129,18 +129,18 @@ static void ensureNewDictType() static inline PyObject *nextInCircle(PyObject *dict) { // returns a borrowed ref - AutoDecRef next_dict(PyObject_GetAttr(dict, PyName::dict_ring())); + AutoDecRef next_dict(PyObject_GetAttr(dict, PySideName::dict_ring())); return next_dict; } static inline void setNextDict(PyObject *dict, PyObject *next_dict) { - PyObject_SetAttr(dict, PyName::dict_ring(), next_dict); + PyObject_SetAttr(dict, PySideName::dict_ring(), next_dict); } static inline void setSelectId(PyObject *dict, int select_id) { - PyObject_SetAttr(dict, PyName::select_id(), PyLong_FromLong(select_id)); + PyObject_SetAttr(dict, PySideName::select_id(), PyLong_FromLong(select_id)); } static inline int getSelectId(PyObject *dict) @@ -585,7 +585,7 @@ PyObject *adjustPropertyName(PyObject *dict, PyObject *name) if (PyList_CheckExact(sig)) { name_clash = true; } else { - Shiboken::AutoDecRef params(PyObject_GetAttr(sig, PyName::parameters())); + Shiboken::AutoDecRef params(PyObject_GetAttr(sig, PySideName::parameters())); // Are there parameters except self or cls? if (PyObject_Size(params.object()) > 1) name_clash = true; |