QMenu: refactor of the update of the geometry to have one central place

of calculation (ie. updateActionRects)

1 files changed, 4 insertions, 11 deletions

diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index e92eca0..cd750d5 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -155,19 +155,12 @@ public:
     mutable uint itemsDirty : 1;
     mutable uint maxIconWidth, tabWidth;
     QRect actionRect(QAction *) const;
-    QRect actionRect(int index) const;
 
-    struct ActionRectInfo {
-        QAction *action;
-        QRect rect;
-    };
-    mutable QVector<ActionRectInfo> actionRects;
+    mutable QVector<QRect> actionRects;
     mutable QHash<QAction *, QWidget *> widgetItems;
-    void calcActionRects() const;
-    void updateActions();
+    void updateActionRects() const;
     QRect popupGeometry(int screen=-1) const;
-    QList<QAction *> filteredActions() const;
-    uint ncols : 4; //4 bits is probably plenty
+    mutable uint ncols : 4; //4 bits is probably plenty
     uint collapsibleSeparators : 1;
 
     uint activationRecursionGuard : 1;
@@ -239,7 +232,7 @@ public:
 
     //sloppy selection
     static QBasicTimer sloppyDelayTimer;
-    QAction *sloppyAction;
+    mutable QAction *sloppyAction;
     QRegion sloppyRegion;
 
     //default action