From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/printsupport/kernel/qprintengine_pdf_p.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/printsupport/kernel/qprintengine_pdf_p.h') diff --git a/src/printsupport/kernel/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h index e9e81bdf68..bb01a2e9e1 100644 --- a/src/printsupport/kernel/qprintengine_pdf_p.h +++ b/src/printsupport/kernel/qprintengine_pdf_p.h @@ -87,18 +87,18 @@ public: virtual ~QPdfPrintEngine(); // reimplementations QPaintEngine - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; // end reimplementations QPaintEngine // reimplementations QPrintEngine - bool abort() Q_DECL_OVERRIDE {return false;} - QPrinter::PrinterState printerState() const Q_DECL_OVERRIDE {return state;} + bool abort() override {return false;} + QPrinter::PrinterState printerState() const override {return state;} - bool newPage() Q_DECL_OVERRIDE; - int metric(QPaintDevice::PaintDeviceMetric) const Q_DECL_OVERRIDE; - virtual void setProperty(PrintEnginePropertyKey key, const QVariant &value) Q_DECL_OVERRIDE; - virtual QVariant property(PrintEnginePropertyKey key) const Q_DECL_OVERRIDE; + bool newPage() override; + int metric(QPaintDevice::PaintDeviceMetric) const override; + virtual void setProperty(PrintEnginePropertyKey key, const QVariant &value) override; + virtual QVariant property(PrintEnginePropertyKey key) const override; // end reimplementations QPrintEngine QPrinter::PrinterState state; -- cgit v1.2.3