diff options
Diffstat (limited to 'sources/pyside6/libpyside')
| -rw-r--r-- | sources/pyside6/libpyside/dynamicqmetaobject.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/feature_select.cpp | 12 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/pysideqenum.cpp | 6 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/pysideqflags.cpp | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/pysidesignal.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/sources/pyside6/libpyside/dynamicqmetaobject.cpp b/sources/pyside6/libpyside/dynamicqmetaobject.cpp index 39be38b29..b7febf492 100644 --- a/sources/pyside6/libpyside/dynamicqmetaobject.cpp +++ b/sources/pyside6/libpyside/dynamicqmetaobject.cpp @@ -577,7 +577,7 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type) AutoDecRef member(PySequence_GetItem(item, 1)); AutoDecRef value(PyObject_GetAttr(member, Shiboken::PyName::value())); auto ckey = String::toCString(key); - auto ivalue = PyInt_AsSsize_t(value); // int/long cheating + auto ivalue = PyLong_AsSsize_t(value); auto thing = QPair<QByteArray, int>(ckey, int(ivalue)); entries.push_back(thing); } diff --git a/sources/pyside6/libpyside/feature_select.cpp b/sources/pyside6/libpyside/feature_select.cpp index 648ec96a3..492e30c28 100644 --- a/sources/pyside6/libpyside/feature_select.cpp +++ b/sources/pyside6/libpyside/feature_select.cpp @@ -187,7 +187,7 @@ static inline PyObject *getSelectId(PyObject *dict) static inline void setCurrentSelectId(PyTypeObject *type, PyObject *select_id) { - SbkObjectType_SetReserved(type, PyInt_AsSsize_t(select_id)); // int/long cheating + SbkObjectType_SetReserved(type, PyLong_AsSsize_t(select_id)); // int/long cheating } static inline void setCurrentSelectId(PyTypeObject *type, int id) @@ -217,7 +217,7 @@ static bool replaceClassDict(PyTypeObject *type) if (new_dict == nullptr || PyDict_Update(new_dict, dict) < 0) return false; // Insert the default id. Cannot fail for small numbers. - AutoDecRef select_id(PyInt_FromLong(0)); + AutoDecRef select_id(PyLong_FromLong(0)); setSelectId(new_dict, select_id); // insert the dict into itself as ring setNextDict(new_dict, new_dict); @@ -283,9 +283,9 @@ static bool createNewFeatureSet(PyTypeObject *type, PyObject *select_id) * content in `prev_dict`. It is responsible of filling `type->tp_dict` * with modified content. */ - static auto small_1 = PyInt_FromLong(255); + static auto small_1 = PyLong_FromLong(255); Q_UNUSED(small_1); - static auto small_2 = PyInt_FromLong(255); + static auto small_2 = PyLong_FromLong(255); Q_UNUSED(small_2); // make sure that small integers are cached assert(small_1 != nullptr && small_1 == small_2); @@ -299,7 +299,7 @@ static bool createNewFeatureSet(PyTypeObject *type, PyObject *select_id) Py_INCREF(prev_dict); // keep the first ref unchanged if (!addNewDict(type, select_id)) return false; - auto id = PyInt_AsSsize_t(select_id); // int/long cheating + auto id = PyLong_AsSsize_t(select_id); // int/long cheating if (id == -1) return false; setCurrentSelectId(type, id); @@ -434,7 +434,7 @@ void init() if (!is_initialized) { fast_id_array = &_fast_id_array[1]; for (int idx = -1; idx < 256; ++idx) - fast_id_array[idx] = PyInt_FromLong(idx); + fast_id_array[idx] = PyLong_FromLong(idx); featurePointer = featureProcArray; initSelectableFeature(SelectFeatureSet); registerCleanupFunction(finalize); diff --git a/sources/pyside6/libpyside/pysideqenum.cpp b/sources/pyside6/libpyside/pysideqenum.cpp index 07a548cb6..8abf19313 100644 --- a/sources/pyside6/libpyside/pysideqenum.cpp +++ b/sources/pyside6/libpyside/pysideqenum.cpp @@ -99,7 +99,7 @@ static PyObject *analyzePyEnum(PyObject *pyenum, PyObject *container = nullptr) AutoDecRef value(PyObject_GetAttr(member, Shiboken::PyName::value())); if (value.isNull()) return nullptr; - if (!PyInt_Check(value)) { // int/long cheating + if (!PyLong_Check(value)) { PyErr_Format(PyExc_TypeError, "QEnum expected an int value as '%.200s', got '%.200s'", Shiboken::String::toCString(key), Py_TYPE(value)->tp_name); @@ -113,9 +113,9 @@ static Py_ssize_t get_lineno() { PyObject *frame = reinterpret_cast<PyObject *>(PyEval_GetFrame()); // borrowed ref AutoDecRef ob_lineno(PyObject_GetAttr(frame, Shiboken::PyName::f_lineno())); - if (ob_lineno.isNull() || !PyInt_Check(ob_lineno)) // int/long cheating + if (ob_lineno.isNull() || !PyLong_Check(ob_lineno)) return -1; - return PyInt_AsSsize_t(ob_lineno); // int/long cheating + return PyLong_AsSsize_t(ob_lineno); } static bool is_module_code() diff --git a/sources/pyside6/libpyside/pysideqflags.cpp b/sources/pyside6/libpyside/pysideqflags.cpp index b0ca39aa0..9e1ad6142 100644 --- a/sources/pyside6/libpyside/pysideqflags.cpp +++ b/sources/pyside6/libpyside/pysideqflags.cpp @@ -162,7 +162,7 @@ namespace QFlags "missing QFlags name", // to be inserted later sizeof(PySideQFlagsObject), 0, - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES, + Py_TPFLAGS_DEFAULT, SbkNewQFlagsType_slots, }; diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp index 29a0baa5f..95acb1bad 100644 --- a/sources/pyside6/libpyside/pysidesignal.cpp +++ b/sources/pyside6/libpyside/pysidesignal.cpp @@ -784,7 +784,7 @@ QByteArray getTypeName(PyObject *type) auto objType = reinterpret_cast<PyTypeObject *>(type); if (Shiboken::String::checkType(objType)) return QByteArrayLiteral("QString"); - if (objType == &PyInt_Type) + if (objType == &PyLong_Type) return QByteArrayLiteral("int"); if (objType == &PyLong_Type) return QByteArrayLiteral("long"); |
