Make platform menu tag/setTag not be pure virtual

Reasons:
 * Tag means nothing to the platform, tag is something
   the Qt side code will store and then restore, but it's meaningless
   for the platform, since it can be either the pointer to an
   action (qmenu.cpp) or an item count (qcombobox.cpp)
 * Since it's meaningless to the platform you don't know what
   to do when trying to implement a platform, this shows in how
   the field was being initialized, some initialized to this,
   some initialized to 0

On a followup commit we will remove the virtual tag but first
need to fix up other QPAs that don't live in the main repo

Change-Id: I15ac83f3bf7e4c741153d31ac761dbbe6f4b1b52
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

2 files changed, 0 insertions, 30 deletions

diff --git a/src/plugins/platformthemes/gtk3/qgtk3menu.cpp b/src/plugins/platformthemes/gtk3/qgtk3menu.cpp
index 38c2d251b4..a123c5aaec 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3menu.cpp
+++ b/src/plugins/platformthemes/gtk3/qgtk3menu.cpp
@@ -84,7 +84,6 @@ QGtk3MenuItem::QGtk3MenuItem()
       m_enabled(true),
       m_underline(false),
       m_invalid(true),
-      m_tag(reinterpret_cast<quintptr>(this)),
       m_menu(nullptr),
       m_item(nullptr)
 {
@@ -145,16 +144,6 @@ GtkWidget *QGtk3MenuItem::handle() const
     return m_item;
 }
 
-quintptr QGtk3MenuItem::tag() const
-{
-    return m_tag;
-}
-
-void QGtk3MenuItem::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
 QString QGtk3MenuItem::text() const
 {
     return m_text;
@@ -341,7 +330,6 @@ void QGtk3MenuItem::onToggle(GtkCheckMenuItem *check, void *data)
 }
 
 QGtk3Menu::QGtk3Menu()
-    : m_tag(reinterpret_cast<quintptr>(this))
 {
     m_menu = gtk_menu_new();
 
@@ -402,16 +390,6 @@ void QGtk3Menu::syncSeparatorsCollapsible(bool enable)
     Q_UNUSED(enable);
 }
 
-quintptr QGtk3Menu::tag() const
-{
-    return m_tag;
-}
-
-void QGtk3Menu::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
 void QGtk3Menu::setEnabled(bool enabled)
 {
     gtk_widget_set_sensitive(m_menu, enabled);
diff --git a/src/plugins/platformthemes/gtk3/qgtk3menu.h b/src/plugins/platformthemes/gtk3/qgtk3menu.h
index b43f363fa4..002fe1c0ce 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3menu.h
+++ b/src/plugins/platformthemes/gtk3/qgtk3menu.h
@@ -61,9 +61,6 @@ public:
     GtkWidget *create();
     GtkWidget *handle() const;
 
-    quintptr tag() const override;
-    void setTag(quintptr tag) override;
-
     QString text() const;
     void setText(const QString &text) override;
 
@@ -110,7 +107,6 @@ private:
     bool m_exclusive;
     bool m_underline;
     bool m_invalid;
-    quintptr m_tag;
     QGtk3Menu *m_menu;
     GtkWidget *m_item;
     QString m_text;
@@ -132,9 +128,6 @@ public:
     void syncMenuItem(QPlatformMenuItem *item) override;
     void syncSeparatorsCollapsible(bool enable) override;
 
-    quintptr tag() const override;
-    void setTag(quintptr tag) override;
-
     void setEnabled(bool enabled) override;
     void setVisible(bool visible) override;
 
@@ -157,7 +150,6 @@ protected:
     static void onHide(GtkWidget *menu, void *data);
 
 private:
-    quintptr m_tag;
     GtkWidget *m_menu;
     QPoint m_targetPos;
     QVector<QGtk3MenuItem *> m_items;