aboutsummaryrefslogtreecommitdiffstats
path: root/ApiExtractor/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ApiExtractor/tests')
-rw-r--r--ApiExtractor/tests/testabstractmetaclass.cpp10
-rw-r--r--ApiExtractor/tests/testaddfunction.cpp2
-rw-r--r--ApiExtractor/tests/testextrainclude.cpp4
-rw-r--r--ApiExtractor/tests/testmodifyfunction.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/ApiExtractor/tests/testabstractmetaclass.cpp b/ApiExtractor/tests/testabstractmetaclass.cpp
index 0285221..423b8d9 100644
--- a/ApiExtractor/tests/testabstractmetaclass.cpp
+++ b/ApiExtractor/tests/testabstractmetaclass.cpp
@@ -57,7 +57,7 @@ void TestAbstractMetaClass::testClassNameUnderNamespace()
AbstractMetaClassList classes = builder->classes();
QCOMPARE(classes.count(), 2); // 1 namespace + 1 class
if (classes.first()->name() != QLatin1String("ClassName"))
- classes.swap(0, 1);
+ qSwap(classes[0], classes[1]);
QCOMPARE(classes[0]->name(), QLatin1String("ClassName"));
QCOMPARE(classes[0]->qualifiedCppName(), QLatin1String("Namespace::ClassName"));
@@ -71,7 +71,7 @@ void TestAbstractMetaClass::testClassNameUnderNamespace()
AbstractMetaFunctionList ctors = classes[0]->queryFunctions(AbstractMetaClass::Constructors);
QCOMPARE(ctors.size(), 2);
if (ctors.first()->minimalSignature() != QLatin1String("ClassName()"))
- ctors.swap(0, 1);
+ qSwap(ctors[0], ctors[1]);
QCOMPARE(ctors[0]->arguments().size(), 0);
QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("ClassName()"));
@@ -361,7 +361,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
AbstractMetaFunctionList ctors = classA->queryFunctions(AbstractMetaClass::Constructors);
QCOMPARE(ctors.size(), 2);
if (ctors.first()->minimalSignature() != QLatin1String("A()"))
- ctors.swap(0, 1);
+ qSwap(ctors[0], ctors[1]);
QCOMPARE(ctors[0]->arguments().size(), 0);
QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("A()"));
@@ -395,7 +395,7 @@ void TestAbstractMetaClass::testClassDefaultConstructors()
ctors = classF->queryFunctions(AbstractMetaClass::Constructors);
QCOMPARE(ctors.size(), 2);
if (ctors.first()->minimalSignature() != QLatin1String("F(int,int)"))
- ctors.swap(0, 1);
+ qSwap(ctors[0], ctors[1]);
QCOMPARE(ctors[0]->arguments().size(), 2);
QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("F(int,int)"));
@@ -428,7 +428,7 @@ void TestAbstractMetaClass::testClassInheritedDefaultConstructors()
AbstractMetaFunctionList ctors = classA->queryFunctions(AbstractMetaClass::Constructors);
QCOMPARE(ctors.size(), 2);
if (ctors.first()->minimalSignature() != QLatin1String("A()"))
- ctors.swap(0, 1);
+ qSwap(ctors[0], ctors[1]);
QCOMPARE(ctors[0]->arguments().size(), 0);
QCOMPARE(ctors[0]->minimalSignature(), QLatin1String("A()"));
diff --git a/ApiExtractor/tests/testaddfunction.cpp b/ApiExtractor/tests/testaddfunction.cpp
index 119d536..bcc5238 100644
--- a/ApiExtractor/tests/testaddfunction.cpp
+++ b/ApiExtractor/tests/testaddfunction.cpp
@@ -49,7 +49,7 @@ void TestAddFunction::testParsingFuncNameAndConstness()
const char sig2[] = " _fu__nc_ ( type1, const type2, const Abc<int& , C<char*> * > * *, const type3* const ) const ";
AddedFunction f2(QLatin1String(sig2), QLatin1String("const Abc<int& , C<char*> * > * *"), 0);
QCOMPARE(f2.name(), QLatin1String("_fu__nc_"));
- QList< AddedFunction::TypeInfo > args = f2.arguments();
+ QVector< AddedFunction::TypeInfo > args = f2.arguments();
QCOMPARE(args.count(), 4);
retval = f2.returnType();
QCOMPARE(retval.name, QLatin1String("Abc<int& , C<char*> * >"));
diff --git a/ApiExtractor/tests/testextrainclude.cpp b/ApiExtractor/tests/testextrainclude.cpp
index 9415837..97f0d56 100644
--- a/ApiExtractor/tests/testextrainclude.cpp
+++ b/ApiExtractor/tests/testextrainclude.cpp
@@ -50,7 +50,7 @@ void TestExtraInclude::testClassExtraInclude()
const AbstractMetaClass *classA = AbstractMetaClass::findClass(classes, QLatin1String("A"));
QVERIFY(classA);
- QList<Include> includes = classA->typeEntry()->extraIncludes();
+ QVector<Include> includes = classA->typeEntry()->extraIncludes();
QCOMPARE(includes.count(), 1);
QCOMPARE(includes.first().name(), QLatin1String("header.h"));
}
@@ -76,7 +76,7 @@ void TestExtraInclude::testGlobalExtraIncludes()
TypeEntry* module = td->findType(QLatin1String("Foo"));
QVERIFY(module);
- QList<Include> includes = module->extraIncludes();
+ QVector<Include> includes = module->extraIncludes();
QCOMPARE(includes.count(), 2);
QCOMPARE(includes.first().name(), QLatin1String("header1.h"));
QCOMPARE(includes.last().name(), QLatin1String("header2.h"));
diff --git a/ApiExtractor/tests/testmodifyfunction.cpp b/ApiExtractor/tests/testmodifyfunction.cpp
index 0e6bdc2..3d4ef9c 100644
--- a/ApiExtractor/tests/testmodifyfunction.cpp
+++ b/ApiExtractor/tests/testmodifyfunction.cpp
@@ -232,7 +232,7 @@ void TestModifyFunction::testGlobalFunctionModification()
FunctionModificationList mods = TypeDatabase::instance()->functionModifications(QLatin1String("function(A*)"));
QCOMPARE(mods.count(), 1);
- QList<ArgumentModification> argMods = mods.first().argument_mods;
+ QVector<ArgumentModification> argMods = mods.first().argument_mods;
QCOMPARE(argMods.count(), 1);
ArgumentModification argMod = argMods.first();
QCOMPARE(argMod.replacedDefaultExpression, QLatin1String("A()"));