diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-01 13:04:57 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-02 11:43:18 +0000 |
| commit | 90811af4ea1a58f30f99af9ff7ba61144f2f5733 (patch) | |
| tree | ff2744f0fdab715dd01d94e8e5a716bc91fa27b2 /sources | |
| parent | 111f11e4d88ed89f961c73b25d48123f28909213 (diff) | |
shiboken: Use information about virtual from the code model
Change-Id: I27411e810fc3b3ff9d3bb629b5ebc2c7fdaa59ef
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.cpp | 2 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index 20943696e..98f723ba6 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -1151,7 +1151,7 @@ bool AbstractMetaFunction::isInplaceOperator() const bool AbstractMetaFunction::isVirtual() const { - return !isFinal() && !isSignal() && !isStatic() && !isFinalInCpp() && !isConstructor(); + return attributes() & AbstractMetaAttributes::VirtualCppMethod; } QString AbstractMetaFunction::modifiedName() const diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.h b/sources/shiboken2/ApiExtractor/abstractmetalang.h index c4b4543e0..6bf71c0b6 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.h +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.h @@ -932,8 +932,6 @@ public: bool isBinaryOperator() const { return arityOfOperator() == 2; } bool isInplaceOperator() const; - // TODO: ths function *should* know if it is virtual - // instead of asking to your implementing class. bool isVirtual() const; bool isThread() const; bool allowThread() const; |