Use QList instead of QVector in gui

Applied to headers only. Source file to be changed separately.

Task-number: QTBUG-84469
Change-Id: Ic08a899321eaffc46b8461aaee3dbaa4d2c727a9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

5 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h
index cfd180b57a..8c01af2a8f 100644
--- a/src/gui/vulkan/qbasicvulkanplatforminstance_p.h
+++ b/src/gui/vulkan/qbasicvulkanplatforminstance_p.h
@@ -75,10 +75,10 @@ public:
     QByteArrayList enabledExtensions() const override;
     PFN_vkVoidFunction getInstanceProcAddr(const char *name) override;
     bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) override;
-    void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters) override;
+    void setDebugFilters(const QList<QVulkanInstance::DebugFilter> &filters) override;
 
     void destroySurface(VkSurfaceKHR surface) const;
-    const QVector<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
+    const QList<QVulkanInstance::DebugFilter> *debugFilters() const { return &m_debugFilters; }
 
 protected:
     void loadVulkanLibrary(const QString &defaultLibraryName);
@@ -110,7 +110,7 @@ private:
 
     VkDebugReportCallbackEXT m_debugCallback;
     PFN_vkDestroyDebugReportCallbackEXT m_vkDestroyDebugReportCallbackEXT;
-    QVector<QVulkanInstance::DebugFilter> m_debugFilters;
+    QList<QVulkanInstance::DebugFilter> m_debugFilters;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/vulkan/qplatformvulkaninstance.h b/src/gui/vulkan/qplatformvulkaninstance.h
index f96f1720fb..d9c219198f 100644
--- a/src/gui/vulkan/qplatformvulkaninstance.h
+++ b/src/gui/vulkan/qplatformvulkaninstance.h
@@ -79,7 +79,7 @@ public:
     virtual bool supportsPresent(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, QWindow *window) = 0;
     virtual void presentAboutToBeQueued(QWindow *window);
     virtual void presentQueued(QWindow *window);
-    virtual void setDebugFilters(const QVector<QVulkanInstance::DebugFilter> &filters);
+    virtual void setDebugFilters(const QList<QVulkanInstance::DebugFilter> &filters);
 
 private:
     QScopedPointer<QPlatformVulkanInstancePrivate> d_ptr;
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
index 9d7ca783b6..892c4a825f 100644
--- a/src/gui/vulkan/qvulkaninstance.h
+++ b/src/gui/vulkan/qvulkaninstance.h
@@ -64,12 +64,12 @@ typedef void* VkDevice;
 typedef int VkResult;
 #endif
 
+#include <QtCore/qbytearraylist.h>
+#include <QtCore/qdebug.h>
 #include <QtCore/qhashfunctions.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qscopedpointer.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qbytearraylist.h>
 #include <QtCore/qversionnumber.h>
-#include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -132,7 +132,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QVulkanExtension &);
 #endif
 
 template<typename T>
-class QVulkanInfoVector : public QVector<T>
+class QVulkanInfoVector : public QList<T>
 {
 public:
     bool contains(const QByteArray &name) const {
diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h
index e88e6e230e..8ce968d8af 100644
--- a/src/gui/vulkan/qvulkanwindow.h
+++ b/src/gui/vulkan/qvulkanwindow.h
@@ -106,20 +106,20 @@ public:
     void setFlags(Flags flags);
     Flags flags() const;
 
-    QVector<VkPhysicalDeviceProperties> availablePhysicalDevices();
+    QList<VkPhysicalDeviceProperties> availablePhysicalDevices();
     void setPhysicalDeviceIndex(int idx);
 
     QVulkanInfoVector<QVulkanExtension> supportedDeviceExtensions();
     void setDeviceExtensions(const QByteArrayList &extensions);
 
-    void setPreferredColorFormats(const QVector<VkFormat> &formats);
+    void setPreferredColorFormats(const QList<VkFormat> &formats);
 
-    QVector<int> supportedSampleCounts();
+    QList<int> supportedSampleCounts();
     void setSampleCount(int sampleCount);
 
-    typedef std::function<void(const VkQueueFamilyProperties *,
-                               uint32_t,
-                               QVector<VkDeviceQueueCreateInfo> &)> QueueCreateInfoModifier;
+    typedef std::function<void(const VkQueueFamilyProperties *, uint32_t,
+                               QList<VkDeviceQueueCreateInfo> &)>
+            QueueCreateInfoModifier;
     void setQueueCreateInfoModifier(const QueueCreateInfoModifier &modifier);
 
     bool isValid() const;
diff --git a/src/gui/vulkan/qvulkanwindow_p.h b/src/gui/vulkan/qvulkanwindow_p.h
index 41abf977e4..da9b5c9ae4 100644
--- a/src/gui/vulkan/qvulkanwindow_p.h
+++ b/src/gui/vulkan/qvulkanwindow_p.h
@@ -95,12 +95,12 @@ public:
     QVulkanInstance *inst = nullptr;
     VkSurfaceKHR surface = VK_NULL_HANDLE;
     int physDevIndex = 0;
-    QVector<VkPhysicalDevice> physDevs;
-    QVector<VkPhysicalDeviceProperties> physDevProps;
+    QList<VkPhysicalDevice> physDevs;
+    QList<VkPhysicalDeviceProperties> physDevProps;
     QVulkanWindow::Flags flags;
     QByteArrayList requestedDevExtensions;
     QHash<VkPhysicalDevice, QVulkanInfoVector<QVulkanExtension> > supportedDevExtensions;
-    QVector<VkFormat> requestedColorFormats;
+    QList<VkFormat> requestedColorFormats;
     VkSampleCountFlagBits sampleCount = VK_SAMPLE_COUNT_1_BIT;
     QVulkanWindow::QueueCreateInfoModifier queueCreateInfoModifier;