diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-03-16 14:41:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-03-17 06:27:21 +0100 |
| commit | 71f584197063e907910653fa8bddcde617210544 (patch) | |
| tree | 3aa3a413c308b3fedd6218fc818f21df2193eaf8 /sources/pyside6/libpyside | |
| parent | b8a2baada13297a94e4c8a44dddf500f7d1f8e53 (diff) | |
Port code to use size() instead of count() of Qt containers
count() will be deprecated.
Fix some integer types in loops and modernize code
in changed lines.
Pick-to: 6.2
Change-Id: Idf21927661ea6c8866ee36e7c623043271e21620
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/libpyside')
| -rw-r--r-- | sources/pyside6/libpyside/pysidemetafunction.cpp | 10 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/pysidesignal.cpp | 7 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/signalmanager.cpp | 4 |
3 files changed, 10 insertions, 11 deletions
diff --git a/sources/pyside6/libpyside/pysidemetafunction.cpp b/sources/pyside6/libpyside/pysidemetafunction.cpp index 48964749a..218eca4cf 100644 --- a/sources/pyside6/libpyside/pysidemetafunction.cpp +++ b/sources/pyside6/libpyside/pysidemetafunction.cpp @@ -138,19 +138,19 @@ bool call(QObject *self, int methodIndex, PyObject *args, PyObject **retVal) // args given plus return type Shiboken::AutoDecRef sequence(PySequence_Fast(args, nullptr)); - int numArgs = PySequence_Fast_GET_SIZE(sequence.object()) + 1; + qsizetype numArgs = PySequence_Fast_GET_SIZE(sequence.object()) + 1; - if (numArgs - 1 > argTypes.count()) { + if (numArgs - 1 > argTypes.size()) { PyErr_Format(PyExc_TypeError, "%s only accepts %d argument(s), %d given!", method.methodSignature().constData(), - argTypes.count(), numArgs - 1); + argTypes.size(), numArgs - 1); return false; } - if (numArgs - 1 < argTypes.count()) { + if (numArgs - 1 < argTypes.size()) { PyErr_Format(PyExc_TypeError, "%s needs %d argument(s), %d given!", method.methodSignature().constData(), - argTypes.count(), numArgs - 1); + argTypes.size(), numArgs - 1); return false; } diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp index 1c7766fd8..16a91813c 100644 --- a/sources/pyside6/libpyside/pysidesignal.cpp +++ b/sources/pyside6/libpyside/pysidesignal.cpp @@ -1088,7 +1088,7 @@ QStringList getArgsFromSignature(const char *signature, bool *isShortCircuit) QString getCallbackSignature(const char *signal, QObject *receiver, PyObject *callback, bool encodeName) { QByteArray functionName; - int numArgs = -1; + qsizetype numArgs = -1; PyObject *function = nullptr; PepCodeObject *objCode = nullptr; @@ -1140,10 +1140,9 @@ QString getCallbackSignature(const char *signal, QObject *receiver, PyObject *ca if (!isShortCircuit) { signature.append(QLatin1Char('(')); if (numArgs == -1) - numArgs = std::numeric_limits<int>::max(); - while (args.count() && (args.count() > (numArgs - useSelf))) { + numArgs = std::numeric_limits<qsizetype>::max(); + while (!args.isEmpty() && (args.size() > (numArgs - useSelf))) args.removeLast(); - } signature.append(args.join(QLatin1Char(','))); signature.append(QLatin1Char(')')); } diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp index 5fb9b85c1..a3b1ff9b4 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -598,10 +598,10 @@ namespace { static PyObject *parseArguments(const QList<QByteArray>& paramTypes, void **args) { - int argsSize = paramTypes.count(); + const qsizetype argsSize = paramTypes.size(); PyObject *preparedArgs = PyTuple_New(argsSize); - for (int i = 0, max = argsSize; i < max; ++i) { + for (qsizetype i = 0; i < argsSize; ++i) { void *data = args[i+1]; const char *dataType = paramTypes[i].constData(); Shiboken::Conversions::SpecificConverter converter(dataType); |