Skip to content

Commit c04abec

Browse files
jcfrmrbean-bremen
authored andcommitted
chore(PythonQt): replace PyInt_FromLong with PyLong_FromLong
No functional change intended.
1 parent 1b0a910 commit c04abec

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

src/PythonQt.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
304304
};
305305

306306
for (auto i = 0u; i < sizeof(enumValues)/sizeof(int); i++) {
307-
PyObject* obj = PyInt_FromLong(enumValues[i]);
307+
PyObject* obj = PyLong_FromLong(enumValues[i]);
308308
if (PyModule_AddObject(pack, enumNames[i], obj) == 0) {
309309
Py_INCREF(obj);
310310
}
@@ -2136,7 +2136,7 @@ void PythonQtPrivate::registerGlobalNamespace(const char* typeName, const char*
21362136
for (int j = 0; j < metaEnum.keyCount(); j++) {
21372137
QByteArray key = PythonQtClassInfo::escapeReservedNames(metaEnum.key(j));
21382138
int value = metaEnum.value(j);
2139-
PyObject* obj = PyInt_FromLong(value);
2139+
PyObject* obj = PyLong_FromLong(value);
21402140
addObjectToPackage(obj, key, packageName, package);
21412141
}
21422142
}

src/PythonQtConversion.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,27 +156,27 @@ PyObject* PythonQtConv::convertQtValueToPythonInternal(int type, const void* dat
156156
case QMetaType::Void:
157157
Py_RETURN_NONE;
158158
case QMetaType::Char:
159-
return PyInt_FromLong(*((char*)data));
159+
return PyLong_FromLong(*((char*)data));
160160
case QMetaType::UChar:
161-
return PyInt_FromLong(*((unsigned char*)data));
161+
return PyLong_FromLong(*((unsigned char*)data));
162162
case QMetaType::Short:
163-
return PyInt_FromLong(*((short*)data));
163+
return PyLong_FromLong(*((short*)data));
164164
case QMetaType::UShort:
165-
return PyInt_FromLong(*((unsigned short*)data));
165+
return PyLong_FromLong(*((unsigned short*)data));
166166
case QMetaType::Long:
167-
return PyInt_FromLong(*((long*)data));
167+
return PyLong_FromLong(*((long*)data));
168168
case QMetaType::ULong:
169169
// does not fit into simple int of python
170170
return PyLong_FromUnsignedLong(*((unsigned long*)data));
171171
case QMetaType::Bool:
172172
return PythonQtConv::GetPyBool(*((bool*)data));
173173
case QMetaType::Int:
174-
return PyInt_FromLong(*((int*)data));
174+
return PyLong_FromLong(*((int*)data));
175175
case QMetaType::UInt:
176176
// does not fit into simple int of python
177177
return PyLong_FromUnsignedLong(*((unsigned int*)data));
178178
case QMetaType::QChar:
179-
return PyInt_FromLong(*((unsigned short*)data));
179+
return PyLong_FromLong(*((unsigned short*)data));
180180
case QMetaType::Float:
181181
return PyFloat_FromDouble(*((float*)data));
182182
case QMetaType::Double:

src/PythonQtConversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ PyObject* PythonQtConvertIntegerMapToPython(const void* /*QMap<int, T>* */ inMap
483483
PyObject* key;
484484
PyObject* val;
485485
for (; t != map->constEnd(); t++) {
486-
key = PyInt_FromLong(t.key());
486+
key = PyLong_FromLong(t.key());
487487
val = PythonQtConv::convertQtValueToPythonInternal(innerType, &t.value());
488488
PyDict_SetItem(result, key, val);
489489
Py_DECREF(key);

src/PythonQtPythonInclude.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
#define PyString_FromFormat PyUnicode_FromFormat
127127
#define PyString_Check PyUnicode_Check
128128

129-
#define PyInt_FromLong PyLong_FromLong
130129
#define PyInt_AS_LONG PyLong_AS_LONG
131130
#define PyInt_Check PyLong_Check
132131
#define PyInt_AsLong PyLong_AsLong

0 commit comments

Comments
 (0)