diff options
| author | John Layt <jlayt@kde.org> | 2012-05-20 22:38:28 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 22:08:16 +0200 |
| commit | 54b899f44877d87f6118b1bab02fb67c35d738e8 (patch) | |
| tree | b461abfb0853b2d2c38d9c87e337ba414090cfd1 /src/printsupport/dialogs/qpagesetupdialog.h | |
| parent | 01864d4854557d2cf8b067e229d77cd7c9c553ee (diff) | |
SIC: QtPrintSupport - Remove QAbstractPageSetupDialog
QAbstractPageSetupDialog is a completely unnecessary base class that
is not really abstract and is used nowhere else. This changes merges
its methods into the QPageSetupDialog main class.
While technically SIC no-one else uses this so no apps should be
affected.
Change-Id: I59b1739f1c453c34c25d1664d5d042e7918db316
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/printsupport/dialogs/qpagesetupdialog.h')
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index c17008150f..1360a8df3d 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -42,7 +42,8 @@ #ifndef QPAGESETUPDIALOG_H #define QPAGESETUPDIALOG_H -#include <QtPrintSupport/qabstractpagesetupdialog.h> +#include <QtWidgets/qdialog.h> +#include <QtPrintSupport/qtprintsupportglobal.h> QT_BEGIN_HEADER @@ -51,9 +52,10 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_PRINTDIALOG +class QPrinter; class QPageSetupDialogPrivate; -class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog +class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QPageSetupDialog) @@ -61,6 +63,7 @@ class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog public: explicit QPageSetupDialog(QPrinter *printer, QWidget *parent = 0); explicit QPageSetupDialog(QWidget *parent = 0); + virtual ~QPageSetupDialog(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) virtual void setVisible(bool visible); @@ -76,9 +79,9 @@ public: #endif void open(QObject *receiver, const char *member); -#ifdef qdoc + void done(int result); + QPrinter *printer(); -#endif }; #endif // QT_NO_PRINTDIALOG |