Fix compile warnings from missing override attribute

Add it, and remove redundant virtual where it was used.

Change-Id: I7e0635f8d9eafbad49de63302a5b8f5cd25c0080
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 16 insertions, 16 deletions

diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h
index 10f83e5b..2604cfc6 100644
--- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h
+++ b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac_p.h
@@ -64,31 +64,31 @@ class QMacStyle : public QCommonStyle
     Q_OBJECT
 public:
     QMacStyle();
-    virtual ~QMacStyle();
+    ~QMacStyle();
 
-    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p) const;
-    void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p) const;
-    void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p) const;
+    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p) const override;
+    void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p) const override;
+    void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p) const override;
 
-    QRect subElementRect(SubElement r, const QStyleOption *opt) const;
-    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc) const;
-    SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt) const;
+    QRect subElementRect(SubElement r, const QStyleOption *opt) const override;
+    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc) const override;
+    SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, const QPoint &pt) const override;
 
-    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize) const;
-    QFont font(ControlElement element, const QStyle::State state) const;
+    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize) const override;
+    QFont font(ControlElement element, const QStyle::State state) const override;
     QMargins ninePatchMargins(ComplexControl cc, const QStyleOptionComplex *opt, const QSize &imageSize) const override;
 
-    int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0) const;
-    virtual int styleHint(StyleHint sh, const QStyleOption *opt = 0, QStyleHintReturn *shret = 0) const;
+    int pixelMetric(PixelMetric pm, const QStyleOption *opt = 0) const override;
+    int styleHint(StyleHint sh, const QStyleOption *opt = 0, QStyleHintReturn *shret = 0) const override;
 
-    QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt) const;
-    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const;
+    QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt) const override;
+    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const override;
 
-    virtual void drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal,
+    void drawItemText(QPainter *p, const QRect &r, int flags, const QPalette &pal,
                               bool enabled, const QString &text,
-                              QPalette::ColorRole textRole  = QPalette::NoRole) const;
+                              QPalette::ColorRole textRole  = QPalette::NoRole) const override;
 
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0) const override;
 
 private:
     Q_DISABLE_COPY_MOVE(QMacStyle)