diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 14:52:01 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-07-02 21:57:06 +0200 |
| commit | 2a6cdec718934ca2cc7f6f9c616ebe62f6912123 (patch) | |
| tree | c8b9ed8db47912dccd2e8d125d23760936820c29 /src/widgets/widgets/qmenu_p.h | |
| parent | d4c04acc65657d29df5b790281a8d1ba896dd868 (diff) | |
Use QList instead of QVector in widgets
Task-number: QTBUG-84469
Change-Id: I3007734f8e4f164ece9dd8850ef007cbef9e12ef
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu_p.h')
| -rw-r--r-- | src/widgets/widgets/qmenu_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 3e49f0780d..4814fcaad9 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -348,7 +348,7 @@ public: //item calculations QRect actionRect(QAction *) const; - mutable QVector<QRect> actionRects; + mutable QList<QRect> actionRects; mutable QHash<QAction *, QWidget *> widgetItems; void updateActionRects() const; void updateActionRects(const QRect &screen) const; @@ -437,7 +437,7 @@ public: QPointer<QWidget> widget; QPointer<QAction> action; }; - virtual QVector<QPointer<QWidget> > calcCausedStack() const; + virtual QList<QPointer<QWidget>> calcCausedStack() const; QMenuCaused causedPopup; void hideUpToMenuBar(); void hideMenu(QMenu *menu); @@ -462,7 +462,8 @@ public: //firing of events void activateAction(QAction *, QAction::ActionEvent, bool self=true); - void activateCausedStack(const QVector<QPointer<QWidget> > &, QAction *, QAction::ActionEvent, bool); + void activateCausedStack(const QList<QPointer<QWidget>> &, QAction *, QAction::ActionEvent, + bool); void _q_actionTriggered(); void _q_actionHovered(); |