aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-12 09:55:49 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-15 11:15:54 +0100
commit9045e2b2c4de9427a9d97f6a270bb844f8ad8da7 (patch)
tree9b0d02c409175f6ef0ba4ac756c63622bd8ac0b9
parent8a792c5d793d90f49d0cc3cbdb348545184aa0f2 (diff)
shiboken: Remove more usages of QList
The class will be deprecated in Qt 6. Change-Id: Iafafca43615fc8035ac532afb9dcb18f7ab6ce92 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h3
-rw-r--r--sources/shiboken2/ApiExtractor/header_paths.h4
-rw-r--r--sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp6
3 files changed, 7 insertions, 6 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
index 30df236d6..b381a62cd 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder_p.h
@@ -37,6 +37,7 @@
#include <QSet>
#include <QFileInfo>
+#include <QVector>
class TypeDatabase;
@@ -187,7 +188,7 @@ public:
QHash<const TypeEntry *, AbstractMetaEnum *> m_enums;
- QList<NamespaceModelItem> m_scopes;
+ QVector<NamespaceModelItem> m_scopes;
QSet<AbstractMetaClass *> m_setupInheritanceDone;
diff --git a/sources/shiboken2/ApiExtractor/header_paths.h b/sources/shiboken2/ApiExtractor/header_paths.h
index 0c25702ef..c9b5144c8 100644
--- a/sources/shiboken2/ApiExtractor/header_paths.h
+++ b/sources/shiboken2/ApiExtractor/header_paths.h
@@ -30,7 +30,7 @@
#define HEADER_PATHS_H
#include <QByteArray>
-#include <QList>
+#include <QVector>
#include <QString>
enum class HeaderType
@@ -67,6 +67,6 @@ public:
}
};
-using HeaderPaths = QList<HeaderPath>;
+using HeaderPaths = QVector<HeaderPath>;
#endif // HEADER_PATHS_H
diff --git a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
index 86abf21b0..672148d64 100644
--- a/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
+++ b/sources/shiboken2/generator/qtdoc/qtdocgenerator.cpp
@@ -438,15 +438,15 @@ QString QtXmlToSphinx::resolveContextForMethod(const QString& methodName) const
}
if (metaClass) {
- QList<const AbstractMetaFunction*> funcList;
+ AbstractMetaFunctionList funcList;
const AbstractMetaFunctionList &methods = metaClass->queryFunctionsByName(methodName);
- for (const AbstractMetaFunction *func : methods) {
+ for (AbstractMetaFunction *func : methods) {
if (methodName == func->name())
funcList.append(func);
}
const AbstractMetaClass *implementingClass = nullptr;
- for (const AbstractMetaFunction *func : qAsConst(funcList)) {
+ for (AbstractMetaFunction *func : qAsConst(funcList)) {
implementingClass = func->implementingClass();
if (implementingClass->name() == currentClass)
break;