From 3fd9398052d2b483d2830c3661ceed26e551fa49 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 28 Sep 2011 22:20:06 +0200 Subject: Remove the remaining traces of QT3_SUPPORT The only place that now still knows about it is moc, so it can still parse old headers. Change-Id: Iafec080f99c67560974e9ebc0cbfb27d9a4b2d6f Reviewed-on: http://codereview.qt-project.org/5755 Reviewed-by: Qt Sanity Bot Reviewed-by: Friedemann Kleint --- src/printsupport/dialogs/qprintdialog.h | 6 ----- src/printsupport/dialogs/qprintdialog.qdoc | 31 -------------------------- src/printsupport/dialogs/qprintdialog_mac.mm | 7 ------ src/printsupport/dialogs/qprintdialog_unix.cpp | 26 --------------------- 4 files changed, 70 deletions(-) (limited to 'src/printsupport/dialogs') diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 1b04263261..f9017ec59b 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -96,12 +96,6 @@ public: #endif void done(int result); -#if defined (Q_OS_UNIX) && defined (QT3_SUPPORT) - QT3_SUPPORT void setPrinter(QPrinter *, bool = false); - QT3_SUPPORT QPrinter *printer() const; - QT3_SUPPORT void addButton(QPushButton *button); -#endif - void setOption(PrintDialogOption option, bool on = true); bool testOption(PrintDialogOption option) const; void setOptions(PrintDialogOptions options); diff --git a/src/printsupport/dialogs/qprintdialog.qdoc b/src/printsupport/dialogs/qprintdialog.qdoc index 53bbc9b490..6418fa2b58 100644 --- a/src/printsupport/dialogs/qprintdialog.qdoc +++ b/src/printsupport/dialogs/qprintdialog.qdoc @@ -25,34 +25,3 @@ ** ****************************************************************************/ -#ifdef QT3_SUPPORT -/*! - \fn QPrinter *QPrintDialog::printer() const - - Returns a pointer to the printer this dialog configures, or 0 if - this dialog does not operate on any printer. - - This function is available for Unix platforms only. -*/ - -/*! - \fn void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings) - - Sets this dialog to configure printer \a printer, or no printer if \a printer - is null. If \a pickupSettings is true, the dialog reads most of - its settings from \a printer. If \a pickupSettings is false (the - default) the dialog keeps its old settings. - - This function is available for Unix platforms only. -*/ - -/*! - \fn void QPrintDialog::addButton(QPushButton *button) - - Adds the \a button to the layout of the print dialog. The added - buttons are arranged from the left to the right below the - last groupbox of the printdialog. - - This function is available for Unix platforms only. -*/ -#endif diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm index 2e902e61ce..cb95f6b98d 100644 --- a/src/printsupport/dialogs/qprintdialog_mac.mm +++ b/src/printsupport/dialogs/qprintdialog_mac.mm @@ -378,13 +378,6 @@ int QPrintDialog::exec() return result(); } -#ifdef QT3_SUPPORT -QPrinter *QPrintDialog::printer() const -{ - Q_D(const QPrintDialog); - return d->printer; -} -#endif /*! \reimp diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 57baf76704..049a45b1fd 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -627,32 +627,6 @@ void QPrintDialog::accept() QDialog::accept(); } -#ifdef QT3_SUPPORT -QPrinter *QPrintDialog::printer() const -{ - Q_D(const QPrintDialog); - return d->printer; -} - -void QPrintDialog::setPrinter(QPrinter *printer, bool pickupSettings) -{ - if (!printer) - return; - - Q_D(QPrintDialog); - d->printer = printer; - - if (pickupSettings) - d->applyPrinterProperties(printer); -} - -void QPrintDialog::addButton(QPushButton *button) -{ - Q_D(QPrintDialog); - d->buttons->addButton(button, QDialogButtonBox::HelpRole); -} -#endif // QT3_SUPPORT - #if defined (Q_OS_UNIX) /*! \internal -- cgit v1.2.3