From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- src/printsupport/kernel/qprinter.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/printsupport/kernel/qprinter.h') diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 1f0edaf1f3..61065a893e 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -66,7 +66,7 @@ public: explicit QPrinter(const QPrinterInfo& printer, PrinterMode mode = ScreenResolution); ~QPrinter(); - int devType() const; + int devType() const Q_DECL_OVERRIDE; enum Orientation { Portrait, Landscape }; @@ -314,10 +314,10 @@ public: void setOrientation(Orientation); Orientation orientation() const; - void setPageSize(PageSize); + void setPageSize(PageSize) Q_DECL_OVERRIDE; PageSize pageSize() const; - void setPageSizeMM(const QSizeF &size); + void setPageSizeMM(const QSizeF &size) Q_DECL_OVERRIDE; void setPaperSize(PaperSize); PaperSize paperSize() const; @@ -381,12 +381,12 @@ public: QString printerSelectionOption() const; void setPrinterSelectionOption(const QString &); - bool newPage(); + bool newPage() Q_DECL_OVERRIDE; bool abort(); PrinterState printerState() const; - QPaintEngine *paintEngine() const; + QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPrintEngine *printEngine() const; void setFromTo(int fromPage, int toPage); @@ -396,13 +396,13 @@ public: void setPrintRange(PrintRange range); PrintRange printRange() const; - void setMargins(const Margins &m); + void setMargins(const Margins &m) Q_DECL_OVERRIDE; void setPageMargins(qreal left, qreal top, qreal right, qreal bottom, Unit unit); void getPageMargins(qreal *left, qreal *top, qreal *right, qreal *bottom, Unit unit) const; protected: - int metric(PaintDeviceMetric) const; + int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; void setEngines(QPrintEngine *printEngine, QPaintEngine *paintEngine); private: -- cgit v1.2.3