diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 5 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 2 | ||||
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 6 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index a0fbf97838..524dd5b25b 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -41,7 +41,6 @@ #include "qcoreapplication.h" #include "qcoreapplication_p.h" #include "qstringlist.h" -#include "qvector.h" #include "qfileinfo.h" #include "qcorecmdlineargs_p.h" #ifndef QT_NO_QOBJECT diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 7d278c69f2..f845eb37ed 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -43,7 +43,6 @@ #include "qlist.h" #include "qsemaphore.h" #include "qsharedpointer.h" -#include "qvector.h" #include "qthread.h" #include "qcoreapplication.h" #include <QtCore/qrunnable.h> @@ -119,7 +118,7 @@ static void runPendingCppRunnables(JNIEnv */*env*/, jobject /*obj*/) namespace { struct GenericMotionEventListeners { QMutex mutex; - QVector<QtAndroidPrivate::GenericMotionEventListener *> listeners; + QList<QtAndroidPrivate::GenericMotionEventListener *> listeners; }; enum { @@ -168,7 +167,7 @@ static jboolean dispatchGenericMotionEvent(JNIEnv *, jclass, jobject event) namespace { struct KeyEventListeners { QMutex mutex; - QVector<QtAndroidPrivate::KeyEventListener *> listeners; + QList<QtAndroidPrivate::KeyEventListener *> listeners; }; } Q_GLOBAL_STATIC(KeyEventListeners, g_keyEventListeners) diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 1902b5e360..b418cd2dab 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -196,7 +196,7 @@ public: bool isFlag; bool isScoped; QList<QByteArray> keys; - QVector<int> values; + QList<int> values; }; Q_DECLARE_TYPEINFO(QMetaEnumBuilderPrivate, Q_MOVABLE_TYPE); diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 61515f7ea5..9841758c80 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -45,7 +45,7 @@ #include "qreadwritelock.h" #include "qstring.h" #include "qstringlist.h" -#include "qvector.h" +#include "qlist.h" #include "qlocale.h" #if QT_CONFIG(easingcurve) #include "qeasingcurve.h" @@ -103,7 +103,7 @@ struct DefinedTypesFilter { struct QMetaTypeCustomRegistry { QReadWriteLock lock; - QVector<QtPrivate::QMetaTypeInterface *> registry; + QList<QtPrivate::QMetaTypeInterface *> registry; QHash<QByteArray, QtPrivate::QMetaTypeInterface *> aliases; #ifndef QT_NO_DATASTREAM struct DataStreamOps @@ -237,7 +237,7 @@ Q_GLOBAL_STATIC(QMetaTypeCustomRegistry, customTypeRegistry) \list \li Pointers to classes derived from QObject - \li QList<T>, QVector<T>, QQueue<T>, QStack<T> or QSet<T> + \li QList<T>, QQueue<T>, QStack<T> or QSet<T> where T is a registered meta type \li QHash<T1, T2>, QMap<T1, T2> or QPair<T1, T2> where T1 and T2 are registered meta types |