1 files changed, 14 insertions, 14 deletions

diff --git a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp b/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp
index 4f0b0e10f..03129073a 100644
--- a/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp
+++ b/sources/shiboken2/ApiExtractor/tests/testnumericaltypedef.cpp
@@ -49,9 +49,9 @@ void TestNumericalTypedef::testNumericalTypedef()
     QVERIFY(!builder.isNull());
 
     QCOMPARE(builder->globalFunctions().size(), 2);
-    const AbstractMetaFunction* funcDouble = builder->globalFunctions().first();
+    const AbstractMetaFunction *funcDouble = builder->globalFunctions().constFirst();
     QVERIFY(funcDouble);
-    const AbstractMetaFunction* funcReal = builder->globalFunctions().last();
+    const AbstractMetaFunction *funcReal = builder->globalFunctions().constLast();
     QVERIFY(funcReal);
 
     if (funcDouble->name() == QLatin1String("funcReal"))
@@ -60,13 +60,13 @@ void TestNumericalTypedef::testNumericalTypedef()
     QCOMPARE(funcDouble->minimalSignature(), QLatin1String("funcDouble(double)"));
     QCOMPARE(funcReal->minimalSignature(), QLatin1String("funcReal(real)"));
 
-    const AbstractMetaType* doubleType = funcDouble->arguments().first()->type();
+    const AbstractMetaType *doubleType = funcDouble->arguments().constFirst()->type();
     QVERIFY(doubleType);
     QCOMPARE(doubleType->cppSignature(), QLatin1String("double"));
     QVERIFY(doubleType->isPrimitive());
     QVERIFY(doubleType->typeEntry()->isCppPrimitive());
 
-    const AbstractMetaType* realType = funcReal->arguments().first()->type();
+    const AbstractMetaType *realType = funcReal->arguments().constFirst()->type();
     QVERIFY(realType);
     QCOMPARE(realType->cppSignature(), QLatin1String("real"));
     QVERIFY(realType->isPrimitive());
@@ -76,41 +76,41 @@ void TestNumericalTypedef::testNumericalTypedef()
 void TestNumericalTypedef::testUnsignedNumericalTypedef()
 {
     const char* cppCode ="\
-    typedef unsigned short ushort;\n\
+    typedef unsigned short custom_ushort;\n\
     void funcUnsignedShort(unsigned short);\n\
-    void funcUShort(ushort);\n";
+    void funcUShort(custom_ushort);\n";
     const char* xmlCode = "\
     <typesystem package='Foo'>\n\
         <primitive-type name='short'/>\n\
         <primitive-type name='unsigned short'/>\n\
-        <primitive-type name='ushort'/>\n\
+        <primitive-type name='custom_ushort'/>\n\
         <function signature='funcUnsignedShort(unsigned short)'/>\n\
-        <function signature='funcUShort(ushort)'/>\n\
+        <function signature='funcUShort(custom_ushort)'/>\n\
     </typesystem>\n";
     QScopedPointer<AbstractMetaBuilder> builder(TestUtil::parse(cppCode, xmlCode, false));
     QVERIFY(!builder.isNull());
 
     QCOMPARE(builder->globalFunctions().size(), 2);
-    const AbstractMetaFunction* funcUnsignedShort = builder->globalFunctions().first();
+    const AbstractMetaFunction *funcUnsignedShort = builder->globalFunctions().constFirst();
     QVERIFY(funcUnsignedShort);
-    const AbstractMetaFunction* funcUShort = builder->globalFunctions().last();
+    const AbstractMetaFunction *funcUShort = builder->globalFunctions().constLast();
     QVERIFY(funcUShort);
 
     if (funcUnsignedShort->name() == QLatin1String("funcUShort"))
         std::swap(funcUnsignedShort, funcUShort);
 
     QCOMPARE(funcUnsignedShort->minimalSignature(), QLatin1String("funcUnsignedShort(unsigned short)"));
-    QCOMPARE(funcUShort->minimalSignature(), QLatin1String("funcUShort(ushort)"));
+    QCOMPARE(funcUShort->minimalSignature(), QLatin1String("funcUShort(custom_ushort)"));
 
-    const AbstractMetaType* unsignedShortType = funcUnsignedShort->arguments().first()->type();
+    const AbstractMetaType *unsignedShortType = funcUnsignedShort->arguments().constFirst()->type();
     QVERIFY(unsignedShortType);
     QCOMPARE(unsignedShortType->cppSignature(), QLatin1String("unsigned short"));
     QVERIFY(unsignedShortType->isPrimitive());
     QVERIFY(unsignedShortType->typeEntry()->isCppPrimitive());
 
-    const AbstractMetaType* ushortType = funcUShort->arguments().first()->type();
+    const AbstractMetaType *ushortType = funcUShort->arguments().constFirst()->type();
     QVERIFY(ushortType);
-    QCOMPARE(ushortType->cppSignature(), QLatin1String("ushort"));
+    QCOMPARE(ushortType->cppSignature(), QLatin1String("custom_ushort"));
     QVERIFY(ushortType->isPrimitive());
     QVERIFY(ushortType->typeEntry()->isCppPrimitive());
 }