diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-29 11:07:51 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-04-06 08:36:00 +0000 |
commit | 6a4865f5bba1d15bc3e91f720486c9e23cafc8c5 (patch) | |
tree | 2d1912f835a556e78d03165ef8525719dea9e3c1 | |
parent | fa3bcfcd649d2fa7218cb0f0cb6a9d62c5a2dff9 (diff) |
CodeModel: Replace QList by QVector
QList will be deprecated in Qt.
Change-Id: I43e2d1b7c8fb462c82250bb59ec88375515deb9f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | ApiExtractor/parser/codemodel.cpp | 14 | ||||
-rw-r--r-- | ApiExtractor/parser/codemodel.h | 16 | ||||
-rw-r--r-- | ApiExtractor/parser/codemodel_fwd.h | 28 |
3 files changed, 31 insertions, 27 deletions
diff --git a/ApiExtractor/parser/codemodel.cpp b/ApiExtractor/parser/codemodel.cpp index db37a79..667e273 100644 --- a/ApiExtractor/parser/codemodel.cpp +++ b/ApiExtractor/parser/codemodel.cpp @@ -47,9 +47,9 @@ private: }; template <class T> -static QSharedPointer<T> findModelItem(const QList<QSharedPointer<T> > &list, const QString &name) +static QSharedPointer<T> findModelItem(const QVector<QSharedPointer<T> > &list, const QString &name) { - typedef typename QList<QSharedPointer<T> >::const_iterator It; + typedef typename QVector<QSharedPointer<T> >::const_iterator It; const It it = std::find_if(list.begin(), list.end(), ModelItemNamePredicate<T>(name)); return it != list.end() ? *it : QSharedPointer<T>(); } @@ -230,7 +230,7 @@ QString TypeInfo::toString() const return tmp; } -bool TypeInfo::operator==(const TypeInfo &other) +bool TypeInfo::operator==(const TypeInfo &other) const { if (arrayElements().count() != other.arrayElements().count()) return false; @@ -742,6 +742,14 @@ _NamespaceModelItem::~_NamespaceModelItem() { } +QSet<NamespaceModelItem> _NamespaceModelItem::uniqueNamespaces() const +{ + QSet<NamespaceModelItem> result; + for (const NamespaceModelItem &n : m_namespaces) + result.insert(n); + return result; +} + void _NamespaceModelItem::addNamespace(NamespaceModelItem item) { m_namespaces.append(item); diff --git a/ApiExtractor/parser/codemodel.h b/ApiExtractor/parser/codemodel.h index 0d7fe57..ea16e69 100644 --- a/ApiExtractor/parser/codemodel.h +++ b/ApiExtractor/parser/codemodel.h @@ -35,7 +35,6 @@ #include "codemodel_enums.h" #include <QtCore/QHash> -#include <QtCore/QList> #include <QtCore/QSet> #include <QtCore/QString> #include <QtCore/QStringList> @@ -158,21 +157,18 @@ public: m_arrayElements = arrayElements; } - QList<TypeInfo> arguments() const - { - return m_arguments; - } + QVector<TypeInfo> arguments() const { return m_arguments; } - void setArguments(const QList<TypeInfo> &arguments); + void setArguments(const QVector<TypeInfo> &arguments); void addArgument(const TypeInfo &arg) { m_arguments.append(arg); } - bool operator==(const TypeInfo &other); + bool operator==(const TypeInfo &other) const; - bool operator!=(const TypeInfo &other) + bool operator!=(const TypeInfo &other) const { return !(*this == other); } @@ -193,7 +189,7 @@ private: QStringList m_qualifiedName; QStringList m_arrayElements; - QList<TypeInfo> m_arguments; + QVector<TypeInfo> m_arguments; union { uint flags; @@ -395,7 +391,7 @@ public: ~_NamespaceModelItem(); NamespaceList namespaces() const { return m_namespaces; } - QSet<NamespaceModelItem> uniqueNamespaces() const { return m_namespaces.toSet(); } + QSet<NamespaceModelItem> uniqueNamespaces() const; void addNamespace(NamespaceModelItem item); diff --git a/ApiExtractor/parser/codemodel_fwd.h b/ApiExtractor/parser/codemodel_fwd.h index 676bda8..d5a9f28 100644 --- a/ApiExtractor/parser/codemodel_fwd.h +++ b/ApiExtractor/parser/codemodel_fwd.h @@ -31,7 +31,7 @@ #ifndef CODEMODEL_FWD_H #define CODEMODEL_FWD_H -#include <QtCore/QList> +#include <QtCore/QVector> #include <QtCore/QSharedPointer> // forward declarations @@ -65,18 +65,18 @@ typedef QSharedPointer<_TypeDefModelItem> TypeDefModelItem; typedef QSharedPointer<_VariableModelItem> VariableModelItem; typedef QSharedPointer<_MemberModelItem> MemberModelItem; -typedef QList<ArgumentModelItem> ArgumentList; -typedef QList<ClassModelItem> ClassList; -typedef QList<CodeModelItem> ItemList; -typedef QList<EnumModelItem> EnumList; -typedef QList<EnumeratorModelItem> EnumeratorList; -typedef QList<FileModelItem> FileList; -typedef QList<FunctionModelItem> FunctionList; -typedef QList<NamespaceModelItem> NamespaceList; -typedef QList<ScopeModelItem> ScopeList; -typedef QList<TemplateParameterModelItem> TemplateParameterList; -typedef QList<TypeDefModelItem> TypeDefList; -typedef QList<VariableModelItem> VariableList; -typedef QList<MemberModelItem> MemberList; +typedef QVector<ArgumentModelItem> ArgumentList; +typedef QVector<ClassModelItem> ClassList; +typedef QVector<CodeModelItem> ItemList; +typedef QVector<EnumModelItem> EnumList; +typedef QVector<EnumeratorModelItem> EnumeratorList; +typedef QVector<FileModelItem> FileList; +typedef QVector<FunctionModelItem> FunctionList; +typedef QVector<NamespaceModelItem> NamespaceList; +typedef QVector<ScopeModelItem> ScopeList; +typedef QVector<TemplateParameterModelItem> TemplateParameterList; +typedef QVector<TypeDefModelItem> TypeDefList; +typedef QVector<VariableModelItem> VariableList; +typedef QVector<MemberModelItem> MemberList; #endif // CODEMODEL_FWD_H |