diff options
Diffstat (limited to 'src/platformsupport')
3 files changed, 3 insertions, 7 deletions
diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp index c1ebbbf91b..4b099e5c0e 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp @@ -59,8 +59,8 @@ QDBusPlatformMenuItem::QDBusPlatformMenuItem(quintptr tag) , m_isSeparator(false) , m_isCheckable(false) , m_isChecked(false) - , m_dbusID(nextDBusID++) , m_hasExclusiveGroup(false) + , m_dbusID(nextDBusID++) { menuItemsByID.insert(m_dbusID, this); } @@ -171,7 +171,6 @@ QDBusPlatformMenu::QDBusPlatformMenu(quintptr tag) : m_tag(tag ? tag : reinterpret_cast<quintptr>(this)) , m_isEnabled(true) , m_isVisible(true) - , m_isSeparator(false) , m_revision(1) , m_containingMenuItem(Q_NULLPTR) { diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h index 2e6e04d28d..49b7316d11 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h @@ -126,9 +126,9 @@ private: bool m_isSeparator : 1; bool m_isCheckable : 1; bool m_isChecked : 1; - int m_dbusID : 16; bool m_hasExclusiveGroup : 1; - int m_reserved : 6; + short /*unused*/ : 6; + short m_dbusID : 16; QKeySequence m_shortcut; }; @@ -189,7 +189,6 @@ private: QIcon m_icon; bool m_isEnabled; bool m_isVisible; - bool m_isSeparator; uint m_revision; QHash<quintptr, QDBusPlatformMenuItem *> m_itemsByTag; QList<QDBusPlatformMenuItem *> m_items; diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h index ff1a7ae532..4c9bc8f7e3 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h @@ -159,8 +159,6 @@ private: QTemporaryFile *m_tempAttentionIcon; QString m_attentionIconName; QTimer m_attentionTimer; - bool m_isRequestingAttention; - bool m_hasMenu; bool m_registered; }; |