aboutsummaryrefslogtreecommitdiffstats
path: root/src/webchannel/signalhandler_p.h
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-06-29 12:40:43 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-06-29 15:37:26 +0200
commit4ac9e1d7e6a9490c9eb8b3b5d60de441b1708882 (patch)
treefd71167c749c1e0074844e9fcba27d343454d8dd /src/webchannel/signalhandler_p.h
parente778518ee72e743009e6c628bd523e35f8aedac1 (diff)
Use QList instead of QVector
Task-number: QTBUG-84469 Change-Id: Ide3fa7a558b456354703dd7fd5ee414647e24934 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/webchannel/signalhandler_p.h')
-rw-r--r--src/webchannel/signalhandler_p.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/webchannel/signalhandler_p.h b/src/webchannel/signalhandler_p.h
index 27afadb..8f8c349 100644
--- a/src/webchannel/signalhandler_p.h
+++ b/src/webchannel/signalhandler_p.h
@@ -53,7 +53,7 @@
#include <QObject>
#include <QHash>
-#include <QVector>
+#include <QList>
#include <QMetaMethod>
#include <QDebug>
@@ -121,7 +121,7 @@ private:
// maps meta object -> signalIndex -> list of arguments
// NOTE: This data is "leaked" on disconnect until deletion of the handler, is this a problem?
- typedef QVector<int> ArgumentTypeList;
+ typedef QList<int> ArgumentTypeList;
typedef QHash<int, ArgumentTypeList> SignalArgumentHash;
QHash<const QMetaObject *, SignalArgumentHash > m_signalArgumentTypes;
@@ -202,7 +202,7 @@ void SignalHandler<Receiver>::setupSignalArgumentTypes(const QMetaObject *metaOb
return;
}
// find the type ids of the signal parameters, see also QSignalSpy::initArgs
- QVector<int> args;
+ QList<int> args;
args.reserve(signal.parameterCount());
for (int i = 0; i < signal.parameterCount(); ++i) {
int tp = signal.parameterType(i);
@@ -220,13 +220,13 @@ template<class Receiver>
void SignalHandler<Receiver>::dispatch(const QObject *object, const int signalIdx, void **argumentData)
{
Q_ASSERT(m_signalArgumentTypes.contains(object->metaObject()));
- const QHash<int, QVector<int> > &objectSignalArgumentTypes = m_signalArgumentTypes.value(object->metaObject());
- QHash<int, QVector<int> >::const_iterator signalIt = objectSignalArgumentTypes.constFind(signalIdx);
+ const QHash<int, QList<int>> &objectSignalArgumentTypes = m_signalArgumentTypes.value(object->metaObject());
+ QHash<int, QList<int>>::const_iterator signalIt = objectSignalArgumentTypes.constFind(signalIdx);
if (signalIt == objectSignalArgumentTypes.constEnd()) {
// not connected to this signal, skip
return;
}
- const QVector<int> &argumentTypes = *signalIt;
+ const QList<int> &argumentTypes = *signalIt;
QVariantList arguments;
arguments.reserve(argumentTypes.count());
// TODO: basic overload resolution based on number of arguments?