diff options
Diffstat (limited to 'src/widgets/graphicsview')
26 files changed, 308 insertions, 305 deletions
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 13494dd81a..cec85f8430 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -92,14 +92,14 @@ public: qreal horizontalSpacing() const; qreal verticalSpacing() const; - void removeAt(int index); - void setGeometry(const QRectF &rect); - int count() const; - QGraphicsLayoutItem *itemAt(int index) const; + void removeAt(int index) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + int count() const Q_DECL_OVERRIDE; + QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - void invalidate(); + void invalidate() Q_DECL_OVERRIDE; protected: - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsAnchorLayout) diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index 457a5a2769..96ca7544ee 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -189,7 +189,7 @@ struct SequentialAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes(); + virtual void updateChildrenSizes() Q_DECL_OVERRIDE; void calculateSizeHints(); QVector<AnchorVertex*> m_children; // list of vertices in the sequence @@ -217,7 +217,7 @@ struct ParallelAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes(); + virtual void updateChildrenSizes() Q_DECL_OVERRIDE; bool calculateSizeHints(); bool secondForward() const { diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp index 9720bbf9ba..5f689edef6 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp @@ -108,7 +108,6 @@ QGraphicsLayoutStyleInfo *QGraphicsGridLayoutPrivate::styleInfo() const { if (!m_styleInfo) m_styleInfo = new QGraphicsLayoutStyleInfo(this); - m_styleInfo->updateChanged(QAbstractLayoutStyleInfo::Unknown); return m_styleInfo; } diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index 26b6daa96f..43400c3ce4 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -100,16 +100,16 @@ public: QGraphicsLayoutItem *itemAt(int row, int column) const; // inherited from QGraphicsLayout - int count() const; - QGraphicsLayoutItem *itemAt(int index) const; - void removeAt(int index); + int count() const Q_DECL_OVERRIDE; + QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + void removeAt(int index) Q_DECL_OVERRIDE; void removeItem(QGraphicsLayoutItem *item); - void invalidate(); + void invalidate() Q_DECL_OVERRIDE; // inherited from QGraphicsLayoutItem - void setGeometry(const QRectF &rect); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; // #### //QRect cellRect(int row, int column, int rowSpan = 1, int columnSpan = 1) const; diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index a543445244..94733dde72 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -762,8 +762,6 @@ #include <private/qapplication_p.h> #include <private/qgesturemanager_p.h> -#include <math.h> - QT_BEGIN_NAMESPACE static inline void _q_adjustRect(QRect *rect) @@ -7404,7 +7402,7 @@ void QGraphicsItem::setInputMethodHints(Qt::InputMethodHints hints) */ void QGraphicsItem::updateMicroFocus() { -#if !defined(QT_NO_IM) && defined(Q_WS_X11) +#if !defined(QT_NO_IM) && defined(Q_DEAD_CODE_FROM_QT4_X11) if (QWidget *fw = QApplication::focusWidget()) { if (scene()) { for (int i = 0 ; i < scene()->views().count() ; ++i) { @@ -8034,16 +8032,6 @@ void QGraphicsItemPrivate::resetHeight() */ /*! - \fn const QObjectList &QGraphicsObject::children() const - \internal - - This function returns the same value as QObject::children(). It's - provided to differentiate between the obsolete member - QGraphicsItem::children() and QObject::children(). QGraphicsItem now - provides childItems() instead. -*/ - -/*! \property QGraphicsObject::transformOriginPoint \brief the transformation origin diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 3a238390d7..4435840e22 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -556,11 +556,7 @@ public: explicit QGraphicsObject(QGraphicsItem *parent = 0); ~QGraphicsObject(); -#ifdef Q_NO_USING_KEYWORD - const QObjectList &children() const { return QObject::children(); } -#else using QObject::children; -#endif #ifndef QT_NO_GESTURES void grabGesture(Qt::GestureType type, Qt::GestureFlags flags = Qt::GestureFlags()); @@ -587,7 +583,7 @@ Q_SIGNALS: protected: QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent); - bool event(QEvent *ev); + bool event(QEvent *ev) Q_DECL_OVERRIDE; private: friend class QGraphicsItem; @@ -608,8 +604,8 @@ public: QBrush brush() const; void setBrush(const QBrush &brush); - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; protected: QAbstractGraphicsShapeItem(QAbstractGraphicsShapeItemPrivate &dd, @@ -631,22 +627,22 @@ public: QPainterPath path() const; void setPath(const QPainterPath &path); - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 2 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsPathItem) @@ -666,22 +662,22 @@ public: void setRect(const QRectF &rect); inline void setRect(qreal x, qreal y, qreal w, qreal h); - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 3 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsRectItem) @@ -710,22 +706,22 @@ public: int spanAngle() const; void setSpanAngle(int angle); - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 4 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsEllipseItem) @@ -750,22 +746,22 @@ public: Qt::FillRule fillRule() const; void setFillRule(Qt::FillRule rule); - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 5 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsPolygonItem) @@ -789,22 +785,22 @@ public: inline void setLine(qreal x1, qreal y1, qreal x2, qreal y2) { setLine(QLineF(x1, y1, x2, y2)); } - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 6 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsLineItem) @@ -835,25 +831,25 @@ public: void setOffset(const QPointF &offset); inline void setOffset(qreal x, qreal y); - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 7 }; - int type() const; + int type() const Q_DECL_OVERRIDE; ShapeMode shapeMode() const; void setShapeMode(ShapeMode mode); protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsPixmapItem) @@ -889,17 +885,17 @@ public: void setDefaultTextColor(const QColor &c); QColor defaultTextColor() const; - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 8 }; - int type() const; + int type() const Q_DECL_OVERRIDE; void setTextWidth(qreal width); qreal textWidth() const; @@ -926,30 +922,30 @@ Q_SIGNALS: void linkHovered(const QString &); protected: - bool sceneEvent(QEvent *event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void focusInEvent(QFocusEvent *event); - void focusOutEvent(QFocusEvent *event); - void dragEnterEvent(QGraphicsSceneDragDropEvent *event); - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); - void dragMoveEvent(QGraphicsSceneDragDropEvent *event); - void dropEvent(QGraphicsSceneDragDropEvent *event); - void inputMethodEvent(QInputMethodEvent *event); - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - - QVariant inputMethodQuery(Qt::InputMethodQuery query) const; - - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsTextItem) @@ -974,22 +970,22 @@ public: void setFont(const QFont &font); QFont font() const; - QRectF boundingRect() const; - QPainterPath shape() const; - bool contains(const QPointF &point) const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; + bool contains(const QPointF &point) const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 9 }; - int type() const; + int type() const Q_DECL_OVERRIDE; protected: - bool supportsExtension(Extension extension) const; - void setExtension(Extension extension, const QVariant &variant); - QVariant extension(const QVariant &variant) const; + bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; + QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsSimpleTextItem) @@ -1006,14 +1002,14 @@ public: void addToGroup(QGraphicsItem *item); void removeFromGroup(QGraphicsItem *item); - QRectF boundingRect() const; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + QRectF boundingRect() const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; - bool isObscuredBy(const QGraphicsItem *item) const; - QPainterPath opaqueArea() const; + bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; + QPainterPath opaqueArea() const Q_DECL_OVERRIDE; enum { Type = 10 }; - int type() const; + int type() const Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(QGraphicsItemGroup) diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index f1986a5072..0dd192caed 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -658,28 +658,28 @@ public: : QGraphicsEffectSourcePrivate(), item(i), info(0) {} - inline void detach() + void detach() Q_DECL_OVERRIDE { item->d_ptr->graphicsEffect = 0; item->prepareGeometryChange(); } - inline const QGraphicsItem *graphicsItem() const + const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE { return item; } - inline const QWidget *widget() const + const QWidget *widget() const Q_DECL_OVERRIDE { return 0; } - inline void update() { + void update() Q_DECL_OVERRIDE { item->d_ptr->updateDueToGraphicsEffect = true; item->update(); item->d_ptr->updateDueToGraphicsEffect = false; } - inline void effectBoundingRectChanged() + void effectBoundingRectChanged() Q_DECL_OVERRIDE { item->prepareGeometryChange(); } - inline bool isPixmap() const + bool isPixmap() const Q_DECL_OVERRIDE { return item->type() == QGraphicsPixmapItem::Type && !(item->flags() & QGraphicsItem::ItemIsSelectable) @@ -687,10 +687,10 @@ public: //|| (item->d_ptr->isObject && qobject_cast<QDeclarativeImage *>(q_func())); } - inline const QStyleOption *styleOption() const + const QStyleOption *styleOption() const Q_DECL_OVERRIDE { return info ? info->option : 0; } - inline QRect deviceRect() const + QRect deviceRect() const Q_DECL_OVERRIDE { if (!info || !info->widget) { qWarning("QGraphicsEffectSource::deviceRect: Not yet implemented, lacking device context"); @@ -699,11 +699,11 @@ public: return info->widget->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const; - void draw(QPainter *); + QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; + void draw(QPainter *) Q_DECL_OVERRIDE; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const; + QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const; QGraphicsItem *item; diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 83004e36f9..226c3984cf 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -52,12 +52,12 @@ public: ~QGraphicsLayout(); void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; void activate(); bool isActivated() const; virtual void invalidate(); - virtual void updateGeometry(); + virtual void updateGeometry() Q_DECL_OVERRIDE; virtual void widgetEvent(QEvent *e); diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h index a45cb31b28..698118eb75 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.h +++ b/src/widgets/graphicsview/qgraphicslayout_p.h @@ -65,7 +65,7 @@ inline bool qt_graphicsLayoutDebug() { static int checked_env = -1; if(checked_env == -1) - checked_env = !!qgetenv("QT_GRAPHICSLAYOUT_DEBUG").toInt(); + checked_env = !!qEnvironmentVariableIntValue("QT_GRAPHICSLAYOUT_DEBUG"); return checked_env; } #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 9e216c8200..1cf94d3962 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h @@ -77,13 +77,6 @@ public: QAbstractLayoutStyleInfo::invalidate(); } - virtual bool hasChangedCore() const Q_DECL_OVERRIDE - { - QStyle *s = m_style; - // Note that style() will change m_style - return s != style(); - } - QWidget *widget() const; QStyle *style() const; diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.cpp b/src/widgets/graphicsview/qgraphicslinearlayout.cpp index cad049c30a..baf68d6eef 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.cpp +++ b/src/widgets/graphicsview/qgraphicslinearlayout.cpp @@ -173,7 +173,6 @@ QGraphicsLayoutStyleInfo *QGraphicsLinearLayoutPrivate::styleInfo() const { if (!m_styleInfo) m_styleInfo = new QGraphicsLayoutStyleInfo(this); - m_styleInfo->updateChanged(QAbstractLayoutStyleInfo::Unknown); return m_styleInfo; } diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 28c6fb4813..2602ea2a51 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -61,7 +61,7 @@ public: void insertStretch(int index, int stretch = 1); void removeItem(QGraphicsLayoutItem *item); - void removeAt(int index); + void removeAt(int index) Q_DECL_OVERRIDE; void setSpacing(qreal spacing); qreal spacing() const; @@ -74,13 +74,13 @@ public: void setAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment); Qt::Alignment alignment(QGraphicsLayoutItem *item) const; - void setGeometry(const QRectF &rect); + void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - int count() const; - QGraphicsLayoutItem *itemAt(int index) const; + int count() const Q_DECL_OVERRIDE; + QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - void invalidate(); - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; + void invalidate() Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; #if 0 // ### Q5SizePolicy::ControlTypes controlTypes(LayoutSide side) const; diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 765caea0b1..c2bd73e056 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -55,63 +55,63 @@ public: QRectF subWidgetRect(const QWidget *widget) const; - void setGeometry(const QRectF &rect); + void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; enum { Type = 12 }; - int type() const; + int type() const Q_DECL_OVERRIDE; QGraphicsProxyWidget *createProxyForChildWidget(QWidget *child); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; - bool event(QEvent *event); - bool eventFilter(QObject *object, QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event); - void hideEvent(QHideEvent *event); + void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; #endif #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QGraphicsSceneDragDropEvent *event); - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event); - void dragMoveEvent(QGraphicsSceneDragDropEvent *event); - void dropEvent(QGraphicsSceneDragDropEvent *event); + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; #endif - void hoverEnterEvent(QGraphicsSceneHoverEvent *event); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); - void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - void grabMouseEvent(QEvent *event); - void ungrabMouseEvent(QEvent *event); + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + void grabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; + void ungrabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; #ifndef QT_NO_WHEELEVENT - void wheelEvent(QGraphicsSceneWheelEvent *event); + void wheelEvent(QGraphicsSceneWheelEvent *event) Q_DECL_OVERRIDE; #endif - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event); - void focusOutEvent(QFocusEvent *event); - bool focusNextPrevChild(bool next); + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const; - void inputMethodEvent(QInputMethodEvent *event); + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; - void resizeEvent(QGraphicsSceneResizeEvent *event); + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void resizeEvent(QGraphicsSceneResizeEvent *event) Q_DECL_OVERRIDE; protected Q_SLOTS: QGraphicsProxyWidget *newProxyWidget(const QWidget *); diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 988152da9d..44e39e5ef7 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -1468,6 +1468,8 @@ void QGraphicsScenePrivate::mousePressEventHandler(QGraphicsSceneMouseEvent *mou QGraphicsView *view = mouseEvent->widget() ? qobject_cast<QGraphicsView *>(mouseEvent->widget()->parentWidget()) : 0; bool dontClearSelection = view && view->dragMode() == QGraphicsView::ScrollHandDrag; + bool extendSelection = (mouseEvent->modifiers() & Qt::ControlModifier) != 0; + dontClearSelection |= extendSelection; if (!dontClearSelection) { // Clear the selection if the originating view isn't in scroll // hand drag mode. The view will clear the selection if no drag @@ -2263,6 +2265,28 @@ void QGraphicsScene::setSelectionArea(const QPainterPath &path, const QTransform void QGraphicsScene::setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode, const QTransform &deviceTransform) { + setSelectionArea(path, Qt::ReplaceSelection, mode, deviceTransform); +} + +/*! + \overload + \since 5.5 + + Sets the selection area to \a path using \a mode to determine if items are + included in the selection area. + + \a deviceTransform is the transformation that applies to the view, and needs to + be provided if the scene contains items that ignore transformations. + + \a selectionOperation determines what to do with the currently selected items. + + \sa clearSelection(), selectionArea() +*/ +void QGraphicsScene::setSelectionArea(const QPainterPath &path, + Qt::ItemSelectionOperation selectionOperation, + Qt::ItemSelectionMode mode, + const QTransform &deviceTransform) +{ Q_D(QGraphicsScene); // Note: with boolean path operations, we can improve performance here @@ -2287,10 +2311,16 @@ void QGraphicsScene::setSelectionArea(const QPainterPath &path, Qt::ItemSelectio } } - // Unselect all items outside path. - foreach (QGraphicsItem *item, unselectItems) { - item->setSelected(false); - changed = true; + switch (selectionOperation) { + case Qt::ReplaceSelection: + // Deselect all items outside path. + foreach (QGraphicsItem *item, unselectItems) { + item->setSelected(false); + changed = true; + } + break; + default: + break; } // Reenable emitting selectionChanged() for individual items. @@ -4106,7 +4136,7 @@ void QGraphicsScene::wheelEvent(QGraphicsSceneWheelEvent *wheelEvent) wheelEvent->scenePos(), wheelEvent->widget()); -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC // On Mac, ignore the event if the first item under the mouse is not the last opened // popup (or one of its descendant) if (!d->popupWidgets.isEmpty() && !wheelCandidates.isEmpty() && wheelCandidates.first() != d->popupWidgets.back() && !d->popupWidgets.back()->isAncestorOf(wheelCandidates.first())) { @@ -4345,7 +4375,7 @@ void QGraphicsScenePrivate::drawItemHelper(QGraphicsItem *item, QPainter *painte // Render directly, using no cache. if (cacheMode == QGraphicsItem::NoCache -#ifdef Q_WS_X11 +#ifdef Q_DEAD_CODE_FROM_QT4_X11 || !X11->use_xrender #endif ) { @@ -4910,7 +4940,7 @@ void QGraphicsScenePrivate::draw(QGraphicsItem *item, QPainter *painter, const Q if (painterStateProtection || restorePainterClip) painter->restore(); - static int drawRect = qgetenv("QT_DRAW_SCENE_ITEM_RECTS").toInt(); + static int drawRect = qEnvironmentVariableIntValue("QT_DRAW_SCENE_ITEM_RECTS"); if (drawRect) { QPen oldPen = painter->pen(); QBrush oldBrush = painter->brush(); diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 24255c3b30..03df18fbce 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -177,6 +177,8 @@ public: QPainterPath selectionArea() const; void setSelectionArea(const QPainterPath &path, const QTransform &deviceTransform); void setSelectionArea(const QPainterPath &path, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape, const QTransform &deviceTransform = QTransform()); + void setSelectionArea(const QPainterPath &path, Qt::ItemSelectionOperation selectionOperation, Qt::ItemSelectionMode mode = Qt::IntersectsItemShape, const QTransform &deviceTransform = QTransform()); + // ### Qt6 merge the last 2 functions and add a default: Qt::ItemSelectionOperation selectionOperation = Qt::ReplaceSelection QGraphicsItemGroup *createItemGroup(const QList<QGraphicsItem *> &items); void destroyItemGroup(QGraphicsItemGroup *group); @@ -253,8 +255,8 @@ public Q_SLOTS: void clear(); protected: - bool event(QEvent *event); - bool eventFilter(QObject *watched, QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event); virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event); diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp index 739acecf5b..9a2932d127 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp @@ -45,7 +45,7 @@ class QGraphicsSceneInsertItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList<QGraphicsItem *> *items) + void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE { items->prepend(item); } }; @@ -54,7 +54,7 @@ class QGraphicsSceneRemoveItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList<QGraphicsItem *> *items) + void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE { items->removeAll(item); } }; @@ -64,7 +64,7 @@ public: QList<QGraphicsItem *> *foundItems; bool onlyTopLevelItems; - void visit(QList<QGraphicsItem *> *items) + void visit(QList<QGraphicsItem *> *items) Q_DECL_OVERRIDE { for (int i = 0; i < items->size(); ++i) { QGraphicsItem *item = items->at(i); diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index 02a3b44ff2..c329083844 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -71,25 +71,25 @@ public: QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0); ~QGraphicsSceneBspTreeIndex(); - QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const; - QList<QGraphicsItem *> estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const; - QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const; + QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; + QList<QGraphicsItem *> estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; + QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE; int bspTreeDepth() const; void setBspTreeDepth(int depth); protected Q_SLOTS: - void updateSceneRect(const QRectF &rect); + void updateSceneRect(const QRectF &rect) Q_DECL_OVERRIDE; protected: - bool event(QEvent *event); - void clear(); + bool event(QEvent *event) Q_DECL_OVERRIDE; + void clear() Q_DECL_OVERRIDE; - void addItem(QGraphicsItem *item); - void removeItem(QGraphicsItem *item); - void prepareBoundingRectChange(const QGraphicsItem *item); + void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE; + void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE; + void prepareBoundingRectChange(const QGraphicsItem *item) Q_DECL_OVERRIDE; - void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value); + void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value) Q_DECL_OVERRIDE; private : Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index 57d4ce9702..691e030a89 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -65,10 +65,10 @@ public: QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0) : QGraphicsSceneIndex(scene), m_numSortedElements(0) { } - QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const + QList<QGraphicsItem *> items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE { Q_UNUSED(order); return m_items; } - virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const + virtual QList<QGraphicsItem *> estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE { Q_UNUSED(rect); Q_UNUSED(order); @@ -76,16 +76,16 @@ public: } protected : - virtual void clear() + virtual void clear() Q_DECL_OVERRIDE { m_items.clear(); m_numSortedElements = 0; } - virtual void addItem(QGraphicsItem *item) + virtual void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE { m_items << item; } - virtual void removeItem(QGraphicsItem *item) + virtual void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE { // Sort m_items if needed if (m_numSortedElements < m_items.size()) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index db8b574515..c2ee71d78d 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -93,7 +93,7 @@ public: qreal zScale() const; void setZScale(qreal); - void applyTo(QMatrix4x4 *matrix) const; + void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; Q_SIGNALS: void originChanged(); @@ -129,7 +129,7 @@ public: void setAxis(const QVector3D &axis); void setAxis(Qt::Axis axis); - void applyTo(QMatrix4x4 *matrix) const; + void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; Q_SIGNALS: void originChanged(); diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index 5484ecb96e..ef4218bf86 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -350,6 +350,7 @@ QGraphicsViewPrivate::QGraphicsViewPrivate() #ifndef QT_NO_RUBBERBAND rubberBanding(false), rubberBandSelectionMode(Qt::IntersectsItemShape), + rubberBandSelectionOperation(Qt::ReplaceSelection), #endif handScrollMotions(0), cacheMode(0), #ifndef QT_NO_CURSOR @@ -735,6 +736,7 @@ void QGraphicsViewPrivate::updateRubberBand(const QMouseEvent *event) // if we didn't get the release events). if (!event->buttons()) { rubberBanding = false; + rubberBandSelectionOperation = Qt::ReplaceSelection; if (!rubberBandRect.isNull()) { rubberBandRect = QRect(); emit q->rubberBandChanged(rubberBandRect, QPointF(), QPointF()); @@ -768,7 +770,7 @@ void QGraphicsViewPrivate::updateRubberBand(const QMouseEvent *event) selectionArea.addPolygon(q->mapToScene(rubberBandRect)); selectionArea.closeSubpath(); if (scene) - scene->setSelectionArea(selectionArea, rubberBandSelectionMode, q->viewportTransform()); + scene->setSelectionArea(selectionArea, rubberBandSelectionOperation, rubberBandSelectionMode, q->viewportTransform()); } #endif @@ -3289,8 +3291,14 @@ void QGraphicsView::mousePressEvent(QMouseEvent *event) d->rubberBanding = true; d->rubberBandRect = QRect(); if (d->scene) { - // Initiating a rubber band always clears the selection. - d->scene->clearSelection(); + bool extendSelection = (event->modifiers() & Qt::ControlModifier) != 0; + + if (extendSelection) { + d->rubberBandSelectionOperation = Qt::AddToSelection; + } else { + d->rubberBandSelectionOperation = Qt::ReplaceSelection; + d->scene->clearSelection(); + } } } } else @@ -3347,6 +3355,7 @@ void QGraphicsView::mouseReleaseEvent(QMouseEvent *event) d->updateAll(); } d->rubberBanding = false; + d->rubberBandSelectionOperation = Qt::ReplaceSelection; if (!d->rubberBandRect.isNull()) { d->rubberBandRect = QRect(); emit rubberBandChanged(d->rubberBandRect, QPointF(), QPointF()); @@ -3475,7 +3484,7 @@ void QGraphicsView::paintEvent(QPaintEvent *event) // Draw background if ((d->cacheMode & CacheBackground) -#ifdef Q_WS_X11 +#ifdef Q_DEAD_CODE_FROM_QT4_X11 && X11->use_xrender #endif ) { @@ -3674,7 +3683,7 @@ void QGraphicsView::scrollContentsBy(int dx, int dy) d->updateLastCenterPoint(); if ((d->cacheMode & CacheBackground) -#ifdef Q_WS_X11 +#ifdef Q_DEAD_CODE_FROM_QT4_X11 && X11->use_xrender #endif ) { diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index b681551fe7..3dea0273b2 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -54,7 +54,6 @@ class Q_WIDGETS_EXPORT QGraphicsView : public QAbstractScrollArea { Q_OBJECT Q_FLAGS(QPainter::RenderHints CacheMode OptimizationFlags) - Q_ENUMS(ViewportAnchor DragMode ViewportUpdateMode) Q_PROPERTY(QBrush backgroundBrush READ backgroundBrush WRITE setBackgroundBrush) Q_PROPERTY(QBrush foregroundBrush READ foregroundBrush WRITE setForegroundBrush) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive) @@ -77,6 +76,7 @@ public: AnchorViewCenter, AnchorUnderMouse }; + Q_ENUM(ViewportAnchor) enum CacheModeFlag { CacheNone = 0x0, @@ -89,6 +89,7 @@ public: ScrollHandDrag, RubberBandDrag }; + Q_ENUM(DragMode) enum ViewportUpdateMode { FullViewportUpdate, @@ -97,6 +98,7 @@ public: NoViewportUpdate, BoundingRectViewportUpdate }; + Q_ENUM(ViewportUpdateMode) enum OptimizationFlag { DontClipPainter = 0x1, // obsolete @@ -110,7 +112,7 @@ public: QGraphicsView(QGraphicsScene *scene, QWidget *parent = 0); ~QGraphicsView(); - QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; QPainter::RenderHints renderHints() const; void setRenderHint(QPainter::RenderHint hint, bool enabled = true); @@ -206,7 +208,7 @@ public: inline QPoint mapFromScene(qreal x, qreal y) const; inline QPolygon mapFromScene(qreal x, qreal y, qreal w, qreal h) const; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; QBrush backgroundBrush() const; void setBackgroundBrush(const QBrush &brush); @@ -225,37 +227,37 @@ Q_SIGNALS: #endif protected Q_SLOTS: - void setupViewport(QWidget *widget); + void setupViewport(QWidget *widget) Q_DECL_OVERRIDE; protected: QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = 0); - bool event(QEvent *event); - bool viewportEvent(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; + bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; #endif - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void focusInEvent(QFocusEvent *event); - bool focusNextPrevChild(bool next); - void focusOutEvent(QFocusEvent *event); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; #ifndef QT_NO_WHEELEVENT - void wheelEvent(QWheelEvent *event); + void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; #endif - void paintEvent(QPaintEvent *event); - void resizeEvent(QResizeEvent *event); - void scrollContentsBy(int dx, int dy); - void showEvent(QShowEvent *event); - void inputMethodEvent(QInputMethodEvent *event); + void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; virtual void drawBackground(QPainter *painter, const QRectF &rect); virtual void drawForeground(QPainter *painter, const QRectF &rect); diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index ca87b932e2..836cb6d435 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -134,6 +134,7 @@ public: void updateRubberBand(const QMouseEvent *event); bool rubberBanding; Qt::ItemSelectionMode rubberBandSelectionMode; + Qt::ItemSelectionOperation rubberBandSelectionOperation; #endif int handScrollMotions; @@ -175,7 +176,7 @@ public: inline void dispatchPendingUpdateRequests() { -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC // QWidget::update() works slightly different on the Mac without the raster engine; // it's not part of our backing store so it needs special threatment. if (QApplicationPrivate::graphics_system_name != QLatin1String("raster")) { @@ -186,7 +187,7 @@ public: extern void qt_mac_dispatchPendingUpdateRequests(QWidget *); qt_mac_dispatchPendingUpdateRequests(viewport->window()); } else -#endif // !Q_WS_MAC +#endif // !Q_DEAD_CODE_FROM_QT4_MAC { if (qt_widget_private(viewport)->paintOnScreen()) QCoreApplication::sendPostedEvents(viewport, QEvent::UpdateRequest); diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 98e011ff05..554dda0b8e 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -694,7 +694,7 @@ void QGraphicsWidget::initStyleOption(QStyleOption *option) const option->state |= QStyle::State_Window; /* ### -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC extern bool qt_mac_can_clickThrough(const QGraphicsWidget *w); //qwidget_mac.cpp if (!(option->state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget)) option->state &= ~QStyle::State_Enabled; @@ -2390,18 +2390,6 @@ bool QGraphicsWidget::close() return true; } -#ifdef Q_NO_USING_KEYWORD -/*! - \fn const QObjectList &QGraphicsWidget::children() const - \internal - - This function returns the same value as QObject::children(). It's - provided to differentiate between the obsolete member - QGraphicsItem::children() and QObject::children(). QGraphicsItem now - provides childItems() instead. -*/ -#endif - #if 0 void QGraphicsWidget::dumpFocusChain() { diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index d0f3ac9af6..7999add64e 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -100,12 +100,12 @@ public: inline void resize(qreal w, qreal h) { resize(QSizeF(w, h)); } QSizeF size() const; - void setGeometry(const QRectF &rect); + void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; inline void setGeometry(qreal x, qreal y, qreal w, qreal h); inline QRectF rect() const { return QRectF(QPointF(), size()); } void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; void setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom); void getWindowFrameMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const; @@ -150,22 +150,18 @@ public: enum { Type = 11 }; - int type() const; + int type() const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - QRectF boundingRect() const; - QPainterPath shape() const; + QRectF boundingRect() const Q_DECL_OVERRIDE; + QPainterPath shape() const Q_DECL_OVERRIDE; #if 0 void dumpFocusChain(); #endif -#ifdef Q_NO_USING_KEYWORD - const QObjectList &children() const { return QObject::children(); } -#else using QObject::children; -#endif Q_SIGNALS: void geometryChanged(); @@ -177,28 +173,28 @@ public Q_SLOTS: protected: virtual void initStyleOption(QStyleOption *option) const; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; - void updateGeometry(); + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void updateGeometry() Q_DECL_OVERRIDE; // Notification - QVariant itemChange(GraphicsItemChange change, const QVariant &value); + QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; virtual QVariant propertyChange(const QString &propertyName, const QVariant &value); // Scene events - bool sceneEvent(QEvent *event); + bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; virtual bool windowFrameEvent(QEvent *e); virtual Qt::WindowFrameSection windowFrameSectionAt(const QPointF& pos) const; // Base event handlers - bool event(QEvent *event); + bool event(QEvent *event) Q_DECL_OVERRIDE; //virtual void actionEvent(QActionEvent *event); virtual void changeEvent(QEvent *event); virtual void closeEvent(QCloseEvent *event); //void create(WId window = 0, bool initializeWindow = true, bool destroyOldWindow = true); //void destroy(bool destroyWindow = true, bool destroySubWindows = true); - void focusInEvent(QFocusEvent *event); + void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; virtual bool focusNextPrevChild(bool next); - void focusOutEvent(QFocusEvent *event); + void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; virtual void hideEvent(QHideEvent *event); //virtual int metric(PaintDeviceMetric m ) const; virtual void moveEvent(QGraphicsSceneMoveEvent *event); @@ -207,8 +203,8 @@ protected: virtual void resizeEvent(QGraphicsSceneResizeEvent *event); virtual void showEvent(QShowEvent *event); //virtual void tabletEvent(QTabletEvent *event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event); - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event); + virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; virtual void grabMouseEvent(QEvent *event); virtual void ungrabMouseEvent(QEvent *event); virtual void grabKeyboardEvent(QEvent *event); diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp index fa369463f7..b9d9745faa 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.cpp +++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp @@ -46,7 +46,7 @@ #include <QtWidgets/qstyleoption.h> #include <QtWidgets/QStyleOptionTitleBar> #include <QtWidgets/QGraphicsSceneMouseEvent> -#if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) +#if defined(Q_DEAD_CODE_FROM_QT4_MAC) && !defined(QT_NO_STYLE_MAC) # include <private/qmacstyle_mac_p.h> #endif @@ -682,7 +682,7 @@ void QGraphicsWidgetPrivate::windowFrameHoverMoveEvent(QGraphicsSceneHoverEvent case Qt::TitleBarArea: windowData->buttonRect = q->style()->subControlRect( QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarCloseButton, 0); -#ifdef Q_WS_MAC +#ifdef Q_DEAD_CODE_FROM_QT4_MAC // On mac we should hover if we are in the 'area' of the buttons windowData->buttonRect |= q->style()->subControlRect( QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarMinButton, 0); diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 2cb6565f87..16bf2e7c51 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -103,13 +103,13 @@ public: QPalette palette; uint inheritedPaletteResolveMask; void setPalette_helper(const QPalette &palette); - void resolvePalette(uint inheritedMask); + void resolvePalette(uint inheritedMask) Q_DECL_OVERRIDE; void updatePalette(const QPalette &palette); QPalette naturalWidgetPalette() const; QFont font; uint inheritedFontResolveMask; void setFont_helper(const QFont &font); - void resolveFont(uint inheritedMask); + void resolveFont(uint inheritedMask) Q_DECL_OVERRIDE; void updateFont(const QFont &font); QFont naturalWidgetFont() const; @@ -124,13 +124,13 @@ public: bool hasDecoration() const; // Private Properties - qreal width() const; - void setWidth(qreal); - void resetWidth(); + qreal width() const Q_DECL_OVERRIDE; + void setWidth(qreal) Q_DECL_OVERRIDE; + void resetWidth() Q_DECL_OVERRIDE; - qreal height() const; - void setHeight(qreal); - void resetHeight(); + qreal height() const Q_DECL_OVERRIDE; + void setHeight(qreal) Q_DECL_OVERRIDE; + void resetHeight() Q_DECL_OVERRIDE; void setGeometryFromSetPos(); // State |