diff options
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.h | 6 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 8 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 8 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.h | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintengine_pdf_p.h | 16 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 12 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.h | 14 | ||||
-rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.cpp | 8 | ||||
-rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.h | 2 |
11 files changed, 41 insertions, 41 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 3bd752a413..61edcc3370 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -62,14 +62,14 @@ public: ~QPageSetupDialog(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif - int exec() Q_DECL_OVERRIDE; + int exec() override; using QDialog::open; void open(QObject *receiver, const char *member); - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; QPrinter *printer(); }; diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index b4ad718646..84f8258902 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -117,7 +117,7 @@ public: } protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *) override { QSize pageSize = m_pageLayout.fullRectPoints().size(); QSizeF scaledSize = pageSize.scaled(width() - 10, height() - 10, Qt::KeepAspectRatio); diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 5b81440a3c..20ef1c7fed 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -63,11 +63,11 @@ public: explicit QPrintDialog(QWidget *parent = Q_NULLPTR); ~QPrintDialog(); - int exec() Q_DECL_OVERRIDE; + int exec() override; #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) - virtual void accept() Q_DECL_OVERRIDE; + virtual void accept() override; #endif - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; void setOption(PrintDialogOption option, bool on = true); bool testOption(PrintDialogOption option) const; @@ -75,7 +75,7 @@ public: PrintDialogOptions options() const; #if defined(Q_OS_UNIX) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif using QDialog::open; diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 51c8a593a1..91a6d47578 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -215,7 +215,7 @@ public: void setupPrinter(); void updateWidgets(); - virtual void setTabs(const QList<QWidget*> &tabs) Q_DECL_OVERRIDE; + virtual void setTabs(const QList<QWidget*> &tabs) override; Ui::QPrintSettingsOutput options; QUnixPrintWidget *top; diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index dbcbaf3ce5..171c4f5a23 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -79,7 +79,7 @@ class QPrintPreviewMainWindow : public QMainWindow { public: QPrintPreviewMainWindow(QWidget *parent) : QMainWindow(parent) {} - QMenu *createPopupMenu() Q_DECL_OVERRIDE { return 0; } + QMenu *createPopupMenu() override { return 0; } }; class ZoomFactorValidator : public QDoubleValidator @@ -90,7 +90,7 @@ public: ZoomFactorValidator(qreal bottom, qreal top, int decimals, QObject *parent) : QDoubleValidator(bottom, top, decimals, parent) {} - State validate(QString &input, int &pos) const Q_DECL_OVERRIDE + State validate(QString &input, int &pos) const override { bool replacePercent = false; if (input.endsWith(QLatin1Char('%'))) { @@ -123,13 +123,13 @@ public: } protected: - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE + void focusInEvent(QFocusEvent *e) override { origText = text(); QLineEdit::focusInEvent(e); } - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE + void focusOutEvent(QFocusEvent *e) override { if (isModified() && !hasAcceptableInput()) setText(origText); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 3b8f8a1171..6f9de92050 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -68,8 +68,8 @@ public: QPrinter *printer(); - void setVisible(bool visible) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + void done(int result) override; Q_SIGNALS: void paintRequested(QPrinter *printer); 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; diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 3135836ce7..dd0fa8639b 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -231,7 +231,7 @@ public: virtual ~QPrinterPagedPaintDevicePrivate() {} - bool setPageLayout(const QPageLayout &newPageLayout) Q_DECL_OVERRIDE + bool setPageLayout(const QPageLayout &newPageLayout) override { if (pd->paintEngine->type() != QPaintEngine::Pdf && pd->printEngine->printerState() == QPrinter::Active) { @@ -248,7 +248,7 @@ public: return pageLayout().isEquivalentTo(newPageLayout); } - bool setPageSize(const QPageSize &pageSize) Q_DECL_OVERRIDE + bool setPageSize(const QPageSize &pageSize) override { if (pd->paintEngine->type() != QPaintEngine::Pdf && pd->printEngine->printerState() == QPrinter::Active) { @@ -266,7 +266,7 @@ public: return pageLayout().pageSize().isEquivalentTo(pageSize); } - bool setPageOrientation(QPageLayout::Orientation orientation) Q_DECL_OVERRIDE + bool setPageOrientation(QPageLayout::Orientation orientation) override { // Set the print engine value pd->setProperty(QPrintEngine::PPK_Orientation, orientation); @@ -277,12 +277,12 @@ public: return pageLayout().orientation() == orientation; } - bool setPageMargins(const QMarginsF &margins) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins) override { return setPageMargins(margins, pageLayout().units()); } - bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) override { // Try to set print engine margins QPair<QMarginsF, QPageLayout::Unit> pair = qMakePair(margins, units); @@ -294,7 +294,7 @@ public: return pageLayout().margins() == margins && pageLayout().units() == units; } - QPageLayout pageLayout() const Q_DECL_OVERRIDE + QPageLayout pageLayout() const override { return pd->printEngine->property(QPrintEngine::PPK_QPageLayout).value<QPageLayout>(); } diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index bfe2d346ae..28dca78a63 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -72,7 +72,7 @@ public: explicit QPrinter(const QPrinterInfo& printer, PrinterMode mode = ScreenResolution); ~QPrinter(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; enum Orientation { Portrait, Landscape }; @@ -170,10 +170,10 @@ public: void setOrientation(Orientation); Orientation orientation() const; - void setPageSize(PageSize) Q_DECL_OVERRIDE; + void setPageSize(PageSize) override; PageSize pageSize() const; - void setPageSizeMM(const QSizeF &size) Q_DECL_OVERRIDE; + void setPageSizeMM(const QSizeF &size) override; void setPaperSize(PaperSize); PaperSize paperSize() const; @@ -237,12 +237,12 @@ public: QString printerSelectionOption() const; void setPrinterSelectionOption(const QString &); - bool newPage() Q_DECL_OVERRIDE; + bool newPage() override; bool abort(); PrinterState printerState() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; QPrintEngine *printEngine() const; void setFromTo(int fromPage, int toPage); @@ -252,13 +252,13 @@ public: void setPrintRange(PrintRange range); PrintRange printRange() const; - void setMargins(const Margins &m) Q_DECL_OVERRIDE; + void setMargins(const Margins &m) 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 Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; void setEngines(QPrintEngine *printEngine, QPaintEngine *paintEngine); private: diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index b28e693612..352a234065 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -64,13 +64,13 @@ public: setCacheMode(DeviceCoordinateCache); } - QRectF boundingRect() const Q_DECL_OVERRIDE + QRectF boundingRect() const override { return brect; } inline int pageNumber() const { return pageNum; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) override; private: int pageNum; @@ -156,7 +156,7 @@ signals: void resized(); protected: - void resizeEvent(QResizeEvent* e) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent* e) override { { const QSignalBlocker blocker(verticalScrollBar()); // Don't change page, QTBUG-14517 @@ -165,7 +165,7 @@ protected: emit resized(); } - void showEvent(QShowEvent* e) Q_DECL_OVERRIDE + void showEvent(QShowEvent* e) override { QGraphicsView::showEvent(e); emit resized(); diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index 8735d06072..d6b5929d52 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -80,7 +80,7 @@ public: ZoomMode zoomMode() const; int currentPage() const; int pageCount() const; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; public Q_SLOTS: void print(); |