summaryrefslogtreecommitdiff
path: root/src/plugins/generic
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 12:34:58 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2020-07-06 13:43:20 +0200
commit1e25b81e0d6c1da4643c9cc48680f5cc4399d068 (patch)
tree39f7a70e11b6b14382673167b6e183f70e3dc6c5 /src/plugins/generic
parent23b7e7972ea40afd2594d0570cbcf8192619cd56 (diff)
downloadqtbase-1e25b81e0d6c1da4643c9cc48680f5cc4399d068.tar.gz
Use QList instead of QVector in plugins
Task-number: QTBUG-84469 Change-Id: Ic86f4a3000592a1c9ae62e4a83f4fe39832a6b24 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/generic')
-rw-r--r--src/plugins/generic/bsdkeyboard/qbsdkeyboard.h4
-rw-r--r--src/plugins/generic/tuiotouch/qoscmessage_p.h4
-rw-r--r--src/plugins/generic/tuiotouch/qtuiohandler.cpp2
-rw-r--r--src/plugins/generic/tuiotouch/qtuiohandler_p.h6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/generic/bsdkeyboard/qbsdkeyboard.h b/src/plugins/generic/bsdkeyboard/qbsdkeyboard.h
index 46d8988d3a..b74a02bf21 100644
--- a/src/plugins/generic/bsdkeyboard/qbsdkeyboard.h
+++ b/src/plugins/generic/bsdkeyboard/qbsdkeyboard.h
@@ -42,7 +42,7 @@
#include <qobject.h>
#include <QDataStream>
-#include <QVector>
+#include <QList>
QT_BEGIN_NAMESPACE
@@ -137,7 +137,7 @@ private:
bool m_numLock = false;
bool m_scrollLock = false;
- QVector<QBsdKeyboardMap::Mapping> m_keymap;
+ QList<QBsdKeyboardMap::Mapping> m_keymap;
};
QT_END_NAMESPACE
diff --git a/src/plugins/generic/tuiotouch/qoscmessage_p.h b/src/plugins/generic/tuiotouch/qoscmessage_p.h
index 46c6ca3918..f8738c4242 100644
--- a/src/plugins/generic/tuiotouch/qoscmessage_p.h
+++ b/src/plugins/generic/tuiotouch/qoscmessage_p.h
@@ -58,12 +58,12 @@ public:
bool isValid() const { return m_isValid; }
QByteArray addressPattern() const { return m_addressPattern; }
- QList<QVariant> arguments() const { return m_arguments; }
+ QVariantList arguments() const { return m_arguments; }
private:
bool m_isValid;
QByteArray m_addressPattern;
- QList<QVariant> m_arguments;
+ QVariantList m_arguments;
};
Q_DECLARE_TYPEINFO(QOscMessage, Q_MOVABLE_TYPE);
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler.cpp b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
index 1ef50915d8..260dc883af 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler.cpp
+++ b/src/plugins/generic/tuiotouch/qtuiohandler.cpp
@@ -158,7 +158,7 @@ void QTuioHandler::processPackets()
// messages. The FSEQ frame ID is incremented for each delivered bundle,
// while redundant bundles can be marked using the frame sequence ID
// -1."
- QVector<QOscMessage> messages;
+ QList<QOscMessage> messages;
QOscBundle bundle(datagram);
if (bundle.isValid()) {
diff --git a/src/plugins/generic/tuiotouch/qtuiohandler_p.h b/src/plugins/generic/tuiotouch/qtuiohandler_p.h
index 09de1d8536..4145c1eae6 100644
--- a/src/plugins/generic/tuiotouch/qtuiohandler_p.h
+++ b/src/plugins/generic/tuiotouch/qtuiohandler_p.h
@@ -41,10 +41,10 @@
#ifndef QTUIOHANDLER_P_H
#define QTUIOHANDLER_P_H
+#include <QList>
#include <QObject>
#include <QMap>
#include <QUdpSocket>
-#include <QVector>
#include <QTransform>
#include <qpa/qwindowsysteminterface.h>
@@ -83,9 +83,9 @@ private:
QPointingDevice *m_device = nullptr;
QUdpSocket m_socket;
QMap<int, QTuioCursor> m_activeCursors;
- QVector<QTuioCursor> m_deadCursors;
+ QList<QTuioCursor> m_deadCursors;
QMap<int, QTuioToken> m_activeTokens;
- QVector<QTuioToken> m_deadTokens;
+ QList<QTuioToken> m_deadTokens;
QTransform m_transform;
};