1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QCupsJobWidget::setPrinter

Browse Source 
It is only ever called after the constructor so merge the code

Change-Id: I381165ad90c85342e5db3c16327d729388b71fb2
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Albert Astals Cid 2017-12-04 12:57:40 +01:00 committed by Shawn Rutledge
parent f135d515e8
commit 881690969c
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -251,8 +251,7 @@ QPrintPropertiesDialog::QPrintPropertiesDialog(QPrinter *printer, QAbstractPrint
widget.pageSetup->setPrinter(printer); widget.pageSetup->setPrinter(printer);
#if QT_CONFIG(cupsjobwidget) #if QT_CONFIG(cupsjobwidget)
m_jobOptions = new QCupsJobWidget(); m_jobOptions = new QCupsJobWidget(printer);
m_jobOptions->setPrinter(printer);
widget.tabs->addTab(m_jobOptions, tr("Job Options")); widget.tabs->addTab(m_jobOptions, tr("Job Options"));
#endif #endif
} }

10
src/printsupport/widgets/qcupsjobwidget.cpp
View File

@ -64,8 +64,9 @@ QT_BEGIN_NAMESPACE
\inmodule QtPrintSupport \inmodule QtPrintSupport
*/ */
QCupsJobWidget::QCupsJobWidget(QWidget *parent) QCupsJobWidget::QCupsJobWidget(QPrinter *printer, QWidget *parent)
: QWidget(parent) : QWidget(parent),
m_printer(printer)
{ {
m_ui.setupUi(this); m_ui.setupUi(this);
//set all the default values //set all the default values
@ -80,11 +81,6 @@ QCupsJobWidget::~QCupsJobWidget()
{ {
} }
void QCupsJobWidget::setPrinter(QPrinter *printer)
{
m_printer = printer;
}
void QCupsJobWidget::setupPrinter() void QCupsJobWidget::setupPrinter()
{ {
QCUPSSupport::setJobHold(m_printer, jobHold(), jobHoldTime()); QCUPSSupport::setJobHold(m_printer, jobHold(), jobHoldTime());

3
src/printsupport/widgets/qcupsjobwidget_p.h
View File

@ -71,9 +71,8 @@ class QCupsJobWidget : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit QCupsJobWidget(QWidget *parent = 0); explicit QCupsJobWidget(QPrinter *printer, QWidget *parent = nullptr);
~QCupsJobWidget(); ~QCupsJobWidget();
void setPrinter(QPrinter *printer);
void setupPrinter(); void setupPrinter();
private Q_SLOTS: private Q_SLOTS: