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/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h
index b7371a5f49..61cadab56d 100644
--- a/src/plugins/platforms/ios/qiosmenu.h
+++ b/src/plugins/platforms/ios/qiosmenu.h
@@ -56,9 +56,6 @@ class QIOSMenuItem : public QPlatformMenuItem
 public:
     QIOSMenuItem();
 
-    void setTag(quintptr tag) Q_DECL_OVERRIDE;
-    quintptr tag()const Q_DECL_OVERRIDE;
-
     void setText(const QString &text) Q_DECL_OVERRIDE;
     void setIcon(const QIcon &) Q_DECL_OVERRIDE {}
     void setMenu(QPlatformMenu *) Q_DECL_OVERRIDE;
@@ -74,7 +71,6 @@ public:
     void setEnabled(bool enabled) Q_DECL_OVERRIDE;
     void setIconSize(int) Q_DECL_OVERRIDE {}
 
-    quintptr m_tag;
     bool m_visible;
     QString m_text;
     MenuRole m_role;
@@ -97,9 +93,6 @@ public:
     void syncMenuItem(QPlatformMenuItem *) Q_DECL_OVERRIDE;
     void syncSeparatorsCollapsible(bool) Q_DECL_OVERRIDE {}
 
-    void setTag(quintptr tag) Q_DECL_OVERRIDE;
-    quintptr tag()const Q_DECL_OVERRIDE;
-
     void setText(const QString &) Q_DECL_OVERRIDE;
     void setIcon(const QIcon &) Q_DECL_OVERRIDE {}
     void setEnabled(bool enabled) Q_DECL_OVERRIDE;
@@ -121,7 +114,6 @@ protected:
     bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
-    quintptr m_tag;
     bool m_enabled;
     bool m_visible;
     QString m_text;
diff --git a/src/plugins/platforms/ios/qiosmenu.mm b/src/plugins/platforms/ios/qiosmenu.mm
index 01cb3badea..6c70676a31 100644
--- a/src/plugins/platforms/ios/qiosmenu.mm
+++ b/src/plugins/platforms/ios/qiosmenu.mm
@@ -259,7 +259,6 @@ static NSString *const kSelectorPrefix = @"_qtMenuItem_";
 
 QIOSMenuItem::QIOSMenuItem()
     : QPlatformMenuItem()
-    , m_tag(0)
     , m_visible(true)
     , m_text(QString())
     , m_role(MenuRole(0))
@@ -269,16 +268,6 @@ QIOSMenuItem::QIOSMenuItem()
 {
 }
 
-void QIOSMenuItem::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
-quintptr QIOSMenuItem::tag() const
-{
-    return m_tag;
-}
-
 void QIOSMenuItem::setText(const QString &text)
 {
     m_text = QPlatformTheme::removeMnemonics(text);
@@ -319,7 +308,6 @@ void QIOSMenuItem::setEnabled(bool enabled)
 
 QIOSMenu::QIOSMenu()
     : QPlatformMenu()
-    , m_tag(0)
     , m_enabled(true)
     , m_visible(false)
     , m_text(QString())
@@ -371,16 +359,6 @@ void QIOSMenu::syncMenuItem(QPlatformMenuItem *)
     }
 }
 
-void QIOSMenu::setTag(quintptr tag)
-{
-    m_tag = tag;
-}
-
-quintptr QIOSMenu::tag() const
-{
-    return m_tag;
-}
-
 void QIOSMenu::setText(const QString &text)
 {
    m_text = text;