diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 11:06:12 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 22:30:59 +0200 |
commit | 0475460102411979ab51c365cb2bec2c05b69cb4 (patch) | |
tree | 73b7dbe85249da2bd339cd19b0c584894d3901c7 /src/corelib/kernel | |
parent | e114e580e751b5deb19ab489a8b11f830ff6356f (diff) |
Use QList instead of QVector in corelib
Applied to headers only. Source file to be changed separately.
Omitted statemachine for now to avoid conflicts.
Omitted qmetatype.h for now - to be handled later.
Task-number: QTBUG-84469
Change-Id: I317376037a62467c313467d92955ad0b7473aa97
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcorecmdlineargs_p.h | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix_p.h | 4 | ||||
-rw-r--r-- | src/corelib/kernel/qobject_p.h | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index b9f1ef6317..849d72901d 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -60,7 +60,6 @@ # include <qt_windows.h> // first to suppress min, max macros. # include <shlobj.h> # else -# include "QtCore/qvector.h" # include <qt_windows.h> # endif diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 581df9242c..5757cc764c 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -141,10 +141,10 @@ public: void setSocketNotifierPending(QSocketNotifier *notifier); QThreadPipe threadPipe; - QVector<pollfd> pollfds; + QList<pollfd> pollfds; QHash<int, QSocketNotifierSetUNIX> socketNotifiers; - QVector<QSocketNotifier *> pendingNotifiers; + QList<QSocketNotifier *> pendingNotifiers; QTimerInfoList timerList; QAtomicInt interrupt; // bool diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index ae6e4d3452..d3285b292f 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -53,14 +53,13 @@ // #include <QtCore/private/qglobal_p.h> +#include "QtCore/qcoreevent.h" +#include "QtCore/qlist.h" #include "QtCore/qobject.h" #include "QtCore/qpointer.h" +#include "QtCore/qreadwritelock.h" #include "QtCore/qsharedpointer.h" -#include "QtCore/qcoreevent.h" -#include "QtCore/qlist.h" -#include "QtCore/qvector.h" #include "QtCore/qvariant.h" -#include "QtCore/qreadwritelock.h" QT_BEGIN_NAMESPACE @@ -105,8 +104,8 @@ public: { ExtraData() {} QList<QByteArray> propertyNames; - QVector<QVariant> propertyValues; - QVector<int> runningTimers; + QList<QVariant> propertyValues; + QList<int> runningTimers; QList<QPointer<QObject> > eventFilters; QString objectName; }; |