diff options
| -rw-r--r-- | ApiExtractor/tests/testfunctiontag.cpp | 6 | ||||
| -rw-r--r-- | ApiExtractor/typedatabase.cpp | 16 | ||||
| -rw-r--r-- | ApiExtractor/typesystem.cpp | 3 | ||||
| -rw-r--r-- | generator/shiboken2/shibokengenerator.cpp | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/ApiExtractor/tests/testfunctiontag.cpp b/ApiExtractor/tests/testfunctiontag.cpp index 272cd8570..9d2e4c454 100644 --- a/ApiExtractor/tests/testfunctiontag.cpp +++ b/ApiExtractor/tests/testfunctiontag.cpp @@ -43,7 +43,7 @@ void TestFunctionTag::testFunctionTagForSpecificSignature() </typesystem>\n"; TestUtil t(cppCode, xmlCode, false); - FunctionTypeEntry* func = (FunctionTypeEntry*) TypeDatabase::instance()->findType(QLatin1String("globalFunction")); + const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("globalFunction")); QVERIFY(func); QCOMPARE(t.builder()->globalFunctions().size(), 1); } @@ -60,7 +60,7 @@ void TestFunctionTag::testFunctionTagForAllSignatures() </typesystem>\n"; TestUtil t(cppCode, xmlCode, false); - FunctionTypeEntry* func = (FunctionTypeEntry*) TypeDatabase::instance()->findType(QLatin1String("globalFunction")); + const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("globalFunction")); QVERIFY(func); QCOMPARE(t.builder()->globalFunctions().size(), 2); } @@ -74,7 +74,7 @@ void TestFunctionTag::testRenameGlobalFunction() </typesystem>\n"; TestUtil t(cppCode, xmlCode, false); - FunctionTypeEntry* func = (FunctionTypeEntry*) TypeDatabase::instance()->findType(QLatin1String("global_function_with_ugly_name")); + const TypeEntry *func = TypeDatabase::instance()->findType(QLatin1String("global_function_with_ugly_name")); QVERIFY(func); QCOMPARE(t.builder()->globalFunctions().size(), 1); diff --git a/ApiExtractor/typedatabase.cpp b/ApiExtractor/typedatabase.cpp index 7ce8c2c52..def71fda1 100644 --- a/ApiExtractor/typedatabase.cpp +++ b/ApiExtractor/typedatabase.cpp @@ -167,9 +167,9 @@ QList<const PrimitiveTypeEntry*> TypeDatabase::primitiveTypes() const TypeEntryHash entries = allEntries(); QList<const PrimitiveTypeEntry*> returned; for (TypeEntryHash::const_iterator it = entries.cbegin(), end = entries.cend(); it != end; ++it) { - foreach (const TypeEntry* typeEntry, it.value()) { + foreach (TypeEntry *typeEntry, it.value()) { if (typeEntry->isPrimitive()) - returned.append((PrimitiveTypeEntry*) typeEntry); + returned.append(static_cast<PrimitiveTypeEntry *>(typeEntry)); } } return returned; @@ -180,9 +180,9 @@ QList<const ContainerTypeEntry*> TypeDatabase::containerTypes() const TypeEntryHash entries = allEntries(); QList<const ContainerTypeEntry*> returned; for (TypeEntryHash::const_iterator it = entries.cbegin(), end = entries.cend(); it != end; ++it) { - foreach (const TypeEntry* typeEntry, it.value()) { + foreach (TypeEntry *typeEntry, it.value()) { if (typeEntry->isContainer()) - returned.append((ContainerTypeEntry*) typeEntry); + returned.append(static_cast<ContainerTypeEntry *>(typeEntry)); } } return returned; @@ -248,20 +248,20 @@ bool TypeDatabase::isFieldRejected(const QString& className, const QString& fiel FlagsTypeEntry* TypeDatabase::findFlagsType(const QString &name) const { - FlagsTypeEntry* fte = (FlagsTypeEntry*) findType(name); + TypeEntry *fte = findType(name); if (!fte) { - fte = (FlagsTypeEntry*) m_flagsEntries.value(name); + fte = m_flagsEntries.value(name); if (!fte) { //last hope, search for flag without scope inside of flags hash for (SingleTypeEntryHash::const_iterator it = m_flagsEntries.cbegin(), end = m_flagsEntries.cend(); it != end; ++it) { if (it.key().endsWith(name)) { - fte = static_cast<FlagsTypeEntry *>(const_cast<TypeEntry *>(it.value())); + fte = it.value(); break; } } } } - return fte; + return static_cast<FlagsTypeEntry *>(fte); } void TypeDatabase::addFlagsType(FlagsTypeEntry *fte) diff --git a/ApiExtractor/typesystem.cpp b/ApiExtractor/typesystem.cpp index 0cc7a67e5..e07d485f6 100644 --- a/ApiExtractor/typesystem.cpp +++ b/ApiExtractor/typesystem.cpp @@ -2323,7 +2323,8 @@ bool TypeEntry::isCppPrimitive() const if (!isPrimitive()) return false; - PrimitiveTypeEntry* aliasedType = ((PrimitiveTypeEntry*)this)->basicAliasedTypeEntry(); + const PrimitiveTypeEntry *aliasedType = + static_cast<const PrimitiveTypeEntry *>(this)->basicAliasedTypeEntry(); QByteArray typeName = (aliasedType ? aliasedType->name() : m_name).toUtf8(); if (typeName.contains(' ') || m_type == VoidType) diff --git a/generator/shiboken2/shibokengenerator.cpp b/generator/shiboken2/shibokengenerator.cpp index 0cb0e3382..036043cdf 100644 --- a/generator/shiboken2/shibokengenerator.cpp +++ b/generator/shiboken2/shibokengenerator.cpp @@ -909,7 +909,7 @@ bool ShibokenGenerator::isPyInt(const AbstractMetaType* type) bool ShibokenGenerator::isPairContainer(const AbstractMetaType* type) { return type->isContainer() - && ((ContainerTypeEntry*)type->typeEntry())->type() == ContainerTypeEntry::PairContainer; + && static_cast<const ContainerTypeEntry *>(type->typeEntry())->type() == ContainerTypeEntry::PairContainer; } bool ShibokenGenerator::isWrapperType(const TypeEntry* type) |