From 77bb50de8f3f7defe1329e6c4a6e066d510afc55 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Mon, 6 Jul 2020 13:13:05 +0200
Subject: Use QList instead of QVector in qtbase

Fixes all other QVector occurrences

Task-number: QTBUG-84469
Change-Id: I5f9311298d341a9a3061a6a640539583d1618939
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 src/sql/kernel/qsqlcachedresult.cpp | 3 +--
 src/sql/kernel/qsqlindex.h          | 2 +-
 src/sql/kernel/qsqlquery.cpp        | 5 ++---
 src/sql/kernel/qsqlrecord.cpp       | 6 +++---
 src/sql/kernel/qsqlresult.cpp       | 8 ++++----
 5 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/sql/kernel')

diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index 1e76154f82..8f387c6083 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -39,9 +39,8 @@
 
 #include "private/qsqlcachedresult_p.h"
 
-#include <qvariant.h>
 #include <qdatetime.h>
-#include <qvector.h>
+#include <qvariant.h>
 #include <QtSql/private/qsqldriver_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h
index b704cef685..a051b4c118 100644
--- a/src/sql/kernel/qsqlindex.h
+++ b/src/sql/kernel/qsqlindex.h
@@ -42,8 +42,8 @@
 
 #include <QtSql/qtsqlglobal.h>
 #include <QtSql/qsqlrecord.h>
+#include <QtCore/qlist.h>
 #include <QtCore/qstring.h>
-#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index 1e848f4168..8a3c50ac64 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -41,16 +41,15 @@
 
 //#define QT_DEBUG_SQL
 
+#include "qatomic.h"
 #include "qdebug.h"
 #include "qelapsedtimer.h"
-#include "qatomic.h"
+#include "qmap.h"
 #include "qsqlrecord.h"
 #include "qsqlresult.h"
 #include "qsqldriver.h"
 #include "qsqldatabase.h"
 #include "private/qsqlnulldriver_p.h"
-#include "qvector.h"
-#include "qmap.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index 0afeafe416..5f4a4a8ab1 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -39,12 +39,12 @@
 
 #include "qsqlrecord.h"
 
-#include "qdebug.h"
-#include "qstringlist.h"
 #include "qatomic.h"
+#include "qdebug.h"
+#include "qlist.h"
 #include "qsqlfield.h"
 #include "qstring.h"
-#include "qvector.h"
+#include "qstringlist.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 067afd9448..f3ab4c10cf 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -39,15 +39,15 @@
 
 #include "qsqlresult.h"
 
-#include "qvariant.h"
 #include "qhash.h"
+#include "qlist.h"
+#include "qpointer.h"
+#include "qsqldriver.h"
 #include "qsqlerror.h"
 #include "qsqlfield.h"
 #include "qsqlrecord.h"
-#include "qvector.h"
-#include "qsqldriver.h"
-#include "qpointer.h"
 #include "qsqlresult_p.h"
+#include "qvariant.h"
 #include "private/qsqldriver_p.h"
 #include <QDebug>
 
-- 
cgit v1.2.3