From 69cca470fe5636529827312b9961b648ec7eb122 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Date: Thu, 30 Jul 2015 15:32:34 +0200
Subject: Cocoa QPA plugin: Unlock full Q_DECL_OVERRIDE karma

Change-Id: I0f631c3b120d052ad552809d0aab9493e5b41a70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
---
 src/plugins/platforms/cocoa/qcocoamenu.h | 42 ++++++++++++++++----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qcocoamenu.h')

diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h
index 59807deb5a..eccc5230b5 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.h
+++ b/src/plugins/platforms/cocoa/qcocoamenu.h
@@ -49,29 +49,29 @@ public:
     QCocoaMenu();
     ~QCocoaMenu();
 
-    inline virtual void setTag(quintptr tag)
-        { m_tag = tag; }
-    inline virtual quintptr tag() const
-        { return m_tag; }
-
-    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before);
-    void removeMenuItem(QPlatformMenuItem *menuItem);
-    void syncMenuItem(QPlatformMenuItem *menuItem);
-    void setEnabled(bool enabled);
-    bool isEnabled() const;
-    void setVisible(bool visible);
-    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item);
-    void dismiss();
-
-    void syncSeparatorsCollapsible(bool enable);
+    void setTag(quintptr tag) Q_DECL_OVERRIDE
+    { m_tag = tag; }
+    quintptr tag() const Q_DECL_OVERRIDE
+    { return m_tag; }
+
+    void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE;
+    void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
+    void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE;
+    void setEnabled(bool enabled) Q_DECL_OVERRIDE;
+    bool isEnabled() const Q_DECL_OVERRIDE;
+    void setVisible(bool visible) Q_DECL_OVERRIDE;
+    void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE;
+    void dismiss() Q_DECL_OVERRIDE;
+
+    void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE;
 
     void syncModalState(bool modal);
 
-    virtual void setIcon(const QIcon &icon) { Q_UNUSED(icon) }
+    void setIcon(const QIcon &icon) Q_DECL_OVERRIDE { Q_UNUSED(icon) }
 
-    void setText(const QString &text);
-    void setMinimumWidth(int width);
-    void setFont(const QFont &font);
+    void setText(const QString &text) Q_DECL_OVERRIDE;
+    void setMinimumWidth(int width) Q_DECL_OVERRIDE;
+    void setFont(const QFont &font) Q_DECL_OVERRIDE;
 
     inline NSMenu *nsMenu() const
         { return m_nativeMenu; }
@@ -80,8 +80,8 @@ public:
 
     inline bool isVisible() const { return m_visible; }
 
-    virtual QPlatformMenuItem *menuItemAt(int position) const;
-    virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const;
+    QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE;
+    QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE;
 
     QList<QCocoaMenuItem *> items() const;
     QList<QCocoaMenuItem *> merged() const;
-- 
cgit v1.2.3