diff options
Diffstat (limited to 'src/widgets/graphicsview/qgraphicsitem.h')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicsitem.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index e1732ff392..f82c600b3a 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -432,7 +432,7 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags) -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QGraphicsItem, "org.qt-project.Qt.QGraphicsItem") #endif @@ -500,13 +500,10 @@ class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem #if QT_CONFIG(graphicseffect) Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect) #endif - Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), QDeclarativeListProperty<QGraphicsObject> children - READ childrenList DESIGNABLE false NOTIFY childrenChanged) Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL) Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL) - Q_CLASSINFO("DefaultProperty", "children") Q_INTERFACES(QGraphicsItem) public: explicit QGraphicsObject(QGraphicsItem *parent = nullptr); @@ -973,14 +970,14 @@ template <class T> inline T qgraphicsitem_cast(QGraphicsItem *item) { typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type Item; return int(Item::Type) == int(QGraphicsItem::Type) - || (item && int(Item::Type) == item->type()) ? static_cast<T>(item) : 0; + || (item && int(Item::Type) == item->type()) ? static_cast<T>(item) : nullptr; } template <class T> inline T qgraphicsitem_cast(const QGraphicsItem *item) { typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type Item; return int(Item::Type) == int(QGraphicsItem::Type) - || (item && int(Item::Type) == item->type()) ? static_cast<T>(item) : 0; + || (item && int(Item::Type) == item->type()) ? static_cast<T>(item) : nullptr; } #ifndef QT_NO_DEBUG_STREAM |