diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index f3e865e..cf55cfa 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -58,18 +58,12 @@ public: #if defined(Q_OS_MAC) || defined(Q_OS_WIN) virtual void setVisible(bool visible); #endif - virtual int exec(); + virtual int exec() Q_DECL_OVERRIDE; -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); - void done(int result); + void done(int result) Q_DECL_OVERRIDE; QPrinter *printer(); }; diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 437c283..1332fcc 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -57,11 +57,11 @@ public: explicit QPrintDialog(QWidget *parent = 0); ~QPrintDialog(); - int exec(); + int exec() Q_DECL_OVERRIDE; #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) - virtual void accept(); + virtual void accept() Q_DECL_OVERRIDE; #endif - void done(int result); + void done(int result) Q_DECL_OVERRIDE; void setOption(PrintDialogOption option, bool on = true); bool testOption(PrintDialogOption option) const; @@ -69,29 +69,17 @@ public: PrintDialogOptions options() const; #if defined(Q_OS_UNIX) || defined(Q_OS_WIN) - void setVisible(bool visible); + void setVisible(bool visible) Q_DECL_OVERRIDE; #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); #ifdef Q_QDOC QPrinter *printer(); #endif -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void accepted() { QDialog::accepted(); } -#endif -#else using QDialog::accepted; -#endif Q_SIGNALS: void accepted(QPrinter *printer); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 423a27d..15e0271 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -56,19 +56,13 @@ public: explicit QPrintPreviewDialog(QPrinter *printer, QWidget *parent = 0, Qt::WindowFlags flags = 0); ~QPrintPreviewDialog(); -#ifdef Q_NO_USING_KEYWORD -#ifndef Q_QDOC - void open() { QDialog::open(); } -#endif -#else using QDialog::open; -#endif void open(QObject *receiver, const char *member); QPrinter *printer(); - void setVisible(bool visible); - void done(int result); + void setVisible(bool visible) Q_DECL_OVERRIDE; + void done(int result) Q_DECL_OVERRIDE; Q_SIGNALS: void paintRequested(QPrinter *printer); diff --git a/src/printsupport/kernel/qprintengine.h b/src/printsupport/kernel/qprintengine.h index 20ce831..3552fc3 100644 --- a/src/printsupport/kernel/qprintengine.h +++ b/src/printsupport/kernel/qprintengine.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: diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h index 58d3873..39e44d4 100644 --- a/src/printsupport/kernel/qprinterinfo.h +++ b/src/printsupport/kernel/qprinterinfo.h @@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_PRINTER class QPrinterInfoPrivate; class QPrinterInfoPrivateDeleter; +class QDebug; class Q_PRINTSUPPORT_EXPORT QPrinterInfo { public: @@ -98,6 +99,9 @@ private: private: friend class QPlatformPrinterSupport; +# ifndef QT_NO_DEBUG_STREAM + friend Q_PRINTSUPPORT_EXPORT QDebug operator<<(QDebug debug, const QPrinterInfo &); +# endif Q_DECLARE_PRIVATE(QPrinterInfo) QScopedPointer<QPrinterInfoPrivate, QPrinterInfoPrivateDeleter> d_ptr; }; diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h index 96c88e6..7892954 100644 --- a/src/printsupport/kernel/qtprintsupportglobal.h +++ b/src/printsupport/kernel/qtprintsupportglobal.h @@ -72,7 +72,7 @@ public: ZoomMode zoomMode() const; int currentPage() const; int pageCount() const; - void setVisible(bool visible); + void setVisible(bool visible) Q_DECL_OVERRIDE; public Q_SLOTS: void print();
_______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development