1 files changed, 15 insertions, 15 deletions

diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index cd8ba95b06..e49fd701d6 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -730,7 +730,7 @@ public:
         , called(false)
     {}
 
-    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE {
+    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const override {
         called = true;
         return QProxyStyle::drawPrimitive(pe, opt, p, w);
     }
@@ -773,74 +773,74 @@ class TestStyleOptionInitProxy: public QProxyStyle
     Q_OBJECT
 public:
     mutable bool invalidOptionsDetected;
-    explicit TestStyleOptionInitProxy(QStyle *style = Q_NULLPTR)
+    explicit TestStyleOptionInitProxy(QStyle *style = nullptr)
         : QProxyStyle(style),
           invalidOptionsDetected(false)
     {}
 
-    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE {
+    void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const override {
         checkStyleEnum<QStyle::PrimitiveElement>(pe, opt);
         return QProxyStyle::drawPrimitive(pe, opt, p, w);
     }
 
-    void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE {
+    void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const override {
         checkStyleEnum<QStyle::ControlElement>(element, opt);
         return QProxyStyle::drawControl(element, opt, p, w);
     }
 
-    QRect subElementRect(SubElement subElement, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE {
+    QRect subElementRect(SubElement subElement, const QStyleOption *option, const QWidget *widget) const override {
         checkStyleEnum<QStyle::SubElement>(subElement, option);
         return QProxyStyle::subElementRect(subElement, option, widget);
     }
 
-    void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const Q_DECL_OVERRIDE {
+    void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const override {
         checkStyleEnum<QStyle::ComplexControl>(cc, opt);
         return QProxyStyle::drawComplexControl(cc, opt, p, widget);
     }
 
-    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE {
+    QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override {
         checkStyleEnum<QStyle::ComplexControl>(cc, opt);
         return QProxyStyle::subControlRect(cc, opt, sc, widget);
     }
 
-    int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE {
+    int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const override {
         checkStyleEnum<QStyle::PixelMetric>(metric, option);
         return QProxyStyle::pixelMetric(metric, option, widget);
     }
 
-    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const Q_DECL_OVERRIDE {
+    QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const override {
         checkStyleEnum<QStyle::ContentsType>(ct, opt);
         return QProxyStyle::sizeFromContents(ct, opt, contentsSize, w);
     }
 
-    int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const Q_DECL_OVERRIDE {
+    int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const override {
         checkStyleEnum<QStyle::StyleHint>(stylehint, opt);
         return QProxyStyle::styleHint(stylehint, opt, widget, returnData);
     }
 
-    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const  Q_DECL_OVERRIDE {
+    QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const  override {
         checkStyleEnum<QStyle::StandardPixmap>(standardPixmap, opt);
         return QProxyStyle::standardPixmap(standardPixmap, opt, widget);
     }
 
-    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE {
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const override {
         checkStyleEnum<QStyle::StandardPixmap>(standardIcon, option);
         return QProxyStyle::standardIcon(standardIcon, option, widget);
     }
 
-    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const  Q_DECL_OVERRIDE {
+    QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const  override {
         checkStyle(QString::asprintf("QIcon::Mode(%i)", iconMode).toLatin1(), opt);
         return QProxyStyle::generatedIconPixmap(iconMode, pixmap, opt);
     }
 
-    int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE {
+    int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const override {
         checkStyle(QString::asprintf("QSizePolicy::ControlType(%i), QSizePolicy::ControlType(%i)", control1, control2).toLatin1(), option);
         return QProxyStyle::layoutSpacing(control1, control2, orientation, option, widget);
     }
 
 private:
     void checkStyle(const QByteArray &info, const QStyleOption *opt) const {
-        if (opt && (opt->version == 0 || opt->styleObject == Q_NULLPTR) ) {
+        if (opt && (opt->version == 0 || opt->styleObject == nullptr) ) {
             invalidOptionsDetected = true;
             qWarning() << baseStyle()->metaObject()->className()
                        << "Invalid QStyleOption found for"