summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2017-04-25 16:57:49 -0300
committerThiago Macieira <thiago.macieira@intel.com>2017-04-26 13:11:39 +0000
commit8e6a17f687205bdbc77f1d24363c82a8130ce17c (patch)
tree6366da004559f990e82f17a5dd0f631536b5e580 /src/platformsupport
parent6ac33c484130c72dfbd831210cf3e9efe6de79cd (diff)
Fix unused private fields in dbusmenu and dbustray
qdbusplatformmenu_p.h:131:9: error: private field 'm_reserved' is not used [-Werror,-Wunused-private-field] qdbusplatformmenu_p.h:192:10: error: private field 'm_isSeparator' is not used [-Werror,-Wunused-private-field] etc. Change-Id: I84e363d735b443cb9beefffd14b8bc4253081145 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/platformsupport')
-rw-r--r--src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu.cpp3
-rw-r--r--src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h5
-rw-r--r--src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h2
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;
};