4 files changed, 6 insertions, 8 deletions
diff --git a/generator/generator.cpp b/generator/generator.cpp
index c252ef7..61c1ede 100644
--- a/generator/generator.cpp
+++ b/generator/generator.cpp
@@ -668,7 +668,7 @@ QString Generator::minimalConstructor(const AbstractMetaClass* metaClass) const
 
     QString qualifiedCppName = metaClass->typeEntry()->qualifiedCppName();
     QStringList templateTypes;
-    const QList<TypeEntry *> &templateArguments = metaClass->templateArguments();
+    const QVector<TypeEntry *> &templateArguments = metaClass->templateArguments();
     for (TypeEntry *templateType : templateArguments)
         templateTypes << templateType->qualifiedCppName();
 
diff --git a/generator/shiboken2/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp
index af20bc2..76b80ba 100644
--- a/generator/shiboken2/cppgenerator.cpp
+++ b/generator/shiboken2/cppgenerator.cpp
@@ -275,7 +275,7 @@ void CppGenerator::generateClass(QTextStream &s, GeneratorContext &classContext)
 
     //Extra includes
     s << endl << "// Extra includes" << endl;
-    QList<Include> includes = metaClass->typeEntry()->extraIncludes();
+    QVector<Include> includes = metaClass->typeEntry()->extraIncludes();
     for (AbstractMetaEnum *cppEnum : qAsConst(classEnums))
         includes.append(cppEnum->typeEntry()->extraIncludes());
     qSort(includes.begin(), includes.end());
@@ -5208,7 +5208,7 @@ bool CppGenerator::finishGeneration()
 
     //Extra includes
     s << endl << "// Extra includes" << endl;
-    QList<Include> extraIncludes;
+    QVector<Include> extraIncludes;
     if (moduleEntry)
         extraIncludes = moduleEntry->extraIncludes();
     for (AbstractMetaEnum *cppEnum : qAsConst(globalEnums))
diff --git a/generator/shiboken2/shibokengenerator.cpp b/generator/shiboken2/shibokengenerator.cpp
index 64cbbeb..54f4990 100644
--- a/generator/shiboken2/shibokengenerator.cpp
+++ b/generator/shiboken2/shibokengenerator.cpp
@@ -1327,8 +1327,6 @@ QString ShibokenGenerator::argumentString(const AbstractMetaFunction *func,
         arg += argument->name();
     }
 
-    QList<ReferenceCount> referenceCounts;
-    referenceCounts = func->referenceCounts(func->implementingClass(), argument->argumentIndex() + 1);
     if ((options & Generator::SkipDefaultValues) != Generator::SkipDefaultValues &&
         !argument->originalDefaultValueExpression().isEmpty())
     {
diff --git a/generator/shiboken2/shibokengenerator.h b/generator/shiboken2/shibokengenerator.h
index a2c33d7..228df23 100644
--- a/generator/shiboken2/shibokengenerator.h
+++ b/generator/shiboken2/shibokengenerator.h
@@ -142,20 +142,20 @@ public:
 
     /// Write user's custom code snippets at class or module level.
     void writeCodeSnips(QTextStream& s,
-                        const QList<CodeSnip>& codeSnips,
+                        const QVector<CodeSnip> & codeSnips,
                         TypeSystem::CodeSnipPosition position,
                         TypeSystem::Language language,
                         const AbstractMetaClass* context = 0);
     /// Write user's custom code snippets at function level.
     void writeCodeSnips(QTextStream& s,
-                        const QList<CodeSnip>& codeSnips,
+                        const QVector<CodeSnip> & codeSnips,
                         TypeSystem::CodeSnipPosition position,
                         TypeSystem::Language language,
                         const AbstractMetaFunction* func,
                         const AbstractMetaArgument* lastArg = 0);
 
     /// Returns a string with the user's custom code snippets that comply with \p position and \p language.
-    QString getCodeSnippets(const QList<CodeSnip>& codeSnips, TypeSystem::CodeSnipPosition position, TypeSystem::Language language);
+    QString getCodeSnippets(const QVector<CodeSnip> & codeSnips, TypeSystem::CodeSnipPosition position, TypeSystem::Language language);
 
     /// Replaces variables for the user's custom code at global or class level.
     void processCodeSnip(QString& code, const AbstractMetaClass* context = 0);