diff options
| author | John Layt <jlayt@kde.org> | 2012-05-14 21:27:25 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 18:26:18 +0200 |
| commit | c8b1f7c8597e4764ada1ab067890fdfebbbbcc9b (patch) | |
| tree | c0b16cd4aaac39dc0cde078af453c3b6f9bd48fc /src/printsupport/dialogs/qprintdialog.h | |
| parent | 9ae3ec470c5a83004225be14a3ab2ddccbefbf29 (diff) | |
QtPrintSupport - Cleanup QPrintDialog header
Move QUnixPrintWidget from the header to the UNIX implementation as
it is not used anywhere else and doesn't need to be exported.
Make the private slots only compile under UNIX, remove the Mac and Win
stubs for them as unneeded.
Add some documentation to the UNIX dialog
Change-Id: I8f30504285df877e17ac8eeace875f666f43d94d
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog.h')
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 5bd832bcb0..9bc133e059 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -55,28 +55,6 @@ class QPrintDialogPrivate; class QPushButton; class QPrinter; -#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) -class QUnixPrintWidgetPrivate; - -class Q_PRINTSUPPORT_EXPORT QUnixPrintWidget : public QWidget -{ - Q_OBJECT - -public: - explicit QUnixPrintWidget(QPrinter *printer, QWidget *parent = 0); - ~QUnixPrintWidget(); - void updatePrinter(); - -private: - friend class QPrintDialogPrivate; - friend class QUnixPrintWidgetPrivate; - QUnixPrintWidgetPrivate *d; - Q_PRIVATE_SLOT(d, void _q_printerChanged(int)) - Q_PRIVATE_SLOT(d, void _q_btnBrowseClicked()) - Q_PRIVATE_SLOT(d, void _q_btnPropertiesClicked()) -}; -#endif - class Q_PRINTSUPPORT_EXPORT QPrintDialog : public QAbstractPrintDialog { Q_OBJECT @@ -129,14 +107,14 @@ Q_SIGNALS: void accepted(QPrinter *printer); private: - Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool)) #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) + Q_PRIVATE_SLOT(d_func(), void _q_chbPrintLastFirstToggled(bool)) Q_PRIVATE_SLOT(d_func(), void _q_collapseOrExpandDialog()) -#endif -# if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_MESSAGEBOX) +# if !defined(QT_NO_MESSAGEBOX) Q_PRIVATE_SLOT(d_func(), void _q_checkFields()) -# endif +# endif // QT_NO_MESSAGEBOX friend class QUnixPrintWidget; +# endif // Q_OS_UNIX }; #endif // QT_NO_PRINTDIALOG |