diff options
30 files changed, 78 insertions, 81 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp index 9dd3368e0..4eecae835 100644 --- a/examples/multimedia/audiorecorder/audiorecorder.cpp +++ b/examples/multimedia/audiorecorder/audiorecorder.cpp @@ -61,10 +61,10 @@ #include <QStandardPaths> static qreal getPeakValue(const QAudioFormat &format); -static QVector<qreal> getBufferLevels(const QAudioBuffer &buffer); +static QList<qreal> getBufferLevels(const QAudioBuffer &buffer); -template <class T> -static QVector<qreal> getBufferLevels(const T *buffer, int frames, int channels); +template<class T> +static QList<qreal> getBufferLevels(const T *buffer, int frames, int channels); AudioRecorder::AudioRecorder() : ui(new Ui::AudioRecorder) @@ -287,9 +287,9 @@ qreal getPeakValue(const QAudioFormat& format) } // returns the audio level for each channel -QVector<qreal> getBufferLevels(const QAudioBuffer& buffer) +QList<qreal> getBufferLevels(const QAudioBuffer &buffer) { - QVector<qreal> values; + QList<qreal> values; if (!buffer.format().isValid() || buffer.format().byteOrder() != QAudioFormat::LittleEndian) return values; @@ -337,10 +337,10 @@ QVector<qreal> getBufferLevels(const QAudioBuffer& buffer) return values; } -template <class T> -QVector<qreal> getBufferLevels(const T *buffer, int frames, int channels) +template<class T> +QList<qreal> getBufferLevels(const T *buffer, int frames, int channels) { - QVector<qreal> max_values; + QList<qreal> max_values; max_values.fill(0, channels); for (int i = 0; i < frames; ++i) { @@ -366,7 +366,7 @@ void AudioRecorder::processBuffer(const QAudioBuffer& buffer) } } - QVector<qreal> levels = getBufferLevels(buffer); + QList<qreal> levels = getBufferLevels(buffer); for (int i = 0; i < levels.count(); ++i) m_audioLevels.at(i)->setLevel(levels.at(i)); } diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h index ff56d7c8b..714af4d9d 100644 --- a/examples/multimedia/spectrum/app/engine.h +++ b/examples/multimedia/spectrum/app/engine.h @@ -60,8 +60,8 @@ #include <QBuffer> #include <QByteArray> #include <QDir> +#include <QList> #include <QObject> -#include <QVector> #ifdef DUMP_CAPTURED_AUDIO #define DUMP_DATA diff --git a/examples/multimedia/spectrum/app/frequencyspectrum.h b/examples/multimedia/spectrum/app/frequencyspectrum.h index 82206de84..4b13cbb99 100644 --- a/examples/multimedia/spectrum/app/frequencyspectrum.h +++ b/examples/multimedia/spectrum/app/frequencyspectrum.h @@ -51,7 +51,7 @@ #ifndef FREQUENCYSPECTRUM_H #define FREQUENCYSPECTRUM_H -#include <QtCore/QVector> +#include <QtCore/QList> /** * Represents a frequency spectrum as a series of elements, each of which @@ -87,8 +87,8 @@ public: bool clipped; }; - typedef QVector<Element>::iterator iterator; - typedef QVector<Element>::const_iterator const_iterator; + typedef QList<Element>::iterator iterator; + typedef QList<Element>::const_iterator const_iterator; void reset(); @@ -101,8 +101,7 @@ public: const_iterator end() const; private: - QVector<Element> m_elements; - + QList<Element> m_elements; }; #endif // FREQUENCYSPECTRUM_H diff --git a/examples/multimedia/spectrum/app/spectrograph.cpp b/examples/multimedia/spectrum/app/spectrograph.cpp index 7a5305435..04ef51e80 100644 --- a/examples/multimedia/spectrum/app/spectrograph.cpp +++ b/examples/multimedia/spectrum/app/spectrograph.cpp @@ -125,7 +125,7 @@ void Spectrograph::paintEvent(QPaintEvent *event) painter.drawLine(rect().bottomRight(), rect().bottomLeft()); painter.drawLine(rect().bottomLeft(), rect().topLeft()); - QVector<qreal> dashes; + QList<qreal> dashes; dashes << 2 << 2; gridPen.setDashPattern(dashes); painter.setPen(gridPen); diff --git a/examples/multimedia/spectrum/app/spectrograph.h b/examples/multimedia/spectrum/app/spectrograph.h index 0ef6dadd2..0e7b11717 100644 --- a/examples/multimedia/spectrum/app/spectrograph.h +++ b/examples/multimedia/spectrum/app/spectrograph.h @@ -97,7 +97,7 @@ private: bool clipped; }; - QVector<Bar> m_bars; + QList<Bar> m_bars; int m_barSelected; int m_timerId; qreal m_lowFreq; diff --git a/examples/multimedia/spectrum/app/spectrumanalyser.h b/examples/multimedia/spectrum/app/spectrumanalyser.h index ebebfcd9f..799143489 100644 --- a/examples/multimedia/spectrum/app/spectrumanalyser.h +++ b/examples/multimedia/spectrum/app/spectrumanalyser.h @@ -53,7 +53,7 @@ #include <QByteArray> #include <QObject> -#include <QVector> +#include <QList> #ifdef DUMP_SPECTRUMANALYSER #include <QDir> @@ -113,10 +113,10 @@ private: #else typedef FFTRealFixLenParam::DataType DataType; #endif - QVector<DataType> m_window; + QList<DataType> m_window; - QVector<DataType> m_input; - QVector<DataType> m_output; + QList<DataType> m_input; + QList<DataType> m_output; FrequencySpectrum m_spectrum; diff --git a/examples/multimedia/spectrum/app/waveform.cpp b/examples/multimedia/spectrum/app/waveform.cpp index d0058b2e3..3e7462157 100644 --- a/examples/multimedia/spectrum/app/waveform.cpp +++ b/examples/multimedia/spectrum/app/waveform.cpp @@ -435,7 +435,7 @@ void Waveform::resetTiles(qint64 newStartPos) { WAVEFORM_DEBUG << "Waveform::resetTiles" << "newStartPos" << newStartPos; - QVector<Tile>::iterator i = m_tiles.begin(); + QList<Tile>::iterator i = m_tiles.begin(); for ( ; i != m_tiles.end(); ++i) i->painted = false; diff --git a/examples/multimedia/spectrum/app/waveform.h b/examples/multimedia/spectrum/app/waveform.h index 194681fff..8c26e99b2 100644 --- a/examples/multimedia/spectrum/app/waveform.h +++ b/examples/multimedia/spectrum/app/waveform.h @@ -187,7 +187,7 @@ private: bool m_active; QSize m_pixmapSize; - QVector<QPixmap*> m_pixmaps; + QList<QPixmap*> m_pixmaps; struct Tile { // Pointer into parent m_pixmaps array @@ -197,7 +197,7 @@ private: bool painted; }; - QVector<Tile> m_tiles; + QList<Tile> m_tiles; // Length of audio data in bytes depicted by each tile qint64 m_tileLength; diff --git a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp index cf2fcbd7b..255c0b61b 100644 --- a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp +++ b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp @@ -157,7 +157,7 @@ CLFilterRunnable::CLFilterRunnable(CLFilter *filter) : qWarning("No OpenCL platform found"); return; } - QVector<cl_platform_id> platformIds; + QList<cl_platform_id> platformIds; platformIds.resize(n); if (clGetPlatformIDs(n, platformIds.data(), 0) != CL_SUCCESS) { qWarning("Failed to get platform IDs"); diff --git a/examples/multimediawidgets/player/histogramwidget.cpp b/examples/multimediawidgets/player/histogramwidget.cpp index a0de8516a..bb214cad5 100644 --- a/examples/multimediawidgets/player/histogramwidget.cpp +++ b/examples/multimediawidgets/player/histogramwidget.cpp @@ -52,8 +52,8 @@ #include <QPainter> #include <QHBoxLayout> -template <class T> -static QVector<qreal> getBufferLevels(const T *buffer, int frames, int channels); +template<class T> +static QList<qreal> getBufferLevels(const T *buffer, int frames, int channels); class QAudioLevel : public QWidget { @@ -102,7 +102,7 @@ HistogramWidget::HistogramWidget(QWidget *parent) : QWidget(parent) { m_processor.moveToThread(&m_processorThread); - qRegisterMetaType<QVector<qreal>>("QVector<qreal>"); + qRegisterMetaType<QList<qreal>>("QList<qreal>"); connect(&m_processor, &FrameProcessor::histogramReady, this, &HistogramWidget::setHistogram); m_processorThread.start(QThread::LowestPriority); setLayout(new QHBoxLayout); @@ -163,9 +163,9 @@ qreal getPeakValue(const QAudioFormat& format) } // returns the audio level for each channel -QVector<qreal> getBufferLevels(const QAudioBuffer& buffer) +QList<qreal> getBufferLevels(const QAudioBuffer &buffer) { - QVector<qreal> values; + QList<qreal> values; if (!buffer.isValid()) return values; @@ -216,10 +216,10 @@ QVector<qreal> getBufferLevels(const QAudioBuffer& buffer) return values; } -template <class T> -QVector<qreal> getBufferLevels(const T *buffer, int frames, int channels) +template<class T> +QList<qreal> getBufferLevels(const T *buffer, int frames, int channels) { - QVector<qreal> max_values; + QList<qreal> max_values; max_values.fill(0, channels); for (int i = 0; i < frames; ++i) { @@ -245,12 +245,12 @@ void HistogramWidget::processBuffer(const QAudioBuffer &buffer) } } - QVector<qreal> levels = getBufferLevels(buffer); + QList<qreal> levels = getBufferLevels(buffer); for (int i = 0; i < levels.count(); ++i) m_audioLevels.at(i)->setLevel(levels.at(i)); } -void HistogramWidget::setHistogram(const QVector<qreal> &histogram) +void HistogramWidget::setHistogram(const QList<qreal> &histogram) { m_isBusy = false; m_histogram = histogram; @@ -284,7 +284,7 @@ void HistogramWidget::paintEvent(QPaintEvent *event) void FrameProcessor::processFrame(QVideoFrame frame, int levels) { - QVector<qreal> histogram(levels); + QList<qreal> histogram(levels); do { if (!levels) diff --git a/examples/multimediawidgets/player/histogramwidget.h b/examples/multimediawidgets/player/histogramwidget.h index a5c697dfb..08ba4f342 100644 --- a/examples/multimediawidgets/player/histogramwidget.h +++ b/examples/multimediawidgets/player/histogramwidget.h @@ -66,7 +66,7 @@ public slots: void processFrame(QVideoFrame frame, int levels); signals: - void histogramReady(const QVector<qreal> &histogram); + void histogramReady(const QList<qreal> &histogram); }; class HistogramWidget : public QWidget @@ -81,18 +81,18 @@ public: public slots: void processFrame(const QVideoFrame &frame); void processBuffer(const QAudioBuffer &buffer); - void setHistogram(const QVector<qreal> &histogram); + void setHistogram(const QList<qreal> &histogram); protected: void paintEvent(QPaintEvent *event) override; private: - QVector<qreal> m_histogram; + QList<qreal> m_histogram; int m_levels = 128; FrameProcessor m_processor; QThread m_processorThread; bool m_isBusy = false; - QVector<QAudioLevel *> m_audioLevels; + QList<QAudioLevel *> m_audioLevels; }; #endif // HISTOGRAMWIDGET_H 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); diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp index fcba6257d..75b39e19c 100644 --- a/src/imports/multimedia/qdeclarativeaudio.cpp +++ b/src/imports/multimedia/qdeclarativeaudio.cpp @@ -164,7 +164,7 @@ void QDeclarativeAudio::setVideoOutput(const QVariant &v) if (surface) { m_player->setVideoOutput(surface); } else { - QVector<QAbstractVideoSurface *> surfaces; + QList<QAbstractVideoSurface *> surfaces; // Check if it is an array. auto arr = v.value<QJSValue>(); if (!arr.isNull()) { diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index e339980a2..977c02e69 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -1161,7 +1161,7 @@ void QMediaPlayer::setVideoOutput(QAbstractVideoSurface *surface) \sa QAbstractVideoSurface::supportedPixelFormats */ -void QMediaPlayer::setVideoOutput(const QVector<QAbstractVideoSurface *> &surfaces) +void QMediaPlayer::setVideoOutput(const QList<QAbstractVideoSurface *> &surfaces) { setVideoOutput(!surfaces.empty() ? new QVideoSurfaces(surfaces, this) : nullptr); } diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index decc61511..66a60b508 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -130,7 +130,7 @@ public: void setVideoOutput(QVideoWidget *); void setVideoOutput(QGraphicsVideoItem *); void setVideoOutput(QAbstractVideoSurface *surface); - void setVideoOutput(const QVector<QAbstractVideoSurface *> &surfaces); + void setVideoOutput(const QList<QAbstractVideoSurface *> &surfaces); QMediaContent media() const; const QIODevice *mediaStream() const; diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index 7840eda31..961028024 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -44,11 +44,10 @@ #include "qvideoframeconversionhelper_p.h" #include <qimage.h> +#include <qmutex.h> #include <qpair.h> #include <qsize.h> #include <qvariant.h> -#include <qvector.h> -#include <qmutex.h> #include <QDebug> diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp index 77ea276c7..400352b50 100644 --- a/src/multimedia/video/qvideosurfaceformat.cpp +++ b/src/multimedia/video/qvideosurfaceformat.cpp @@ -40,10 +40,10 @@ #include "qvideosurfaceformat.h" #include <qdebug.h> +#include <qlist.h> #include <qmetatype.h> #include <qpair.h> #include <qvariant.h> -#include <qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/video/qvideosurfaces.cpp b/src/multimedia/video/qvideosurfaces.cpp index 793879382..7ce1bd932 100644 --- a/src/multimedia/video/qvideosurfaces.cpp +++ b/src/multimedia/video/qvideosurfaces.cpp @@ -41,9 +41,8 @@ QT_BEGIN_NAMESPACE -QVideoSurfaces::QVideoSurfaces(const QVector<QAbstractVideoSurface *> &s, QObject *parent) - : QAbstractVideoSurface(parent) - , m_surfaces(s) +QVideoSurfaces::QVideoSurfaces(const QList<QAbstractVideoSurface *> &s, QObject *parent) + : QAbstractVideoSurface(parent), m_surfaces(s) { for (auto a : s) { connect(a, &QAbstractVideoSurface::supportedFormatsChanged, this, [this, a] { diff --git a/src/multimedia/video/qvideosurfaces_p.h b/src/multimedia/video/qvideosurfaces_p.h index 67831e74e..9074ba458 100644 --- a/src/multimedia/video/qvideosurfaces_p.h +++ b/src/multimedia/video/qvideosurfaces_p.h @@ -52,14 +52,14 @@ // #include <QAbstractVideoSurface> -#include <QVector> +#include <QList> QT_BEGIN_NAMESPACE class QVideoSurfaces : public QAbstractVideoSurface { public: - QVideoSurfaces(const QVector<QAbstractVideoSurface *> &surfaces, QObject *parent = nullptr); + QVideoSurfaces(const QList<QAbstractVideoSurface *> &surfaces, QObject *parent = nullptr); ~QVideoSurfaces(); QList<QVideoFrame::PixelFormat> supportedPixelFormats(QAbstractVideoBuffer::HandleType type) const override; @@ -68,7 +68,7 @@ public: bool present(const QVideoFrame &frame) override; private: - QVector<QAbstractVideoSurface *> m_surfaces; + QList<QAbstractVideoSurface *> m_surfaces; Q_DISABLE_COPY(QVideoSurfaces) }; 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; }; diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index ec520e901..b0d84b836 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -1409,7 +1409,7 @@ void tst_QMediaPlayerBackend::multipleSurfaces() surface2.setSupportedFormats(formats2); QMediaPlayer player; - player.setVideoOutput(QVector<QAbstractVideoSurface *>() << &surface1 << &surface2); + player.setVideoOutput(QList<QAbstractVideoSurface *>() << &surface1 << &surface2); player.setMedia(localVideoFile); player.play(); QTRY_VERIFY(player.position() >= 1000); diff --git a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h index 197d4c0f0..9242dae06 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h @@ -59,7 +59,7 @@ private: bool active; }; - QVector<Stream> _streams; + QList<Stream> _streams; }; #endif // MOCKMEDIASTREAMSCONTROL_H |