diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-26 07:56:43 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-26 13:36:47 +0200 |
| commit | 4394f6707702c9aa644586266400ae4ff5dea446 (patch) | |
| tree | c3a30447a621bf647454c4dd974f2e7a328bb070 /sources/shiboken6/ApiExtractor/typesystem.h | |
| parent | d27400ea27a2883f141f8fd4a41ec8e70ae23b83 (diff) | |
shiboken6: Mark old syntax for conversion rules as deprecated
TypeEntry had a string member for conversion rules (besides
the nested "target-to-native" and "native-to-target" attributes)
that was populated from the "file" attribute depending on the "class"
attribute ("target"/"native"). Remove code path and flags for "native"
since they were not used. Rename the member to targetConversionRule()
for clarity and add a warning and FIXME comments.
Pick-to: 6.1
Change-Id: I2a991d438e48c1cc0519d077cb3c0599f9800eb7
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/shiboken6/ApiExtractor/typesystem.h')
| -rw-r--r-- | sources/shiboken6/ApiExtractor/typesystem.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/sources/shiboken6/ApiExtractor/typesystem.h b/sources/shiboken6/ApiExtractor/typesystem.h index fdddb458b..7d96c1bfb 100644 --- a/sources/shiboken6/ApiExtractor/typesystem.h +++ b/sources/shiboken6/ApiExtractor/typesystem.h @@ -36,10 +36,6 @@ #include <QtCore/QStringList> #include <QtCore/QScopedPointer> -//Used to identify the conversion rule to avoid break API -extern const char *TARGET_CONVERSION_RULE_FLAG; -extern const char *NATIVE_CONVERSION_RULE_FLAG; - class CustomFunction; class CustomConversion; class EnumValueTypeEntry; @@ -218,22 +214,16 @@ public: Include include() const; void setInclude(const Include &inc); - // Replace conversionRule arg to CodeSnip in future version - /// Set the type convertion rule - void setConversionRule(const QString& conversionRule); - - /// Returns the type convertion rule - QString conversionRule() const; + // FIXME PYSIDE7: Remove + /// Set the target type conversion rule + void setTargetConversionRule(const QString& conversionRule); - /// Returns true if there are any conversiton rule for this type, false otherwise. - bool hasConversionRule() const; + /// Returns the target type conversion rule + QString targetConversionRule() const; QVersionNumber version() const; /// TODO-CONVERTER: mark as deprecated - bool hasNativeConversionRule() const; - - /// TODO-CONVERTER: mark as deprecated bool hasTargetConversionRule() const; bool isCppPrimitive() const; |