aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/typesystem.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-08-29 15:01:46 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-08-30 11:42:11 +0000
commit08af692e40cb178ad59af2ed7b7b8928c0ac2ff6 (patch)
treee44724cc8288d5f8b7cb51ce0c2cd40684c51e96 /sources/shiboken2/ApiExtractor/typesystem.cpp
parent0689756325d93c7402eac4247638680508c5b914 (diff)
shiboken: Remove data fields representing unimplemented attributes
Remove member variables and enumeration values. Task-number: PYSIDE-743 Change-Id: Id7bff33b180e99e19d02bd895e45e4f0749dc042 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/typesystem.cpp')
-rw-r--r--sources/shiboken2/ApiExtractor/typesystem.cpp48
1 files changed, 0 insertions, 48 deletions
diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp
index 14b47ae8e..e17286900 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystem.cpp
@@ -1047,9 +1047,6 @@ PrimitiveTypeEntry *
} else if (name == preferredConversionAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- const bool v = convertBoolean(attributes->takeAt(i).value(),
- preferredConversionAttribute(), true);
- type->setPreferredConversion(v);
} else if (name == preferredTargetLangTypeAttribute()) {
const bool v = convertBoolean(attributes->takeAt(i).value(),
preferredTargetLangTypeAttribute(), true);
@@ -1110,23 +1107,15 @@ EnumTypeEntry *
if (name == QLatin1String("upper-bound")) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- entry->setUpperBound(attributes->takeAt(i).value().toString());
} else if (name == QLatin1String("lower-bound")) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- entry->setLowerBound(attributes->takeAt(i).value().toString());
} else if (name == forceIntegerAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- const bool v = convertBoolean(attributes->takeAt(i).value(),
- forceIntegerAttribute(), false);
- entry->setForceInteger(v);
} else if (name == extensibleAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- const bool v = convertBoolean(attributes->takeAt(i).value(),
- extensibleAttribute(), false);
- entry->setExtensible(v);
} else if (name == flagsAttribute()) {
flagNames = attributes->takeAt(i).value().toString();
}
@@ -1254,22 +1243,17 @@ void Handler::applyComplexTypeAttributes(const QXmlStreamReader &reader,
} else if (name == QLatin1String("held-type")) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- ctype->setHeldType(attributes->takeAt(i).value().toString());
} else if (name == QLatin1String("hash-function")) {
ctype->setHashFunction(attributes->takeAt(i).value().toString());
} else if (name == forceAbstractAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- if (convertBoolean(attributes->takeAt(i).value(), forceAbstractAttribute(), false))
- ctype->setTypeFlags(ctype->typeFlags() | ComplexTypeEntry::ForceAbstract);
} else if (name == deprecatedAttribute()) {
if (convertBoolean(attributes->takeAt(i).value(), deprecatedAttribute(), false))
ctype->setTypeFlags(ctype->typeFlags() | ComplexTypeEntry::Deprecated);
} else if (name == deleteInMainThreadAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- if (convertBoolean(attributes->takeAt(i).value(), deleteInMainThreadAttribute(), false))
- ctype->setTypeFlags(ctype->typeFlags() | ComplexTypeEntry::DeleteInMainThread);
} else if (name == QLatin1String("target-type")) {
ctype->setTargetType(attributes->takeAt(i).value().toString());
}
@@ -1665,12 +1649,6 @@ bool Handler::parseNoNullPointer(const QXmlStreamReader &reader,
const QXmlStreamAttribute attribute = attributes->takeAt(defaultValueIndex);
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, attribute)));
- if (lastArgMod.index == 0) {
- lastArgMod.nullPointerDefaultValue = attribute.value().toString();
- } else {
- qCWarning(lcShiboken)
- << "default values for null pointer guards are only effective for return values";
- }
}
return true;
}
@@ -1939,7 +1917,6 @@ bool Handler::parseModifyFunction(const QXmlStreamReader &reader,
bool deprecated = false;
bool isThread = false;
TypeSystem::AllowThread allowThread = TypeSystem::AllowThread::Unspecified;
- bool virtualSlot = false;
for (int i = attributes->size() - 1; i >= 0; --i) {
const QStringRef name = attributes->at(i).qualifiedName();
if (name == QLatin1String("signature")) {
@@ -1970,8 +1947,6 @@ bool Handler::parseModifyFunction(const QXmlStreamReader &reader,
} else if (name == virtualSlotAttribute()) {
qCWarning(lcShiboken, "%s",
qPrintable(msgUnimplementedAttributeWarning(reader, name)));
- virtualSlot = convertBoolean(attributes->takeAt(i).value(),
- virtualSlotAttribute(), false);
}
}
@@ -2024,8 +1999,6 @@ bool Handler::parseModifyFunction(const QXmlStreamReader &reader,
mod.setIsThread(isThread);
if (allowThread != TypeSystem::AllowThread::Unspecified)
mod.setAllowThread(allowThread);
- if (virtualSlot)
- mod.modifiers |= Modification::VirtualSlot;
m_contextStack.top()->functionMods << mod;
return true;
@@ -2724,7 +2697,6 @@ bool Handler::startElement(const QXmlStreamReader &reader)
PrimitiveTypeEntry::PrimitiveTypeEntry(const QString &name, const QVersionNumber &vr) :
TypeEntry(name, PrimitiveType, vr),
- m_preferredConversion(true),
m_preferredTargetLangType(true)
{
}
@@ -2748,16 +2720,6 @@ PrimitiveTypeEntry *PrimitiveTypeEntry::basicReferencedTypeEntry() const
return baseReferencedTypeEntry ? baseReferencedTypeEntry : m_referencedTypeEntry;
}
-bool PrimitiveTypeEntry::preferredConversion() const
-{
- return m_preferredConversion;
-}
-
-void PrimitiveTypeEntry::setPreferredConversion(bool b)
-{
- m_preferredConversion = b;
-}
-
CodeSnipList TypeEntry::codeSnips() const
{
return m_codeSnips;
@@ -2869,21 +2831,11 @@ QString EnumTypeEntry::targetLangApiName() const
return QLatin1String("jint");
}
-bool EnumTypeEntry::preferredConversion() const
-{
- return false;
-}
-
QString FlagsTypeEntry::targetLangApiName() const
{
return QLatin1String("jint");
}
-bool FlagsTypeEntry::preferredConversion() const
-{
- return false;
-}
-
QString FlagsTypeEntry::qualifiedTargetLangName() const
{
return targetLangPackage() + QLatin1Char('.') + m_enum->targetLangQualifier()