diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2014-11-16 13:09:01 +0100 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2014-12-03 09:57:11 +0100 |
commit | 5180f32c5abe01acd65cde68c2c16aedda4028ec (patch) | |
tree | a8ed3b4af80751cdc0442c750f2915bfa9c8af40 /src/printsupport/kernel | |
parent | 2e271795e7c460254a27ea617846ff7b598a7b9b (diff) |
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 <thiago.macieira@intel.com>
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/qprintengine_pdf_p.h | 16 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.h | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/printsupport/kernel/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h index e78950eb97..401aee1af0 100644 --- a/src/printsupport/kernel/qprintengine_pdf_p.h +++ b/src/printsupport/kernel/qprintengine_pdf_p.h @@ -81,18 +81,18 @@ public: virtual ~QPdfPrintEngine(); // reimplementations QPaintEngine - bool begin(QPaintDevice *pdev); - bool end(); + bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; + bool end() Q_DECL_OVERRIDE; // end reimplementations QPaintEngine // reimplementations QPrintEngine - bool abort() {return false;} - QPrinter::PrinterState printerState() const {return state;} + bool abort() Q_DECL_OVERRIDE {return false;} + QPrinter::PrinterState printerState() const Q_DECL_OVERRIDE {return state;} - bool newPage(); - int metric(QPaintDevice::PaintDeviceMetric) const; - virtual void setProperty(PrintEnginePropertyKey key, const QVariant &value); - virtual QVariant property(PrintEnginePropertyKey key) const; + 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; // end reimplementations QPrintEngine QPrinter::PrinterState state; 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: |