diff options
Diffstat (limited to 'src/plugins')
8 files changed, 22 insertions, 22 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp index 1c7003020..de7a3aab1 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp @@ -43,8 +43,8 @@ #include <QtMultimedia/qmediametadata.h> #include <qsize.h> #include <QDate> +#include <QtCore/qlist.h> #include <QtConcurrent/qtconcurrentrun.h> -#include <QtCore/qvector.h> QT_BEGIN_NAMESPACE @@ -71,7 +71,7 @@ static const char* qt_ID3GenreNames[] = "Euro-House", "Dance Hall" }; -typedef QVector<QAndroidMetaDataReaderControl *> AndroidMetaDataReaders; +typedef QList<QAndroidMetaDataReaderControl *> AndroidMetaDataReaders; Q_GLOBAL_STATIC(AndroidMetaDataReaders, g_metaDataReaders) Q_GLOBAL_STATIC(QMutex, g_metaDataReadersMtx) diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp index de8422b86..0018a250c 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp @@ -43,11 +43,11 @@ #include <QtCore/private/qjni_p.h> #include <QtCore/private/qjnihelpers_p.h> #include "androidsurfacetexture.h" -#include <QVector> +#include <QList> #include <QReadWriteLock> static const char QtAndroidMediaPlayerClassName[] = "org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer"; -typedef QVector<AndroidMediaPlayer *> MediaPlayerList; +typedef QList<AndroidMediaPlayer *> MediaPlayerList; Q_GLOBAL_STATIC(MediaPlayerList, mediaPlayers) Q_GLOBAL_STATIC(QReadWriteLock, rwLock) diff --git a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp index 764315acd..966c2017c 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp +++ b/src/plugins/android/src/wrappers/jni/androidsurfacetexture.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE static const char QtSurfaceTextureListenerClassName[] = "org/qtproject/qt5/android/multimedia/QtSurfaceTextureListener"; -typedef QVector<jlong> SurfaceTextures; +typedef QList<jlong> SurfaceTextures; Q_GLOBAL_STATIC(SurfaceTextures, g_surfaceTextures); Q_GLOBAL_STATIC(QMutex, g_textureMutex); diff --git a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp index 6eec85171..3e8ad66e1 100644 --- a/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp +++ b/src/plugins/android/src/wrappers/jni/androidsurfaceview.cpp @@ -41,15 +41,15 @@ #include <QtCore/private/qjnihelpers_p.h> #include <QtCore/qcoreapplication.h> -#include <QtCore/qvector.h> #include <QtCore/qdebug.h> +#include <QtCore/qlist.h> #include <QtCore/qmutex.h> #include <QtGui/qwindow.h> QT_BEGIN_NAMESPACE static const char QtSurfaceHolderCallbackClassName[] = "org/qtproject/qt5/android/multimedia/QtSurfaceHolderCallback"; -typedef QVector<AndroidSurfaceHolder *> SurfaceHolders; +typedef QList<AndroidSurfaceHolder *> SurfaceHolders; Q_GLOBAL_STATIC(SurfaceHolders, surfaceHolders) Q_GLOBAL_STATIC(QMutex, shLock) diff --git a/src/plugins/avfoundation/camera/avfcamerautility.h b/src/plugins/avfoundation/camera/avfcamerautility.h index 33956fc8a..2e8bf39b4 100644 --- a/src/plugins/avfoundation/camera/avfcamerautility.h +++ b/src/plugins/avfoundation/camera/avfcamerautility.h @@ -41,10 +41,10 @@ #define AVFCAMERAUTILITY_H #include <QtCore/qglobal.h> -#include <QtCore/qvector.h> #include <QtCore/qdebug.h> -#include <QtCore/qsize.h> +#include <QtCore/qlist.h> #include <QtCore/qpair.h> +#include <QtCore/qsize.h> #include <AVFoundation/AVFoundation.h> @@ -154,12 +154,12 @@ private: typedef QPair<qreal, qreal> AVFPSRange; AVFPSRange qt_connection_framerates(AVCaptureConnection *videoConnection); -QVector<AVCaptureDeviceFormat *> qt_unique_device_formats(AVCaptureDevice *captureDevice, - FourCharCode preferredFormat); +QList<AVCaptureDeviceFormat *> qt_unique_device_formats(AVCaptureDevice *captureDevice, + FourCharCode preferredFormat); QSize qt_device_format_resolution(AVCaptureDeviceFormat *format); QSize qt_device_format_high_resolution(AVCaptureDeviceFormat *format); QSize qt_device_format_pixel_aspect_ratio(AVCaptureDeviceFormat *format); -QVector<AVFPSRange> qt_device_format_framerates(AVCaptureDeviceFormat *format); +QList<AVFPSRange> qt_device_format_framerates(AVCaptureDeviceFormat *format); AVCaptureDeviceFormat *qt_find_best_resolution_match(AVCaptureDevice *captureDevice, const QSize &res, FourCharCode preferredFormat, bool stillImage = true); AVCaptureDeviceFormat *qt_find_best_framerate_match(AVCaptureDevice *captureDevice, diff --git a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h index 588aa7b74..7cd59117f 100644 --- a/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h +++ b/src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h @@ -80,7 +80,7 @@ private: void setFramerate(qreal minFPS, qreal maxFPS, bool useActive); void setPixelFormat(QVideoFrame::PixelFormat newFormat); AVCaptureDeviceFormat *findBestFormatMatch(const QCameraViewfinderSettings &settings) const; - QVector<QVideoFrame::PixelFormat> viewfinderPixelFormats() const; + QList<QVideoFrame::PixelFormat> viewfinderPixelFormats() const; bool convertPixelFormatIfSupported(QVideoFrame::PixelFormat format, unsigned &avfFormat) const; bool applySettings(const QCameraViewfinderSettings &settings); QCameraViewfinderSettings requestedSettings() const; diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp index d4e7fa699..20d55d7d3 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.cpp @@ -382,7 +382,7 @@ void CameraBinFocus::resetFocusPoint() m_focusPoint = QPointF(0.5, 0.5); m_focusRect.moveCenter(m_focusPoint); - updateRegionOfInterest(QVector<QRect>()); + updateRegionOfInterest(QList<QRect>()); if (focusRect != m_focusRect) { emit customFocusPointChanged(m_focusPoint); @@ -412,14 +412,14 @@ static void appendRegion(GValue *regions, int priority, const QRect &rectangle) void CameraBinFocus::updateRegionOfInterest(const QRectF &rectangle) { - updateRegionOfInterest(QVector<QRect>() << QRect( + updateRegionOfInterest(QList<QRect>() << QRect( rectangle.x() * m_viewfinderResolution.width(), rectangle.y() * m_viewfinderResolution.height(), rectangle.width() * m_viewfinderResolution.width(), rectangle.height() * m_viewfinderResolution.height())); } -void CameraBinFocus::updateRegionOfInterest(const QVector<QRect> &rectangles) +void CameraBinFocus::updateRegionOfInterest(const QList<QRect> &rectangles) { if (m_cameraStatus != QCamera::ActiveStatus) return; @@ -473,7 +473,7 @@ void CameraBinFocus::_q_updateFaces() return; } - QVector<QRect> faces; + QList<QRect> faces; { QMutexLocker locker(&m_mutex); @@ -507,7 +507,7 @@ void CameraBinFocus::timerEvent(QTimerEvent *event) bool CameraBinFocus::probeBuffer(GstBuffer *buffer) { - QVector<QRect> faces; + QList<QRect> faces; #if GST_CHECK_VERSION(1,1,3) gpointer state = NULL; diff --git a/src/plugins/gstreamer/camerabin/camerabinfocus.h b/src/plugins/gstreamer/camerabin/camerabinfocus.h index 72a5006f9..0fca02c35 100644 --- a/src/plugins/gstreamer/camerabin/camerabinfocus.h +++ b/src/plugins/gstreamer/camerabin/camerabinfocus.h @@ -46,8 +46,8 @@ #include <private/qgstreamerbufferprobe_p.h> #include <qbasictimer.h> +#include <qlist.h> #include <qmutex.h> -#include <qvector.h> #include <gst/gst.h> #include <glib.h> @@ -108,7 +108,7 @@ private Q_SLOTS: private: void resetFocusPoint(); void updateRegionOfInterest(const QRectF &rectangle); - void updateRegionOfInterest(const QVector<QRect> &rectangles); + void updateRegionOfInterest(const QList<QRect> &rectangles); #if GST_CHECK_VERSION(1,0,0) bool probeBuffer(GstBuffer *buffer) override; @@ -123,8 +123,8 @@ private: QPointF m_focusPoint; QRectF m_focusRect; QSize m_viewfinderResolution; - QVector<QRect> m_faces; - QVector<QRect> m_faceFocusRects; + QList<QRect> m_faces; + QList<QRect> m_faceFocusRects; QBasicTimer m_faceResetTimer; mutable QMutex m_mutex; }; |