diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-24 12:20:29 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-25 09:54:13 +0200 |
| commit | 1818334beafcf8668b30b8ee63031f871a0c8d03 (patch) | |
| tree | 6d04c661a20e392ad3c214f53cf027f95142e863 /src/gsttools | |
| parent | 2c9a117e49497c55a22621d86d452fa7c22a489b (diff) | |
Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: Id8d07836a66e4d9223341483bfe0ed251ba2806c
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 6 | ||||
| -rw-r--r-- | src/gsttools/qgstutils_p.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index 3f68244ba..5c8d4c90c 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -553,13 +553,13 @@ QMultimedia::SupportEstimate QGstUtils::hasSupport(const QString &mimeType, namespace { -typedef QHash<GstElementFactory *, QVector<QGstUtils::CameraInfo> > FactoryCameraInfoMap; +typedef QHash<GstElementFactory *, QList<QGstUtils::CameraInfo>> FactoryCameraInfoMap; Q_GLOBAL_STATIC(FactoryCameraInfoMap, qt_camera_device_info); } -QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *factory) +QList<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *factory) { static QElapsedTimer camerasCacheAgeTimer; if (camerasCacheAgeTimer.isValid() && camerasCacheAgeTimer.elapsed() > 500) // ms @@ -569,7 +569,7 @@ QVector<QGstUtils::CameraInfo> QGstUtils::enumerateCameras(GstElementFactory *fa if (it != qt_camera_device_info()->constEnd()) return *it; - QVector<CameraInfo> &devices = (*qt_camera_device_info())[factory]; + QList<CameraInfo> &devices = (*qt_camera_device_info())[factory]; if (factory) { bool hasVideoSource = false; diff --git a/src/gsttools/qgstutils_p.h b/src/gsttools/qgstutils_p.h index 5a2feec17..9ecf2e92c 100644 --- a/src/gsttools/qgstutils_p.h +++ b/src/gsttools/qgstutils_p.h @@ -52,9 +52,9 @@ // #include <private/qgsttools_global_p.h> +#include <QtCore/qlist.h> #include <QtCore/qmap.h> #include <QtCore/qset.h> -#include <QtCore/qvector.h> #include <gst/gst.h> #include <gst/video/video.h> #include <qaudioformat.h> @@ -111,7 +111,7 @@ namespace QGstUtils { const QStringList &codecs, const QSet<QString> &supportedMimeTypeSet); - Q_GSTTOOLS_EXPORT QVector<CameraInfo> enumerateCameras(GstElementFactory *factory = 0); + Q_GSTTOOLS_EXPORT QList<CameraInfo> enumerateCameras(GstElementFactory *factory = 0); Q_GSTTOOLS_EXPORT QList<QByteArray> cameraDevices(GstElementFactory * factory = 0); Q_GSTTOOLS_EXPORT QString cameraDescription(const QString &device, GstElementFactory * factory = 0); Q_GSTTOOLS_EXPORT QCamera::Position cameraPosition(const QString &device, GstElementFactory * factory = 0); |