diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-13 09:41:21 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-04-13 09:46:38 (GMT) |
| commit | 6433302cf96b64460cbcd770d8cb703f29a001ad (patch) | |
| tree | 2e838343c8d7510bab5590467aaf8a6320184486 /src/gui/kernel/qaction_p.h | |
| parent | be16b3def01783e693883c0990f73c815042b1e7 (diff) | |
| download | Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.zip Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.tar.gz Qt-6433302cf96b64460cbcd770d8cb703f29a001ad.tar.bz2 | |
Improve handling of QAction in soft key manager
It also reduces QActionPrivate by 16 bytes.
Diffstat (limited to 'src/gui/kernel/qaction_p.h')
| -rw-r--r-- | src/gui/kernel/qaction_p.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index b57e5d2..899b01b 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -75,6 +75,11 @@ public: QActionPrivate(); ~QActionPrivate(); + static QActionPrivate *get(QAction *q) + { + return q->d_func(); + } + bool showStatusText(QWidget *w, const QString &str); QPointer<QActionGroup> group; @@ -103,10 +108,16 @@ public: uint checked : 1; uint separator : 1; uint fontSet : 1; - QAction::MenuRole menuRole; - QAction::SoftKeyRole softKeyRole; - QAction::Priority priority; + + //for soft keys management + uint forceEnabledInSoftkeys : 1; + uint menuActionSoftkeys : 1; + + QAction::MenuRole menuRole : 3; + QAction::SoftKeyRole softKeyRole : 2; + QAction::Priority priority : 14; int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 + QList<QWidget *> widgets; #ifndef QT_NO_GRAPHICSVIEW QList<QGraphicsWidget *> graphicsWidgets; |